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

Timestamp:

02/12/2025 03:38:09 AM (2 months ago)

Author:

peterwilsoncc

Message:

Editor: Fix complex variation selectors when using selectors API.

Fixes a bug in the manipulation of selectors for block style variations that would result in an incorrect selector and fail to match the appropriate elements on the frontend.

Props aaronrobertshaw, ramonopoly, joemcgill.
Fixes #62471.

File:

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

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

@@ -2851 +2851 @@
                 // Combine selectors with style variation's selector and add to overall style variation declarations.
                 foreach ( $variation_declarations as $current_selector => $new_declarations ) {
-                    // If current selector includes block classname, remove it but leave the whitespace in.
-                    $shortened_selector = str_replace( $block_metadata['selector'] . ' ', ' ', $current_selector );
+                    /*
+                     * Clean up any whitespace between comma separated selectors.
+                     * This prevents these spaces breaking compound selectors such as:
+                     * - `.wp-block-list:not(.wp-block-list .wp-block-list)`
+                     * - `.wp-block-image img, .wp-block-image.my-class img`
+                     */
+                    $clean_current_selector = preg_replace( '/,\s+/', ',', $current_selector );
+                    $shortened_selector     = str_replace( $block_metadata['selector'], '', $clean_current_selector );
 
                     // Prepend the variation selector to the current selector.