Changeset 53076 for trunk/src/wp-includes/block-supports/border.php

Timestamp:

04/05/2022 12:06:48 PM (3 years ago)

Author:

gziolo

Message:

Editor: Backport block support changes from the Gutenberg plugin

Migrate spacing, border, color, dimensions, elements and typography and associated tests for block supports in the block editor.

Related changes in Gutenberg:

• Include individual serialization changes from ​https://github.com/WordPress/gutenberg/commit/6de16981c7fef3db7cc4a9d6cfcb0ad85c916c62
• Skip Style Engine integration from ​https://github.com/WordPress/gutenberg/commit/44925a947fde29feaab512e0adf4291272209d59%60

Props ramonopoly, aaronrobertshaw.
See #55505.

File:

• trunk/src/wp-includes/block-supports/border.php (modified) (6 diffs)

trunk/src/wp-includes/block-supports/border.php

@@ -51 +51 @@
  */
 function wp_apply_border_support( $block_type, $block_attributes ) {
-    if ( wp_skip_border_serialization( $block_type ) ) {
+    if ( wp_should_skip_block_supports_serialization( $block_type, 'border' ) ) {
         return array();
     }
@@ -61 +61 @@
     if (
         wp_has_border_feature_support( $block_type, 'radius' ) &&
-        isset( $block_attributes['style']['border']['radius'] )
+        isset( $block_attributes['style']['border']['radius'] ) &&
+        ! wp_should_skip_block_supports_serialization( $block_type, '__experimentalBorder', 'radius' )
     ) {
         $border_radius = $block_attributes['style']['border']['radius'];
@@ -85 +86 @@
     if (
         wp_has_border_feature_support( $block_type, 'style' ) &&
-        isset( $block_attributes['style']['border']['style'] )
+        isset( $block_attributes['style']['border']['style'] ) &&
+        ! wp_should_skip_block_supports_serialization( $block_type, '__experimentalBorder', 'style' )
     ) {
         $border_style = $block_attributes['style']['border']['style'];
@@ -94 +96 @@
     if (
         wp_has_border_feature_support( $block_type, 'width' ) &&
-        isset( $block_attributes['style']['border']['width'] )
+        isset( $block_attributes['style']['border']['width'] ) &&
+        ! wp_should_skip_block_supports_serialization( $block_type, '__experimentalBorder', 'width' )
     ) {
         $border_width = $block_attributes['style']['border']['width'];
@@ -107 +110 @@
 
     // Border color.
-    if ( wp_has_border_feature_support( $block_type, 'color' ) ) {
+    if (
+        wp_has_border_feature_support( $block_type, 'color' ) &&
+        ! wp_should_skip_block_supports_serialization( $block_type, '__experimentalBorder', 'color' )
+    ) {
         $has_named_border_color  = array_key_exists( 'borderColor', $block_attributes );
         $has_custom_border_color = isset( $block_attributes['style']['border']['color'] );
@@ -135 +141 @@
 
     return $attributes;
-}
-
-/**
- * Checks whether serialization of the current block's border properties should
- * occur.
- *
- * @since 5.8.0
- * @access private
- *
- * @param WP_Block_Type $block_type Block type.
- * @return bool Whether serialization of the current block's border properties
- *              should occur.
- */
-function wp_skip_border_serialization( $block_type ) {
-    $border_support = _wp_array_get( $block_type->supports, array( '__experimentalBorder' ), false );
-
-    return is_array( $border_support ) &&
-        array_key_exists( '__experimentalSkipSerialization', $border_support ) &&
-        $border_support['__experimentalSkipSerialization'];
 }