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

Timestamp:

04/05/2022 12:06:48 PM (4 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/spacing.php (modified) (4 diffs)

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

@@ -45 +45 @@
  */
 function wp_apply_spacing_support( $block_type, $block_attributes ) {
-    if ( wp_skip_spacing_serialization( $block_type ) ) {
+    if ( wp_should_skip_block_supports_serialization( $block_type, 'spacing' ) ) {
         return array();
     }
@@ -51 +51 @@
     $has_padding_support = block_has_support( $block_type, array( 'spacing', 'padding' ), false );
     $has_margin_support  = block_has_support( $block_type, array( 'spacing', 'margin' ), false );
+    $skip_padding        = wp_should_skip_block_supports_serialization( $block_type, 'spacing', 'padding' );
+    $skip_margin         = wp_should_skip_block_supports_serialization( $block_type, 'spacing', 'margin' );
     $styles              = array();
 
-    if ( $has_padding_support ) {
+    if ( $has_padding_support && ! $skip_padding ) {
         $padding_value = _wp_array_get( $block_attributes, array( 'style', 'spacing', 'padding' ), null );
         if ( is_array( $padding_value ) ) {
@@ -64 +66 @@
     }
 
-    if ( $has_margin_support ) {
+    if ( $has_margin_support && ! $skip_margin ) {
         $margin_value = _wp_array_get( $block_attributes, array( 'style', 'spacing', 'margin' ), null );
         if ( is_array( $margin_value ) ) {
@@ -78 +80 @@
 }
 
-/**
- * Checks whether serialization of the current block's spacing properties should
- * occur.
- *
- * @since 5.9.0
- * @access private
- *
- * @param WP_Block_Type $block_type Block type.
- * @return bool Whether to serialize spacing support styles & classes.
- */
-function wp_skip_spacing_serialization( $block_type ) {
-    $spacing_support = _wp_array_get( $block_type->supports, array( 'spacing' ), false );
-
-    return is_array( $spacing_support ) &&
-        array_key_exists( '__experimentalSkipSerialization', $spacing_support ) &&
-        $spacing_support['__experimentalSkipSerialization'];
-}
-
 // Register the block support.
 WP_Block_Supports::get_instance()->register(