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

Timestamp:

01/29/2024 09:04:18 PM (9 months ago)

Author:

youknowriad

Message:

Editor: Update the WordPress packages to the Gutenberg 16.7 RC2 version.

This patch, somewhat small brings a lot to WordPress.
This includes features like:

• DataViews.
• Customization tools like box shadow, background size and repeat.
• UI improvements in the site editor.
• Preferences sharing between the post and site editors.
• Unified panels and editors between post and site editors.
• Improved template mode in the post editor.
• Iterations to multiple interactive blocks.
• Preparing the blocks and UI for pattern overrides.
• and a lot more.

Props luisherranz, gziolo, isabel_brison, costdev, jonsurrell, peterwilsoncc, get_dave, antonvlasenko, desrosj.
See #60315.

File:

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

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

@@ -17 +17 @@
  * @return string The search block markup.
  */
-function render_block_core_search( $attributes, $content, $block ) {
+function render_block_core_search( $attributes ) {
     // Older versions of the Search block defaulted the label and buttonText
     // attributes to `__( 'Search' )` meaning that many posts contain `<!--
@@ -37 +37 @@
     $button_position     = $show_button ? $attributes['buttonPosition'] : null;
     $query_params        = ( ! empty( $attributes['query'] ) ) ? $attributes['query'] : array();
-    $button_behavior     = ( ! empty( $attributes['buttonBehavior'] ) ) ? $attributes['buttonBehavior'] : 'default';
     $button              = '';
     $query_params_markup = '';
@@ -79 +78 @@
         $input->set_attribute( 'placeholder', $attributes['placeholder'] );
 
-        $is_expandable_searchfield = 'button-only' === $button_position && 'expand-searchfield' === $button_behavior;
+        // If it's interactive, enqueue the script module and add the directives.
+        $is_expandable_searchfield = 'button-only' === $button_position;
         if ( $is_expandable_searchfield ) {
-            $input->set_attribute( 'data-wp-bind--aria-hidden', '!context.core.search.isSearchInputVisible' );
-            $input->set_attribute( 'data-wp-bind--tabindex', 'selectors.core.search.tabindex' );
-            // Adding these attributes manually is needed until the Interactivity API SSR logic is added to core.
+            wp_enqueue_script_module( '@wordpress/block-library/search' );
+
+            $input->set_attribute( 'data-wp-bind--aria-hidden', '!context.isSearchInputVisible' );
+            $input->set_attribute( 'data-wp-bind--tabindex', 'state.tabindex' );
+
+            // Adding these attributes manually is needed until the Interactivity API
+            // SSR logic is added to core.
             $input->set_attribute( 'aria-hidden', 'true' );
             $input->set_attribute( 'tabindex', '-1' );
-        }
-
-        // If the script already exists, there is no point in removing it from viewScript.
-        $view_js_file = 'wp-block-search-view';
-        if ( ! wp_script_is( $view_js_file ) ) {
-            $script_handles = $block->block_type->view_script_handles;
-
-            // If the script is not needed, and it is still in the `view_script_handles`, remove it.
-            if ( ! $is_expandable_searchfield && in_array( $view_js_file, $script_handles, true ) ) {
-                $block->block_type->view_script_handles = array_diff( $script_handles, array( $view_js_file ) );
-            }
-            // If the script is needed, but it was previously removed, add it again.
-            if ( $is_expandable_searchfield && ! in_array( $view_js_file, $script_handles, true ) ) {
-                $block->block_type->view_script_handles = array_merge( $script_handles, array( $view_js_file ) );
-            }
         }
     }
@@ -145 +134 @@
         if ( $button->next_tag() ) {
             $button->add_class( implode( ' ', $button_classes ) );
-            if ( 'expand-searchfield' === $attributes['buttonBehavior'] && 'button-only' === $attributes['buttonPosition'] ) {
-                $button->set_attribute( 'data-wp-bind--aria-label', 'selectors.core.search.ariaLabel' );
-                $button->set_attribute( 'data-wp-bind--aria-controls', 'selectors.core.search.ariaControls' );
-                $button->set_attribute( 'data-wp-bind--aria-expanded', 'context.core.search.isSearchInputVisible' );
-                $button->set_attribute( 'data-wp-bind--type', 'selectors.core.search.type' );
-                $button->set_attribute( 'data-wp-on--click', 'actions.core.search.openSearchInput' );
-                // Adding these attributes manually is needed until the Interactivity API SSR logic is added to core.
+            if ( 'button-only' === $attributes['buttonPosition'] ) {
+                $button->set_attribute( 'data-wp-bind--aria-label', 'state.ariaLabel' );
+                $button->set_attribute( 'data-wp-bind--aria-controls', 'state.ariaControls' );
+                $button->set_attribute( 'data-wp-bind--aria-expanded', 'context.isSearchInputVisible' );
+                $button->set_attribute( 'data-wp-bind--type', 'state.type' );
+                $button->set_attribute( 'data-wp-on--click', 'actions.openSearchInput' );
+
+                // Adding these attributes manually is needed until the Interactivity
+                // API SSR logic is added to core.
                 $button->set_attribute( 'aria-label', __( 'Expand search field' ) );
                 $button->set_attribute( 'aria-controls', 'wp-block-search__input-' . $input_id );
@@ -173 +164 @@
     );
     $form_directives      = '';
+
+    // If it's interactive, add the directives.
     if ( $is_expandable_searchfield ) {
         $aria_label_expanded  = __( 'Submit Search' );
         $aria_label_collapsed = __( 'Expand search field' );
         $form_directives      = '
-            data-wp-interactive
-            data-wp-context=\'{ "core": { "search": { "isSearchInputVisible": ' . $open_by_default . ', "inputId": "' . $input_id . '", "ariaLabelExpanded": "' . $aria_label_expanded . '", "ariaLabelCollapsed": "' . $aria_label_collapsed . '" } } }\'
-            data-wp-class--wp-block-search__searchfield-hidden="!context.core.search.isSearchInputVisible"
-            data-wp-on--keydown="actions.core.search.handleSearchKeydown"
-            data-wp-on--focusout="actions.core.search.handleSearchFocusout"
+            data-wp-interactive=\'{ "namespace": "core/search" }\'
+            data-wp-context=\'{ "isSearchInputVisible": ' . $open_by_default . ', "inputId": "' . $input_id . '", "ariaLabelExpanded": "' . $aria_label_expanded . '", "ariaLabelCollapsed": "' . $aria_label_collapsed . '" }\'
+            data-wp-class--wp-block-search__searchfield-hidden="!context.isSearchInputVisible"
+            data-wp-on--keydown="actions.handleSearchKeydown"
+            data-wp-on--focusout="actions.handleSearchFocusout"
         ';
     }
@@ -204 +197 @@
         )
     );
+
+    wp_register_script_module(
+        '@wordpress/block-library/search',
+        defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN ? gutenberg_url( '/build/interactivity/search.min.js' ) : includes_url( 'blocks/search/view.min.js' ),
+        array( '@wordpress/interactivity' ),
+        defined( 'GUTENBERG_VERSION' ) ? GUTENBERG_VERSION : get_bloginfo( 'version' )
+    );
 }
 add_action( 'init', 'register_block_core_search' );
-
-/**
- * Ensure that the view script has the `wp-interactivity` dependency.
- *
- * @since 6.4.0
- *
- * @global WP_Scripts $wp_scripts
- */
-function block_core_search_ensure_interactivity_dependency() {
-    global $wp_scripts;
-    if (
-        isset( $wp_scripts->registered['wp-block-search-view'] ) &&
-        ! in_array( 'wp-interactivity', $wp_scripts->registered['wp-block-search-view']->deps, true )
-    ) {
-        $wp_scripts->registered['wp-block-search-view']->deps[] = 'wp-interactivity';
-    }
-}
-
-add_action( 'wp_print_scripts', 'block_core_search_ensure_interactivity_dependency' );
 
 /**
@@ -250 +231 @@
 
         if ( 'button-only' === $attributes['buttonPosition'] ) {
-            $classnames[] = 'wp-block-search__button-only';
-            if ( ! empty( $attributes['buttonBehavior'] ) && 'expand-searchfield' === $attributes['buttonBehavior'] ) {
-                $classnames[] = 'wp-block-search__button-behavior-expand wp-block-search__searchfield-hidden';
-            }
+            $classnames[] = 'wp-block-search__button-only wp-block-search__searchfield-hidden';
         }
     }