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

Timestamp:

09/19/2022 08:12:02 PM (3 years ago)

Author:

audrasjb

Message:

Editor: Backport block supports (border, color, elements, spacing) from Gutenberg to WP 6.1.

This changeset backports border, color, elements and spacing block supports changes from Gutenberg to WP 6.1.

See tracking issue on Gutenberg repository: ​gutenberg#43440.

Props ramonopoly, glendaviesnz, bernhard-reiter, audrasjb, costdev.
See #56467.

File:

• trunk/src/wp-includes/block-supports/spacing.php (modified) (2 diffs)

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

@@ -38 +38 @@
  *
  * @since 5.8.0
+ * @since 6.1.0 Implemented the style engine to generate CSS and classnames.
  * @access private
  *
@@ -49 +50 @@
     }
 
+    $attributes          = array();
     $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();
+    $block_styles        = isset( $block_attributes['style'] ) ? $block_attributes['style'] : null;
 
-    if ( $has_padding_support && ! $skip_padding ) {
-        $padding_value = _wp_array_get( $block_attributes, array( 'style', 'spacing', 'padding' ), null );
-        if ( is_array( $padding_value ) ) {
-            foreach ( $padding_value as $key => $value ) {
-                $styles[] = sprintf( 'padding-%s: %s;', $key, $value );
-            }
-        } elseif ( null !== $padding_value ) {
-            $styles[] = sprintf( 'padding: %s;', $padding_value );
-        }
+    if ( ! $block_styles ) {
+        return $attributes;
     }
 
-    if ( $has_margin_support && ! $skip_margin ) {
-        $margin_value = _wp_array_get( $block_attributes, array( 'style', 'spacing', 'margin' ), null );
-        if ( is_array( $margin_value ) ) {
-            foreach ( $margin_value as $key => $value ) {
-                $styles[] = sprintf( 'margin-%s: %s;', $key, $value );
-            }
-        } elseif ( null !== $margin_value ) {
-            $styles[] = sprintf( 'margin: %s;', $margin_value );
-        }
+    $skip_padding                    = wp_should_skip_block_supports_serialization( $block_type, 'spacing', 'padding' );
+    $skip_margin                     = wp_should_skip_block_supports_serialization( $block_type, 'spacing', 'margin' );
+    $spacing_block_styles            = array();
+    $spacing_block_styles['padding'] = $has_padding_support && ! $skip_padding ? _wp_array_get( $block_styles, array( 'spacing', 'padding' ), null ) : null;
+    $spacing_block_styles['margin']  = $has_margin_support && ! $skip_margin ? _wp_array_get( $block_styles, array( 'spacing', 'margin' ), null ) : null;
+    $styles                          = wp_style_engine_get_styles( array( 'spacing' => $spacing_block_styles ) );
+
+    if ( ! empty( $styles['css'] ) ) {
+        $attributes['style'] = $styles['css'];
     }
 
-    return empty( $styles ) ? array() : array( 'style' => implode( ' ', $styles ) );
+    return $attributes;
 }