Changeset 56812

Timestamp:

10/10/2023 03:41:38 AM (3 years ago)

Author:

isabel_brison

Message:

Editor: fix incorrect block custom CSS output.

Fixes output of block custom CSS when multiple rules require a descendant selector.

Props wildworks, mikachan.
Fixes #59499.

File:

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

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

@@ -1147 +1147 @@
                 $parts = explode( '&', $css );
                 foreach ( $parts as $part ) {
-                        $processed_css .= ( ! str_contains( $part, '{' ) )
-                                ? trim( $selector ) . '{' . trim( $part ) . '}' // If the part doesn't contain braces, it applies to the root level.
-                                : trim( $selector . $part ); // Prepend the selector, which effectively replaces the "&" character.
+                        $is_root_css = ( ! str_contains( $part, '{' ) );
+                        if ( $is_root_css ) {
+                                // If the part doesn't contain braces, it applies to the root level.
+                                $processed_css .= trim( $selector ) . '{' . trim( $part ) . '}';
+                        } else {
+                                // If the part contains braces, it's a nested CSS rule.
+                                $part = explode( '{', str_replace( '}', '', $part ) );
+                                if ( count( $part ) !== 2 ) {
+                                        continue;
+                                }
+                                $nested_selector = $part[0];
+                                $css_value       = $part[1];
+                                $part_selector   = str_starts_with( $nested_selector, ' ' )
+                                        ? static::scope_selector( $selector, $nested_selector )
+                                        : static::append_to_selector( $selector, $nested_selector );
+                                $processed_css  .= $part_selector . '{' . trim( $css_value ) . '}';
+                        }
                 }
                 return $processed_css;