Changeset 58874 for branches/6.6/src/wp-includes/class-wp-theme-json.php

Timestamp:

08/09/2024 03:38:13 PM (2 years ago)

Author:

hellofromTonya

Message:

Theme JSON: Ensure root selector (body) is not wrapped in :root :where().

Pre-WordPress 6.6, the body selector was used for styles associated with the body.

In 6.6, this was mistakenly changed to :root :where(body), an increase in specificity, causing some issues for themes.

This change reverts the specificity increase, styles again use the body selector.

Syncs PHP changes from ​https://github.com/WordPress/gutenberg/pull/63726.

Reviewed by hellofromTonya.
Merges [58856] and [58861] to the 6.6 branch.

Props talldanwp, andrewserong, aaronrobertshaw, mukesh27, hellofromTonya.
Fixes #61704.

Location:

branches/6.6

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-theme-json.php (modified) (2 diffs)

branches/6.6/src/wp-includes/class-wp-theme-json.php

@@ -2881 +2881 @@
 
                 /*
+                 * Root selector (body) styles should not be wrapped in `:root where()` to keep
+                 * specificity at (0,0,1) and maintain backwards compatibility.
+                 *
                  * Top-level element styles using element-only specificity selectors should
                  * not get wrapped in `:root :where()` to maintain backwards compatibility.
@@ -2888 +2891 @@
                  * variations etc. Pseudo selectors won't match the ELEMENTS selector exactly.
                  */
-                $element_only_selector = $current_element &&
+                $element_only_selector = $is_root_selector || (
+                        $current_element &&
                         isset( static::ELEMENTS[ $current_element ] ) &&
                         // buttons, captions etc. still need `:root :where()` as they are class based selectors.
                         ! isset( static::__EXPERIMENTAL_ELEMENT_CLASS_NAMES[ $current_element ] ) &&
-                        static::ELEMENTS[ $current_element ] === $selector;
+                        static::ELEMENTS[ $current_element ] === $selector
+                );
 
                 // 2. Generate and append the rules that use the general selector.