From 0d8c51dc2388bbea8b3a01faec7b6d5c6c93d401 Mon Sep 17 00:00:00 2001 From: shimotmk Date: Tue, 4 Mar 2025 19:16:33 +0900 Subject: [PATCH 1/3] fix/search-inside-wrapper-classname-trim --- packages/block-library/src/search/index.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/block-library/src/search/index.php b/packages/block-library/src/search/index.php index 87e12f5d33d079..d56fe7a7f30b38 100644 --- a/packages/block-library/src/search/index.php +++ b/packages/block-library/src/search/index.php @@ -152,10 +152,15 @@ function render_block_core_search( $attributes ) { } } - $field_markup_classes = $is_button_inside ? $border_color_classes : ''; + $field_markup_classes = array( + 'wp-block-search__inside-wrapper', + ); + if ( $is_button_inside && ! empty( $border_color_classes ) ) { + $field_markup_classes[] = $border_color_classes; + } $field_markup = sprintf( - '
%s
', - esc_attr( $field_markup_classes ), + '
%s
', + implode( ' ', $field_markup_classes ), $inline_styles['wrapper'], $input . $query_params_markup . $button ); From c781d2c4844d46db1b5b4e3334d7e865eab3a6ba Mon Sep 17 00:00:00 2001 From: shimotmk Date: Tue, 4 Mar 2025 22:34:29 +0900 Subject: [PATCH 2/3] phpcs --- packages/block-library/src/search/index.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/block-library/src/search/index.php b/packages/block-library/src/search/index.php index d56fe7a7f30b38..73a62b0ff8ebd9 100644 --- a/packages/block-library/src/search/index.php +++ b/packages/block-library/src/search/index.php @@ -158,16 +158,16 @@ function render_block_core_search( $attributes ) { if ( $is_button_inside && ! empty( $border_color_classes ) ) { $field_markup_classes[] = $border_color_classes; } - $field_markup = sprintf( + $field_markup = sprintf( '
%s
', implode( ' ', $field_markup_classes ), $inline_styles['wrapper'], $input . $query_params_markup . $button ); - $wrapper_attributes = get_block_wrapper_attributes( + $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classnames ) ); - $form_directives = ''; + $form_directives = ''; // If it's interactive, add the directives. if ( $is_expandable_searchfield ) { From f1cf9512aa5203f570ac5a89766ba142b0c7b0e5 Mon Sep 17 00:00:00 2001 From: shimotmk Date: Wed, 5 Mar 2025 15:45:30 +0900 Subject: [PATCH 3/3] esc_attr --- packages/block-library/src/search/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/block-library/src/search/index.php b/packages/block-library/src/search/index.php index 73a62b0ff8ebd9..50c436270d4caa 100644 --- a/packages/block-library/src/search/index.php +++ b/packages/block-library/src/search/index.php @@ -160,7 +160,7 @@ function render_block_core_search( $attributes ) { } $field_markup = sprintf( '
%s
', - implode( ' ', $field_markup_classes ), + esc_attr( implode( ' ', $field_markup_classes ) ), $inline_styles['wrapper'], $input . $query_params_markup . $button );