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

Timestamp:

10/13/2020 01:07:23 PM (5 years ago)

Author:

jorgefilipecosta

Message:

Editor: update packages; Port block supports to WordPress core.

The following package versions were changed:
@wordpress/a11y: 2.11.0 -> 2.13.0
@wordpress/annotations: 1.20.4 -> 1.22.0
@wordpress/api-fetch: 3.18.0 -> 3.20.0
@wordpress/autop: 2.9.0 -> 2.10.0
@wordpress/blob: 2.9.0 -> 2.10.0
@wordpress/block-directory: 1.13.7 -> 1.16.0
@wordpress/block-editor: 4.3.7 -> 5.0.0
@wordpress/block-library: 2.22.7 -> 2.25.0
@wordpress/block-serialization-default-parser: 3.7.0 -> 3.8.0
@wordpress/blocks: 6.20.3 -> 6.23.0
@wordpress/components: 10.0.6 -> 11.0.0
@wordpress/compose: 3.19.3 -> 3.21.0
@wordpress/core-data: 2.20.3 -> 2.23.0
@wordpress/data: 4.22.3 -> 4.24.0
@wordpress/data-controls: 1.16.3 -> 1.18.0
@wordpress/date: 3.10.0 -> 3.12.0
@wordpress/deprecated: 2.9.0 -> 2.10.0
@wordpress/dom: 2.13.1 -> 2.15.0
@wordpress/dom-ready: 2.10.0 -> 2.11.0
@wordpress/e2e-test-utils: 4.11.2 -> 4.14.0
@wordpress/edit-post: 3.21.7 -> 3.24.0
@wordpress/editor: 9.20.7 -> 9.23.0
@wordpress/element: 2.16.0 -> 2.18.0
@wordpress/escape-html: 1.9.0 -> 1.10.0
@wordpress/format-library: 1.22.7 -> 1.24.0
@wordpress/hooks: 2.9.0 -> 2.10.0
@wordpress/html-entities: 2.8.0 -> 2.9.0
@wordpress/i18n: 3.14.0 -> 3.16.0
@wordpress/icons: 2.4.0 -> 2.7.0
@wordpress/is-shallow-equal: 2.1.0 -> 2.3.0
@wordpress/keyboard-shortcuts: 1.9.3 -> 1.11.0
@wordpress/keycodes: 2.14.0 -> 2.16.0
@wordpress/library-export-default-webpack-plugin: 1.7.0 -> 1.9.0
@wordpress/list-reusable-blocks: 1.21.6 -> 1.23.0
@wordpress/media-utils: 1.15.0 -> 1.17.0
@wordpress/notices: 2.8.3 -> 2.10.0
@wordpress/nux: 3.20.6 -> 3.22.0
@wordpress/plugins: 2.20.3 -> 2.22.0
@wordpress/primitives: 1.7.0 -> 1.9.0
@wordpress/priority-queue: 1.7.0 -> 1.9.0
@wordpress/redux-routine: 3.10.0 -> 3.12.0
@wordpress/rich-text: 3.20.4 -> 3.22.0
@wordpress/scripts: 12.1.1 -> 12.3.0
@wordpress/server-side-render: 1.16.6 -> 1.18.0
@wordpress/shortcode: 2.9.0 -> 2.11.0
@wordpress/token-list: 1.11.0 -> 1.13.0
@wordpress/url: 2.17.0 -> 2.19.0
@wordpress/viewport: 2.21.3 -> 2.23.0
@wordpress/warning: 1.2.0 -> 1.3.0
@wordpress/wordcount: 2.10.0 -> 2.12.0

Props isabel_brison, youknowriad, mcsf.
Fixes #51461.

File:

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

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

@@ -28 +28 @@
     );
 
-    $input_id      = 'wp-block-search__input-' . ++$instance_id;
-    $label_markup  = '';
-    $button_markup = '';
+    $input_id        = 'wp-block-search__input-' . ++$instance_id;
+    $classnames      = classnames_for_block_core_search( $attributes );
+    $show_label      = ( ! empty( $attributes['showLabel'] ) ) ? true : false;
+    $use_icon_button = ( ! empty( $attributes['buttonUseIcon'] ) ) ? true : false;
+    $show_input      = ( ! empty( $attributes['buttonPosition'] ) && 'button-only' === $attributes['buttonPosition'] ) ? false : true;
+    $show_button     = ( ! empty( $attributes['buttonPosition'] ) && 'no-button' === $attributes['buttonPosition'] ) ? false : true;
+    $label_markup    = '';
+    $input_markup    = '';
+    $button_markup   = '';
+    $width_styles    = '';
 
