Skip to content

Search Block: Add border color support #31783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ramonjd merged 3 commits into from
Jul 19, 2021
Merged

Search Block: Add border color support #31783

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b80ff73
Initial commit.
ramonjd May 13, 2021
6bf809d
Abstracted border color class assembly into a method
ramonjd May 14, 2021
7216b7f
Linting
ramonjd Jul 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Abstracted border color class assembly into a method 
Only apply border color to the input and button elements when the button is outside.
When the button is inside, we apply the border color styles to the outer wrapper.

Declaring variables for button positions to avoid repetition
Applying `borderProps.style` to the text field and button when the button is not inside so we can ensure that all future supports styles such as border width and style are applied to the element.
  • Loading branch information
@ramonjd
ramonjd committed Jul 16, 2021
commit 6bf809d511e1b070b5674414dacffc99573a2d57
57 changes: 30 additions & 27 deletions packages/block-library/src/search/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@ export default function SearchEdit( {
const unitControlInstanceId = useInstanceId( UnitControl );
const unitControlInputId = `wp-block-search__width-${ unitControlInstanceId }`;
const isButtonPositionInside = 'button-inside' === buttonPosition;
const isButtonPositionOutside = 'button-outside' === buttonPosition;
const hasNoButton = 'no-button' === buttonPosition;
const hasOnlyButton = 'button-only' === buttonPosition;

const units = useCustomUnits( {
availableUnits: [ '%', 'px' ],
Expand All @@ -98,19 +101,15 @@ export default function SearchEdit( {
isButtonPositionInside
? 'wp-block-search__button-inside'
: undefined,
'button-outside' === buttonPosition
isButtonPositionOutside
? 'wp-block-search__button-outside'
: undefined,
'no-button' === buttonPosition
? 'wp-block-search__no-button'
: undefined,
'button-only' === buttonPosition
? 'wp-block-search__button-only'
: undefined,
! buttonUseIcon && 'no-button' !== buttonPosition
hasNoButton ? 'wp-block-search__no-button' : undefined,
hasOnlyButton ? 'wp-block-search__button-only' : undefined,
! buttonUseIcon && ! hasNoButton
? 'wp-block-search__text-button'
: undefined,
buttonUseIcon && 'no-button' !== buttonPosition
buttonUseIcon && ! hasNoButton
? 'wp-block-search__icon-button'
: undefined
);
Expand Down Expand Up @@ -166,26 +165,26 @@ export default function SearchEdit( {
};

const getResizableSides = () => {
if ( 'button-only' === buttonPosition ) {
if ( hasOnlyButton ) {
return {};
}

return {
right: align === 'right' ? false : true,
left: align === 'right' ? true : false,
right: align !== 'right',
left: align === 'right',
};
};

const renderTextField = () => {
// If the input is inside the wrapper, the wrapper gets the border color styles/classes, not the input control.
const textFieldClasses = classnames(
'wp-block-search__input',
! isButtonPositionInside ? borderProps.className : undefined
isButtonPositionInside ? undefined : borderProps.className
);
// If the button is inside the wrapper, the wrapper gets the border styles, not the input control.
const textFieldStyles = {
borderRadius: ! isButtonPositionInside ? borderRadius : undefined,
borderColor: ! isButtonPositionInside ? borderColor : undefined,
};
const textFieldStyles = isButtonPositionInside
? { borderRadius }
: borderProps.style;

return (
<input
className={ textFieldClasses }
Expand All @@ -206,24 +205,29 @@ export default function SearchEdit( {
};

const renderButton = () => {
// If the button is inside the wrapper, the wrapper gets the border color styles/classes, not the button.
const buttonClasses = classnames(
'wp-block-search__button',
borderProps.className
isButtonPositionInside ? undefined : borderProps.className
);
const buttonStyles = isButtonPositionInside
? { borderRadius }
: borderProps.style;

return (
<>
{ buttonUseIcon && (
<Button
icon={ search }
className={ buttonClasses }
style={ { borderRadius, borderColor } }
style={ buttonStyles }
/>
) }

{ ! buttonUseIcon && (
<RichText
className={ buttonClasses }
style={ { borderRadius, borderColor } }
style={ buttonStyles }
aria-label={ __( 'Button text' ) }
placeholder={ __( 'Add button text…' ) }
withoutInteractiveFormatting
Expand Down Expand Up @@ -256,7 +260,7 @@ export default function SearchEdit( {
label={ __( 'Change button position' ) }
controls={ buttonPositionControls }
/>
{ 'no-button' !== buttonPosition && (
{ ! hasNoButton && (
<ToolbarButton
title={ __( 'Use button with icon' ) }
icon={ buttonWithIcon }
Expand Down Expand Up @@ -351,7 +355,7 @@ export default function SearchEdit( {

const isNonZeroBorderRadius = parseInt( borderRadius, 10 ) !== 0;

if ( 'button-inside' === buttonPosition && isNonZeroBorderRadius ) {
if ( isButtonPositionInside && isNonZeroBorderRadius ) {
// We have button inside wrapper and a border radius value to apply.
// Add default padding so we don't get "fat" corners.
//
Expand Down Expand Up @@ -434,16 +438,15 @@ export default function SearchEdit( {
} }
showHandle={ isSelected }
>
{ ( isButtonPositionInside ||
'button-outside' === buttonPosition ) && (
{ ( isButtonPositionInside || isButtonPositionOutside ) && (
<>
{ renderTextField() }
{ renderButton() }
</>
) }

{ 'button-only' === buttonPosition && renderButton() }
{ 'no-button' === buttonPosition && renderTextField() }
{ hasOnlyButton && renderButton() }
{ hasNoButton && renderTextField() }
</ResizableBox>
</div>
);
Expand Down
5 changes: 3 additions & 2 deletions packages/block-library/src/search/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@ function render_block_core_search( $attributes ) {
}

$button_markup = sprintf(
' <button type="submit" class="wp-block-search__button %s" %s>%s</button>', $button_classes,
'<button type="submit" class="wp-block-search__button %s" %s>%s</button>',
$button_classes,
$inline_styles['shared'],
$button_internal_markup
);
Expand All @@ -100,7 +101,7 @@ function render_block_core_search( $attributes ) {
$inline_styles['wrapper'],
$input_markup . $button_markup
);
$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classnames ) );
$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classnames ) );

return sprintf(
'<form role="search" method="get" action="%s" %s>%s</form>',
Expand Down