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

Timestamp:

07/10/2024 06:17:44 AM (12 months ago)

Author:

isabel_brison

Message:

Editor: enqueue block custom CSS only when block renders on the page.

Updates the global styles custom CSS handling logic to be consistent with other global styles and take advantage of conditional enqueuing of block styles.

Props isabel_brison, aaronrobertshaw, andrewserong.
Fixes #61395.

File:

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

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

@@ -1424 +1424 @@
         }
 
+        // Load the custom CSS last so it has the highest specificity.
+        if ( in_array( 'custom-css', $types, true ) ) {
+            // Add the global styles root CSS.
+            $stylesheet .= _wp_array_get( $this->theme_json, array( 'styles', 'css' ) );
+        }
+
         return $stylesheet;
     }
@@ -1468 +1474 @@
      *
      * @since 6.2.0
+     * @deprecated 6.7.0 Use {@see 'get_stylesheet'} instead.
      *
      * @return string The global styles custom CSS.
      */
     public function get_custom_css() {
+        _deprecated_function( __METHOD__, '6.7.0', 'get_stylesheet' );
         // Add the global styles root CSS.
         $stylesheet = isset( $this->theme_json['styles']['css'] ) ? $this->theme_json['styles']['css'] : '';
@@ -2693 +2701 @@
                 'features'   => $feature_selectors,
                 'variations' => $variation_selectors,
+                'css'        => $selector,
             );
 
@@ -2909 +2918 @@
         }
 
-        // 7. Generate and append any custom CSS rules pertaining to nested block style variations.
+        // 7. Generate and append any custom CSS rules.
         if ( isset( $node['css'] ) && ! $is_root_selector ) {
             $block_rules .= $this->process_blocks_custom_css( $node['css'], $selector );