Changeset 50761 for trunk/src/wp-includes/blocks

Timestamp:

04/15/2021 02:41:38 PM (5 years ago)

Author:

gziolo

Message:

Editor: Update WordPress packages to use with WordPress 5.8

In the response to the discussion during the Dev Chat, I'm doing a first pass to keep WordPress packages up to date in the WordPress 5.8 release cycle.

See ​https://github.com/WordPress/wordpress-develop/pull/1176 for more details.

Props youknowriad, aristath, andraganescu.
See #52991.

Location:

trunk/src/wp-includes/blocks

Files:

• block.php (modified) (1 diff)
• button/block.json (modified) (1 diff)
• group/block.json (modified) (2 diffs)
• index.php (modified) (1 diff)
• latest-posts.php (modified) (1 diff)
• preformatted/block.json (modified) (1 diff)
• search.php (modified) (4 diffs)
• search/block.json (modified) (1 diff)
• social-link.php (modified) (1 diff)
• spacer/block.json (modified) (1 diff)
• subhead (deleted)
• verse/block.json (modified) (1 diff)

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

@@ -30 +30 @@
                 sprintf(
                     // translators: %s is the user-provided title of the reusable block.
-                    __( 'Could not render Reusable Block <strong>%s</strong>: blocks cannot be rendered inside themselves.' ),
+                    __( 'Could not render Reusable Block <strong>%s</strong>. Block cannot be rendered inside itself.' ),
                     $reusable_block->post_title
                 ),

trunk/src/wp-includes/blocks/button/block.json

@@ -62 +62 @@
         "align": true,
         "alignWide": false,
+        "color": {
+            "__experimentalSkipSerialization": true,
+            "gradients": true
+        },
         "reusable": false,
-        "__experimentalSelector": ".wp-block-button > a"
+        "__experimentalSelector": ".wp-block-button__link"
     },
     "editorStyle": "wp-block-button-editor",

trunk/src/wp-includes/blocks/group/block.json

@@ -13 +13 @@
     },
     "supports": {
-        "align": [
-            "wide",
-            "full"
-        ],
+        "align": [ "wide", "full" ],
         "anchor": true,
         "html": false,
@@ -27 +24 @@
         },
         "__experimentalBorder": {
-            "radius": true
-        }
+            "color": true,
+            "radius": true,
+            "style": true,
+            "width": true
+        },
+        "__experimentalLayout": true
     },
     "editorStyle": "wp-block-group-editor",

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

@@ -53 +53 @@
         'social-links',
         'spacer',
-        'subhead',
         'table',
         'text-columns',

trunk/src/wp-includes/blocks/latest-posts.php

@@ -12 +12 @@
  * @var int
  */
+global $block_core_latest_posts_excerpt_length;
 $block_core_latest_posts_excerpt_length = 0;
 

trunk/src/wp-includes/blocks/preformatted/block.json

@@ -14 +14 @@
     "supports": {
         "anchor": true,
+        "color": {
+            "gradients": true
+        },
         "fontSize": true
     },

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

@@ -37 +37 @@
     $input_markup    = '';
     $button_markup   = '';
-    $width_styles    = '';
+    $inline_styles   = styles_for_block_core_search( $attributes );
 
     if ( $show_label ) {
@@ -57 +57 @@
     if ( $show_input ) {
         $input_markup = sprintf(
-            '<input type="search" id="%s" class="wp-block-search__input" name="s" value="%s" placeholder="%s" required />',
+            '<input type="search" id="%s" class="wp-block-search__input" name="s" value="%s" placeholder="%s" %s required />',
             $input_id,
             esc_attr( get_search_query() ),
-            esc_attr( $attributes['placeholder'] )
+            esc_attr( $attributes['placeholder'] ),
+            $inline_styles['shared']
         );
     }
@@ -81 +82 @@
 
         $button_markup = sprintf(
-            '<button type="submit"class="wp-block-search__button ' . $button_classes . '">%s</button>',
+            '<button type="submit" class="wp-block-search__button %s"%s>%s</button>',
+            $button_classes,
+            $inline_styles['shared'],
             $button_internal_markup
         );
     }
 
-    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,
+        $inline_styles['wrapper'],
         $input_markup . $button_markup
     );
@@ -160 +157 @@
     return implode( ' ', $classnames );
 }
