Changeset 57352

Timestamp:

01/25/2024 10:41:38 AM (3 years ago)

Author:

youknowriad

Message:

Editor: Fix Theme.json application of custom root selector for styles.

Theme.json stylesheets attempting to use a custom root selector are generated with in correct styles.

Props aaronrobertshaw, get_dave, mukesh27.
Fixes #60343.

Location:

trunk

Files:

• src/wp-includes/class-wp-theme-json.php (modified) (2 diffs)
• tests/phpunit/tests/theme/wpThemeJson.php (modified) (2 diffs)

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

@@ -936 +936 @@
                                 if ( $duotone_support ) {
                                         $root_selector    = wp_get_block_css_selector( $block_type );
-                                        $duotone_selector = WP_Theme_JSON::scope_selector( $root_selector, $duotone_support );
+                                        $duotone_selector = static::scope_selector( $root_selector, $duotone_support );
                                 }
                         }
@@ -1079 +1079 @@
                         }
                         if ( false !== $root_style_key ) {
-                                $setting_nodes[ $root_style_key ]['selector'] = $options['root_selector'];
+                                $style_nodes[ $root_style_key ]['selector'] = $options['root_selector'];
                         }
                 }

trunk/tests/phpunit/tests/theme/wpThemeJson.php

@@ -3211 +3211 @@
          * @param array $styles An array with style definitions.
          * @param array $path   Path to the desired properties.
-         *
          */
         public function test_get_property_value_should_return_string_for_invalid_paths_or_null_values( $styles, $path ) {
@@ -4940 +4939 @@
                 $this->assertEquals( $secondary_color, $styles['blocks']['core/quote']['variations']['plain']['color']['background'], 'Block variations: color' );
         }
+
+        /**
+         * Tests that a custom root selector is correctly applied when generating a stylesheet.
+         *
+         * @ticket 60343
+         */
+        public function test_get_stylesheet_custom_root_selector() {
+                $theme_json = new WP_Theme_JSON(
+                        array(
+                                'version' => WP_Theme_JSON::LATEST_SCHEMA,
+                                'styles'  => array(
+                                        'color' => array(
+                                                'text' => 'teal',
+                                        ),
+                                ),
+                        ),
+                        'default'
+                );
+
+                $options = array( 'root_selector' => '.custom' );
+                $actual  = $theme_json->get_stylesheet( array( 'styles' ), null, $options );
+
+                // Results also include root site blocks styles which hard code
+                // `body { margin: 0;}`.
+                $this->assertEquals(
+                        'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }.custom{color: teal;}',
+                        $actual
+                );
+        }
 }