Changeset 61009 for trunk/src/wp-includes/blocks/search.php

Timestamp:

10/21/2025 07:11:53 AM (11 months ago)

Author:

ellatrix

Message:

Editor: update packages.

Updates the packages to match Gutenberg version 21.9.0 RC2.

Also updates the sync script to work with the new package-lock.json format.
Some reusable block tests were adjusted to work with more render arguments.
Added core-data to the ignore list for verify:source-maps because Yjs has been bundled by accident. To be removed in a follow-up. See https://core.trac.wordpress.org/ticket/64120. See ​https://github.com/WordPress/gutenberg/pull/72503.

See: ​https://github.com/WordPress/wordpress-develop/pull/10355.
See: https://core.trac.wordpress.org/ticket/64117.

Props ellatrix, dmsnell.
Fixes #64117.

File:

• trunk/src/wp-includes/blocks/search.php (modified) (5 diffs)

trunk/src/wp-includes/blocks/search.php

@@ -11 +11 @@
  * @since 6.3.0 Using block.json `viewScript` to register script, and update `view_script_handles()` only when needed.
  *
- * @param array    $attributes The block attributes.
- * @param string   $content    The saved content.
- * @param WP_Block $block      The parsed block.
+ * @param array $attributes The block attributes.
  *
  * @return string The search block markup.
@@ -153 +151 @@
         }
 
-        $field_markup_classes = $is_button_inside ? $border_color_classes : '';
-        $field_markup         = sprintf(
-                '<div class="wp-block-search__inside-wrapper %s" %s>%s</div>',
-                esc_attr( $field_markup_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(
+                '<div class="%s" %s>%s</div>',
+                esc_attr( 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.
@@ -370 +373 @@
                         // 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.
@@ -385 +395 @@
                                         // 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);',
@@ -397 +407 @@
                 } 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;