Changeset 58241 for trunk/src/wp-includes/block-supports/layout.php

Timestamp:

05/30/2024 01:14:15 AM (12 months ago)

Author:

isabel_brison

Message:

Editor: level global styles specificity at 0-1-0.

Adjusts the block level global styles selectors so they have a consistent specificity of 0-1-0, and adjusts base and layout global style selectors to their minimum required specificity.

Props aaronrobertshaw, isabel_brison, andrewserong, mukesh27.
Fixes #61165.

File:

• trunk/src/wp-includes/block-supports/layout.php (modified) (12 diffs)

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

@@ -15 +15 @@
  *
  * @since 6.3.0
+ * @since 6.6.0 Updated specificity for compatibility with 0-1-0 global styles specificity.
  * @access private
  *
@@ -52 +53 @@
             'spacingStyles' => array(
                 array(
-                    'selector' => ' > :first-child:first-child',
+                    'selector' => ' > :first-child',
                     'rules'    => array(
                         'margin-block-start' => '0',
@@ -58 +59 @@
                 ),
                 array(
-                    'selector' => ' > :last-child:last-child',
+                    'selector' => ' > :last-child',
                     'rules'    => array(
                         'margin-block-end' => '0',
@@ -117 +118 @@
             'spacingStyles' => array(
                 array(
-                    'selector' => ' > :first-child:first-child',
+                    'selector' => ' > :first-child',
                     'rules'    => array(
                         'margin-block-start' => '0',
@@ -123 +124 @@
                 ),
                 array(
-                    'selector' => ' > :last-child:last-child',
+                    'selector' => ' > :last-child',
                     'rules'    => array(
                         'margin-block-end' => '0',
@@ -151 +152 @@
                 ),
                 array(
-                    'selector' => ' > *',
+                    'selector' => ' > :is(*, div)', // :is(*, div) instead of just * increases the specificity by 001.
                     'rules'    => array(
                         'margin' => '0',
@@ -173 +174 @@
             'baseStyles'    => array(
                 array(
-                    'selector' => ' > *',
+                    'selector' => ' > :is(*, div)', // :is(*, div) instead of just * increases the specificity by 001.
                     'rules'    => array(
                         'margin' => '0',
@@ -223 +224 @@
  * @since 6.1.0 Added `$block_spacing` param, use style engine to enqueue styles.
  * @since 6.3.0 Added grid layout type.
+ * @since 6.6.0 Removed duplicated selector from layout styles.
  * @access private
  *
@@ -262 +264 @@
                     ),
                     array(
-                        'selector'     => "$selector$selector > * + *",
+                        'selector'     => "$selector > * + *",
                         'declarations' => array(
                             'margin-block-start' => $gap_value,
@@ -371 +373 @@
                     ),
                     array(
-                        'selector'     => "$selector$selector > * + *",
+                        'selector'     => "$selector > * + *",
                         'declarations' => array(
                             'margin-block-start' => $gap_value,
@@ -550 +552 @@
  * @since 6.3.0 Adds compound class to layout wrapper for global spacing styles.
  * @since 6.3.0 Check for layout support via the `layout` key with fallback to `__experimentalLayout`.
+ * @since 6.6.0 Removed duplicate container class from layout styles.
  * @access private
  *
@@ -796 +799 @@
 
         $style = wp_get_layout_style(
-            ".$container_class.$container_class",
+            ".$container_class",
             $used_layout,
             $has_block_gap_support,