Changeset 58421

Timestamp:

06/17/2024 03:47:37 AM (11 months ago)

Author:

isabel_brison

Message:

Editor: fix custom CSS output for block style variations.

Adds custom CSS to the block style variation rules output by get_styles_for_block in class WP_Theme_JSON.

Props isabel_brison, aaronrobertshaw.
Fixes #61425.

File:

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

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

@@ -2648 +2648 @@
      * @since 6.6.0 Setting a min-height of HTML when root styles have a background gradient or image.
      *              Updated general global styles specificity to 0-1-0.
+     *              Fixed custom CSS output in block style variations.
      *
      * @param array $block_metadata Metadata about the block to get styles for.
@@ -2663 +2664 @@
         // If there are style variations, generate the declarations for them, including any feature selectors the block may have.
         $style_variation_declarations = array();
+        $style_variation_custom_css   = array();
         if ( ! empty( $block_metadata['variations'] ) ) {
             foreach ( $block_metadata['variations'] as $style_variation ) {
@@ -2692 +2694 @@
                 // Compute declarations for remaining styles not covered by feature level selectors.
                 $style_variation_declarations[ $style_variation['selector'] ] = static::compute_style_properties( $style_variation_node, $settings, null, $this->theme_json );
+                // Store custom CSS for the style variation.
+                if ( isset( $style_variation_node['css'] ) ) {
+                    $style_variation_custom_css[ $style_variation['selector'] ] = $this->process_blocks_custom_css( $style_variation_node['css'], $style_variation['selector'] );
+                }
             }
         }
@@ -2820 +2826 @@
         foreach ( $style_variation_declarations as $style_variation_selector => $individual_style_variation_declarations ) {
             $block_rules .= static::to_ruleset( ":root :where($style_variation_selector)", $individual_style_variation_declarations );
+            if ( isset( $style_variation_custom_css[ $style_variation_selector ] ) ) {
+                $block_rules .= $style_variation_custom_css[ $style_variation_selector ];
+            }
+        }
+
+        // 7. Generate and append any custom CSS rules pertaining to nested block style variations.
+        if ( isset( $node['css'] ) && ! $is_root_selector ) {
+            $block_rules .= $this->process_blocks_custom_css( $node['css'], $selector );
         }