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

Timestamp:

08/06/2024 08:24:14 AM (2 months ago)

Author:

talldanwp

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.

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

File:

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

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

@@ -2739 +2739 @@
      *              Updated general global styles specificity to 0-1-0.
      *              Fixed custom CSS output in block style variations.
+     * @since 6.6.1 Avoid applying `:root :where()` wrapper to top-level element-only selectors.
+     * @since 6.6.2 Avoid applying `:root :where()` wrapper to root selectors.
      *
      * @param array $block_metadata Metadata about the block to get styles for.
@@ -2893 +2895 @@
 
         /*
+         * 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.
@@ -2900 +2905 @@
          * 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.