Skip to content

Search: Border radius presets work correctly #71481

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
andrewserong merged 4 commits into from
Sep 4, 2025
Merged

Search: Border radius presets work correctly #71481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ee0d76a
fix/search/border-radius
shimotmk Sep 3, 2025
fab8c8f
lint
shimotmk Sep 3, 2025
4ee5c69
Update packages/block-library/src/search/index.php
shimotmk Sep 4, 2025
4917de6
Update packages/block-library/src/search/index.php
shimotmk Sep 4, 2025
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
57 changes: 44 additions & 13 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 @@ -228,7 +228,17 @@ export default function SearchEdit( {
);
const textFieldStyles = {
...( isButtonPositionInside
? { borderRadius }
? {
borderRadius: borderProps.style?.borderRadius,
borderTopLeftRadius:
borderProps.style?.borderTopLeftRadius,
borderTopRightRadius:
borderProps.style?.borderTopRightRadius,
borderBottomLeftRadius:
borderProps.style?.borderBottomLeftRadius,
borderBottomRightRadius:
borderProps.style?.borderBottomRightRadius,
}
: borderProps.style ),
...typographyProps.style,
textDecoration: undefined,
Expand Down Expand Up @@ -269,7 +279,17 @@ export default function SearchEdit( {
...colorProps.style,
...typographyProps.style,
...( isButtonPositionInside
? { borderRadius }
? {
borderRadius: borderProps.style?.borderRadius,
borderTopLeftRadius:
borderProps.style?.borderTopLeftRadius,
borderTopRightRadius:
borderProps.style?.borderTopRightRadius,
borderBottomLeftRadius:
borderProps.style?.borderBottomLeftRadius,
borderBottomRightRadius:
borderProps.style?.borderBottomRightRadius,
}
: borderProps.style ),
};
const handleButtonClick = () => {
Expand Down Expand Up @@ -495,8 +515,13 @@ export default function SearchEdit( {
</>
);

const isNonZeroBorderRadius = ( radius ) =>
radius !== undefined && parseInt( radius, 10 ) !== 0;

const padBorderRadius = ( radius ) =>
radius ? `calc(${ radius } + ${ DEFAULT_INNER_PADDING })` : undefined;
isNonZeroBorderRadius( radius )
? `calc(${ radius } + ${ DEFAULT_INNER_PADDING })`
: undefined;

const getWrapperStyles = () => {
const styles = isButtonPositionInside
Expand All @@ -512,10 +537,7 @@ export default function SearchEdit( {
borderProps.style?.borderBottomRightRadius,
};

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

if ( isButtonPositionInside && isNonZeroBorderRadius ) {
if ( isButtonPositionInside ) {
// We have button inside wrapper and a border radius value to apply.
// Add default padding so we don't get "fat" corners.
//
Expand All @@ -524,15 +546,24 @@ export default function SearchEdit( {

if ( typeof borderRadius === 'object' ) {
// Individual corner border radii present.
const { topLeft, topRight, bottomLeft, bottomRight } =
borderRadius;
const {
borderTopLeftRadius,
borderTopRightRadius,
borderBottomLeftRadius,
borderBottomRightRadius,
} = borderProps.style;

return {
...styles,
borderTopLeftRadius: padBorderRadius( topLeft ),
borderTopRightRadius: padBorderRadius( topRight ),
borderBottomLeftRadius: padBorderRadius( bottomLeft ),
borderBottomRightRadius: padBorderRadius( bottomRight ),
borderTopLeftRadius: padBorderRadius( borderTopLeftRadius ),
borderTopRightRadius:
padBorderRadius( borderTopRightRadius ),
borderBottomLeftRadius: padBorderRadius(
borderBottomLeftRadius
),
borderBottomRightRadius: padBorderRadius(
borderBottomRightRadius
),
};
}

Expand Down
18 changes: 16 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 @@ -372,6 +372,13 @@ function styles_for_block_core_search( $attributes ) {
if ( is_array( $border_radius ) ) {
// Apply styles for individual corner border radii.
foreach ( $border_radius as $key => $value ) {
// Get border-radius CSS variable from preset value if provided.
if ( is_string( $value ) && str_contains( $value, 'var:preset|border-radius|' ) ) {
$index_to_splice = strrpos( $value, '|' ) + 1;
$slug = _wp_to_kebab_case( substr( $value, $index_to_splice ) );
$value = "var(--wp--preset--border-radius--$slug)";
}

if ( null !== $value ) {
// Convert camelCase key to kebab-case.
$name = strtolower( preg_replace( '/(?<!^)[A-Z]/', '-$0', $key ) );
Expand All @@ -387,7 +394,7 @@ function styles_for_block_core_search( $attributes ) {

// Add adjusted border radius styles for the wrapper element
// if button is positioned inside.
if ( $is_button_inside && intval( $value ) !== 0 ) {
if ( $is_button_inside && ( intval( $value ) !== 0 || str_contains( $value, 'var(--wp--preset--border-radius--' ) ) ) {
$wrapper_styles[] = sprintf(
'border-%s-radius: calc(%s + %s);',
esc_attr( $name ),
Expand All @@ -399,7 +406,14 @@ function styles_for_block_core_search( $attributes ) {
}
} else {
// Numeric check is for backwards compatibility purposes.
$border_radius = is_numeric( $border_radius ) ? $border_radius . 'px' : $border_radius;
$border_radius = is_numeric( $border_radius ) ? $border_radius . 'px' : $border_radius;
// Get border-radius CSS variable from preset value if provided.
if ( is_string( $border_radius ) && str_contains( $border_radius, 'var:preset|border-radius|' ) ) {
$index_to_splice = strrpos( $border_radius, '|' ) + 1;
$slug = _wp_to_kebab_case( substr( $border_radius, $index_to_splice ) );
$border_radius = "var(--wp--preset--border-radius--$slug)";
}

$border_style = sprintf( 'border-radius: %s;', esc_attr( $border_radius ) );
$input_styles[] = $border_style;
$button_styles[] = $border_style;
Expand Down
Loading