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

Timestamp:

07/18/2024 11:58:22 AM (5 months ago)

Author:

hellofromTonya

Message:

Block Themes: Avoid specificity bump for top-level element-only selectors.

Prevent issues (e.g. links being underlined) caused by a bump in CSS specificity for top-level element-only global element styles.

Ref: PHP changes from ​https://github.com/WordPress/gutenberg/pull/63403.

Reviewed by hellofromTonya.
Merges [58749] to the 6.6 branch.

Props aaronrobertshaw, andrewserong, noisysocks, annubis, butterflymedia, clarktbt, hellofromTonya, jorbin, joedolson, swissspidy, courane01, raquelandefeld, talldanwp, markhowellsmead, youknowriad, poena, cbirdsong.
Fixes #61630, #61660.

Location:

branches/6.6

Files:

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

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

@@ -2880 +2880 @@
         }
 
+        /*
+         * Top-level element styles using element-only specificity selectors should
+         * not get wrapped in `:root :where()` to maintain backwards compatibility.
+         *
+         * Pseudo classes, e.g. :hover, :focus etc., are a class-level selector so
+         * still need to be wrapped in `:root :where` to cap specificity for nested
+         * variations etc. Pseudo selectors won't match the ELEMENTS selector exactly.
+         */
+        $element_only_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;
+
         // 2. Generate and append the rules that use the general selector.
-        $block_rules .= static::to_ruleset( ":root :where($selector)", $declarations );
+        $general_selector = $element_only_selector ? $selector : ":root :where($selector)";
+        $block_rules     .= static::to_ruleset( $general_selector, $declarations );
 
         // 3. Generate and append the rules that use the duotone selector.