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

Timestamp:

09/26/2023 02:20:18 PM (3 years ago)

Author:

karmatosed

Message:

Update editor related npm packages

The npm packages needed updating for 6.4 to the latest.

Props mikachan, mukesdpanchal27, luisherranz, youknowriad, tellthemachines, gziolo, ockham, michalczaplinski

Fixes #59411

File:

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

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

@@ -47 +47 @@
     // Border color classes need to be applied to the elements that have a border color.
     $border_color_classes = get_border_color_classes_for_block_core_search( $attributes );
+    // This variable is a constant and its value is always false at this moment.
+    // It is defined this way because some values depend on it, in case it changes in the future.
+    $open_by_default = 'false';
 
     $label_inner_html = empty( $attributes['label'] ) ? __( 'Search' ) : wp_kses_post( $attributes['label'] );
@@ -78 +81 @@
         $is_expandable_searchfield = 'button-only' === $button_position && 'expand-searchfield' === $button_behavior;
         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.
             $input->set_attribute( 'aria-hidden', 'true' );
             $input->set_attribute( 'tabindex', '-1' );
@@ -140 +146 @@
             $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.
                 $button->set_attribute( 'aria-label', __( 'Expand search field' ) );
                 $button->set_attribute( 'aria-controls', 'wp-block-search__input-' . $input_id );
                 $button->set_attribute( 'aria-expanded', 'false' );
+                $button->set_attribute( 'type', 'button' );
             } else {
                 $button->set_attribute( 'aria-label', wp_strip_all_tags( $attributes['buttonText'] ) );
@@ -159 +172 @@
         array( 'class' => $classnames )
     );
+    $form_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"
+        ';
+    }
 
     return sprintf(
-        '<form role="search" method="get" action="%s" %s>%s</form>',
+        '<form role="search" method="get" action="%1s" %2s %3s>%4s</form>',
         esc_url( home_url( '/' ) ),
         $wrapper_attributes,
+        $form_directives,
         $label . $field_markup
     );
@@ -182 +208 @@
 
 /**
+ * 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' );
+
+/**
  * Builds the correct top level classnames for the 'core/search' block.
  *
@@ -241 +286 @@
  */
 function apply_block_core_search_border_style( $attributes, $property, $side, &$wrapper_styles, &$button_styles, &$input_styles ) {
-    $is_button_inside = 'button-inside' === _wp_array_get( $attributes, array( 'buttonPosition' ), false );
+    $is_button_inside = isset( $attributes['buttonPosition'] ) && 'button-inside' === $attributes['buttonPosition'];
 
     $path = array( 'style', 'border', $property );