+
+/**
+ * Builds an array of inline styles for the search block.
+ *
+ * The result will contain one entry for shared styles such as those for the
+ * inner input or button and a second for the inner wrapper should the block
+ * be positioning the button "inside".
+ *
+ * @param  array $attributes The block attributes.
+ *
+ * @return array Style HTML attribute.
+ */
+function styles_for_block_core_search( $attributes ) {
+    $shared_styles  = array();
+    $wrapper_styles = array();
+
+    // Add width styles.
+    $has_width   = ! empty( $attributes['width'] ) && ! empty( $attributes['widthUnit'] );
+    $button_only = ! empty( $attributes['buttonPosition'] ) && 'button-only' === $attributes['buttonPosition'];
+
+    if ( $has_width && ! $button_only ) {
+        $wrapper_styles[] = sprintf(
+            'width: %d%s;',
+            esc_attr( $attributes['width'] ),
+            esc_attr( $attributes['widthUnit'] )
+        );
+    }
+
+    // Add border radius styles.
+    $has_border_radius = ! empty( $attributes['style']['border']['radius'] );
+
+    if ( $has_border_radius ) {
+        // Shared style for button and input radius values.
+        $border_radius   = $attributes['style']['border']['radius'];
+        $shared_styles[] = sprintf( 'border-radius: %spx;', esc_attr( $border_radius ) );
+
+        // Apply wrapper border radius if button placed inside.
+        $button_inside = ! empty( $attributes['buttonPosition'] ) &&
+            'button-inside' === $attributes['buttonPosition'];
+
+        if ( $button_inside ) {
+            // We adjust the border radius value for the outer wrapper element
+            // to make it visually consistent with the radius applied to inner
+            // elements.
+            $default_padding  = 4;
+            $adjusted_radius  = $border_radius + $default_padding;
+            $wrapper_styles[] = sprintf( 'border-radius: %dpx;', esc_attr( $adjusted_radius ) );
+        }
+    }
+
+    return array(
+        'shared'  => ! empty( $shared_styles ) ? sprintf( ' style="%s"', implode( ' ', $shared_styles ) ) : '',
+        'wrapper' => ! empty( $wrapper_styles ) ? sprintf( ' style="%s"', implode( ' ', $wrapper_styles ) ) : '',
+    );
+}

trunk/src/wp-includes/blocks/search/block.json

@@ -35 +35 @@
     "supports": {
         "align": [ "left", "center", "right" ],
+        "__experimentalBorder": {
+            "radius": true,
+            "__experimentalSkipSerialization": true
+        },
         "html": false
     },

trunk/src/wp-includes/blocks/social-link.php

@@ -18 +18 @@
     $open_in_new_tab = isset( $block->context['openInNewTab'] ) ? $block->context['openInNewTab'] : false;
 
-    $service    = ( isset( $attributes['service'] ) ) ? $attributes['service'] : 'Icon';
-    $url        = ( isset( $attributes['url'] ) ) ? $attributes['url'] : false;
-    $label      = ( isset( $attributes['label'] ) ) ? $attributes['label'] : block_core_social_link_get_name( $service );
+    $service = ( isset( $attributes['service'] ) ) ? $attributes['service'] : 'Icon';
+    $url     = ( isset( $attributes['url'] ) ) ? $attributes['url'] : false;
+    $label   = ( isset( $attributes['label'] ) ) ? $attributes['label'] : sprintf(
+        /* translators: %1$s: Social-network name. %2$s: URL. */
+        __( '%1$s: %2$s', 'gutenberg' ),
+        block_core_social_link_get_name( $service ),
+        $url
+    );
     $class_name = isset( $attributes['className'] ) ? ' ' . $attributes['className'] : false;
 

trunk/src/wp-includes/blocks/spacer/block.json

@@ -7 +7 @@
             "type": "number",
             "default": 100
+        },
+        "width": {
+            "type": "number"
         }
     },
+    "usesContext": [
+        "orientation"
+    ],
     "supports": {
         "anchor": true

trunk/src/wp-includes/blocks/verse/block.json

@@ -18 +18 @@
         "anchor": true,
         "__experimentalFontFamily": true,
-        "fontSize": true
+        "fontSize": true,
+        "spacing": {
+            "padding": true
+        }
     },
     "style": "wp-block-verse",