Changeset 53422 for branches/6.0/src/wp-includes/block-supports/layout.php

Timestamp:

05/20/2022 03:49:09 PM (3 years ago)

Author:

gziolo

Message:

Editor: Update WordPress packages for 6.0 RC 4

[53419] Editor: Fix opinionated block styles loading in editor

[53420] Editor: Update WordPress packages for 6.0 RC 4

[53421] Docs: Add missing documentation for fallback_gap_value param

Props SergeyBiryukov, zieladam, jffng.
Merges [53419], [53420] and [53421] to the 6.0 branch.
Fixes #55567.

Location:

branches/6.0

Files:

• . (modified) (1 prop)
• src/wp-includes/block-supports/layout.php (modified) (3 diffs)

branches/6.0/src/wp-includes/block-supports/layout.php

@@ -42 +42 @@
  * @param string  $gap_value                     The block gap value to apply.
  * @param boolean $should_skip_gap_serialization Whether to skip applying the user-defined value set in the editor.
+ * @param string  $fallback_gap_value            The custom fallback value for block gap.
  * @return string CSS style.
  */
-function wp_get_layout_style( $selector, $layout, $has_block_gap_support = false, $gap_value = null, $should_skip_gap_serialization = false ) {
+function wp_get_layout_style( $selector, $layout, $has_block_gap_support = false, $gap_value = null, $should_skip_gap_serialization = false, $fallback_gap_value = '0.5em' ) {
     $layout_type = isset( $layout['type'] ) ? $layout['type'] : 'default';
 
@@ -103 +104 @@
         if ( $has_block_gap_support ) {
             if ( is_array( $gap_value ) ) {
-                $gap_row    = isset( $gap_value['top'] ) ? $gap_value['top'] : '0.5em';
-                $gap_column = isset( $gap_value['left'] ) ? $gap_value['left'] : '0.5em';
+                $gap_row    = isset( $gap_value['top'] ) ? $gap_value['top'] : $fallback_gap_value;
+                $gap_column = isset( $gap_value['left'] ) ? $gap_value['left'] : $fallback_gap_value;
                 $gap_value  = $gap_row === $gap_column ? $gap_row : $gap_row . ' ' . $gap_column;
             }
-            $gap_style = $gap_value && ! $should_skip_gap_serialization ? $gap_value : 'var( --wp--style--block-gap, 0.5em )';
+            $gap_style = $gap_value && ! $should_skip_gap_serialization ? $gap_value : "var( --wp--style--block-gap, $fallback_gap_value )";
             $style    .= "gap: $gap_style;";
         } else {
-            $style .= 'gap: 0.5em;';
+            $style .= "gap: $fallback_gap_value;";
         }
 
@@ -183 +184 @@
     }
 
+    $fallback_gap_value = _wp_array_get( $block_type->supports, array( 'spacing', 'blockGap', '__experimentalDefault' ), '0.5em' );
+
     // If a block's block.json skips serialization for spacing or spacing.blockGap,
     // don't apply the user-defined value to the styles.
     $should_skip_gap_serialization = wp_should_skip_block_supports_serialization( $block_type, 'spacing', 'blockGap' );
-    $style                         = wp_get_layout_style( ".$class_name", $used_layout, $has_block_gap_support, $gap_value, $should_skip_gap_serialization );
+    $style                         = wp_get_layout_style( ".$class_name", $used_layout, $has_block_gap_support, $gap_value, $should_skip_gap_serialization, $fallback_gap_value );
     // This assumes the hook only applies to blocks with a single wrapper.
     // I think this is a reasonable limitation for that particular hook.