-    if ( ! empty( $attributes['label'] ) ) {
-        $label_markup = sprintf(
-            '<label for="%s" class="wp-block-search__label">%s</label>',
+    if ( $show_label ) {
+        if ( ! empty( $attributes['label'] ) ) {
+            $label_markup = sprintf(
+                '<label for="%s" class="wp-block-search__label">%s</label>',
+                $input_id,
+                $attributes['label']
+            );
+        } else {
+            $label_markup = sprintf(
+                '<label for="%s" class="wp-block-search__label screen-reader-text">%s</label>',
+                $input_id,
+                __( 'Search' )
+            );
+        }
+    }
+
+    if ( $show_input ) {
+        $input_markup = sprintf(
+            '<input type="search" id="%s" class="wp-block-search__input" name="s" value="%s" placeholder="%s" required />',
             $input_id,
-            $attributes['label']
-        );
-    } else {
-        $label_markup = sprintf(
-            '<label for="%s" class="wp-block-search__label screen-reader-text">%s</label>',
-            $input_id,
-            __( 'Search' )
+            esc_attr( get_search_query() ),
+            esc_attr( $attributes['placeholder'] )
         );
     }
 
-    $input_markup = sprintf(
-        '<input type="search" id="%s" class="wp-block-search__input" name="s" value="%s" placeholder="%s" required />',
-        $input_id,
-        esc_attr( get_search_query() ),
-        esc_attr( $attributes['placeholder'] )
-    );
+    if ( $show_button ) {
+        $button_internal_markup = '';
 
-    if ( ! empty( $attributes['buttonText'] ) ) {
+        if ( ! $use_icon_button ) {
+            if ( ! empty( $attributes['buttonText'] ) ) {
+                $button_internal_markup = $attributes['buttonText'];
+            }
+        } else {
+            $button_internal_markup =
+                '<svg id="search-icon" class="search-icon" viewBox="0 0 24 24">
+                    <path d="M13.5 6C10.5 6 8 8.5 8 11.5c0 1.1.3 2.1.9 3l-3.4 3 1 1.1 3.4-2.9c1 .9 2.2 1.4 3.6 1.4 3 0 5.5-2.5 5.5-5.5C19 8.5 16.5 6 13.5 6zm0 9.5c-2.2 0-4-1.8-4-4s1.8-4 4-4 4 1.8 4 4-1.8 4-4 4z"></path>
+                </svg>';
+        }
+
         $button_markup = sprintf(
             '<button type="submit" class="wp-block-search__button">%s</button>',
-            $attributes['buttonText']
+            $button_internal_markup
         );
     }
 
-    $class = 'wp-block-search';
-    if ( isset( $attributes['className'] ) ) {
-        $class .= ' ' . $attributes['className'];
-    }
-    if ( isset( $attributes['align'] ) ) {
-        $class .= ' align' . $attributes['align'];
+    if ( ! empty( $attributes['width'] ) && ! empty( $attributes['widthUnit'] ) ) {
+        if ( ! empty( $attributes['buttonPosition'] ) && 'button-only' !== $attributes['buttonPosition'] ) {
+            $width_styles = ' style="width: ' . $attributes['width'] . $attributes['widthUnit'] . ';"';
+        }
     }
 
+    $field_markup = sprintf(
+        '<div class="wp-block-search__inside-wrapper"%s>%s</div>',
+        $width_styles,
+        $input_markup . $button_markup
+    );
+
     return sprintf(
-        '<form class="%s" role="search" method="get" action="%s">%s</form>',
-        esc_attr( $class ),
+        '<form role="search" method="get" action="%s" class="%s">%s</form>',
         esc_url( home_url( '/' ) ),
-        $label_markup . $input_markup . $button_markup
+        $classnames,
+        $label_markup . $field_markup
     );
 }
@@ -88 +116 @@
 }
 add_action( 'init', 'register_block_core_search' );
+
+/**
+ * Builds the correct top level classnames for the 'core/search' block.
+ *
+ * @param array $attributes The block attributes.
+ *
+ * @return string The classnames used in the block.
+ */
+function classnames_for_block_core_search( $attributes ) {
+    $classnames = array();
+
+    if ( ! empty( $attributes['buttonPosition'] ) ) {
+        if ( 'button-inside' === $attributes['buttonPosition'] ) {
+            $classnames[] = 'wp-block-search__button-inside';
+        }
+
+        if ( 'button-outside' === $attributes['buttonPosition'] ) {
+            $classnames[] = 'wp-block-search__button-outside';
+        }
+
+        if ( 'no-button' === $attributes['buttonPosition'] ) {
+            $classnames[] = 'wp-block-search__no-button';
+        }
+
+        if ( 'button-only' === $attributes['buttonPosition'] ) {
+            $classnames[] = 'wp-block-search__button-only';
+        }
+    }
+
+    if ( isset( $attributes['buttonUseIcon'] ) ) {
+        if ( ! empty( $attributes['buttonPosition'] ) && 'no-button' !== $attributes['buttonPosition'] ) {
+            if ( $attributes['buttonUseIcon'] ) {
+                $classnames[] = 'wp-block-search__icon-button';
+            } else {
+                $classnames[] = 'wp-block-search__text-button';
+            }
+        }
+    }
+
+    return implode( ' ', $classnames );
+}