Changeset 52329 for trunk/src/wp-includes/class-wp-theme-json.php

Timestamp:

12/06/2021 10:40:45 PM (3 years ago)

Author:

hellofromTonya

Message:

Editor: Allow theme.json to take precedence in setting the root level element's reset margin value.

Any margin added to the root element via theme.json is overwritten by a CSS reset margin value provided by the Gutenberg Plugin.

This commit makes theme.json setting take precedence by generating the global styles body reset prior to processing the theme.json.

Follow-up to [52049].

Props get_dave, hellofromTonya.
Fixes #54550.

File:

• trunk/src/wp-includes/class-wp-theme-json.php (modified) (3 diffs)

trunk/src/wp-includes/class-wp-theme-json.php

@@ -356 +356 @@
      * @since 5.8.0
      *
-     * @param array $theme_json A structure that follows the theme.json schema.
-     * @param string $origin    Optional. What source of data this object represents.
-     *                          One of 'default', 'theme', or 'custom'. Default 'theme'.
+     * @param array  $theme_json A structure that follows the theme.json schema.
+     * @param string $origin     Optional. What source of data this object represents.
+     *                           One of 'default', 'theme', or 'custom'. Default 'theme'.
      */
     public function __construct( $theme_json = array(), $origin = 'theme' ) {
@@ -777 +777 @@
             }
 
+            /*
+             * Reset default browser margin on the root body element.
+             * This is set on the root selector **before** generating the ruleset
+             * from the `theme.json`. This is to ensure that if the `theme.json` declares
+             * `margin` in its `spacing` declaration for the `body` element then these
+             * user-generated values take precedence in the CSS cascade.
+             * @link https://github.com/WordPress/gutenberg/issues/36147.
+             */
+            if ( self::ROOT_BLOCK_SELECTOR === $selector ) {
+                $block_rules .= 'body { margin: 0; }';
+            }
+
             // 2. Generate the rules that use the general selector.
             $block_rules .= self::to_ruleset( $selector, $declarations );
@@ -787 +799 @@
 
             if ( self::ROOT_BLOCK_SELECTOR === $selector ) {
-                $block_rules .= 'body { margin: 0; }';
                 $block_rules .= '.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }';
                 $block_rules .= '.wp-site-blocks > .alignright { float: right; margin-left: 2em; }';