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

Timestamp:

07/18/2023 07:17:23 AM (2 years ago)

Author:

isabel_brison

Message:

Editor: update npm packages with second round of bug fixes for 6.3 RC1.

Includes miscellaneous bug fixes for 6.3 RC1.

Props ramonopoly, mukesh27.
Fixes #58804.

File:

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

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

@@ -9 +9 @@
  * Dynamically renders the `core/search` block.
  *
- * @param array $attributes The block attributes.
+ * @param array    $attributes The block attributes.
+ * @param string   $content    The saved content.
+ * @param WP_Block $block      The parsed block.
  *
  * @return string The search block markup.
  */
-function render_block_core_search( $attributes ) {
+function render_block_core_search( $attributes, $content, $block ) {
     // Older versions of the Search block defaulted the label and buttonText
     // attributes to `__( 'Search' )` meaning that many posts contain `<!--
@@ -71 +73 @@
         $input->set_attribute( 'value', get_search_query() );
         $input->set_attribute( 'placeholder', $attributes['placeholder'] );
-        if ( 'button-only' === $button_position && 'expand-searchfield' === $button_behavior ) {
+
+        $is_expandable_searchfield = 'button-only' === $button_position && 'expand-searchfield' === $button_behavior;
+        if ( $is_expandable_searchfield ) {
             $input->set_attribute( 'aria-hidden', 'true' );
             $input->set_attribute( 'tabindex', '-1' );
-            wp_enqueue_script( 'wp-block--search-view', plugins_url( 'search/view.min.js', __FILE__ ) );
+        }
+
+        // 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 ) );
+            }
         }
     }