Changeset 57546

Timestamp:

02/07/2024 04:35:34 AM (3 months ago)

Author:

isabel_brison

Message:

Script Loader: always output core block global styles after base global styles.

Changes the output of core block global styles when should_load_separate_core_block_assets is true so they are appended to base global styles instead of block-library styles.

Props isabel_brison, oandregal, azaozz, ajlende.
Fixes #60280.

File:

• trunk/src/wp-includes/global-styles-and-settings.php (modified) (3 diffs)

trunk/src/wp-includes/global-styles-and-settings.php

@@ -299 +299 @@
  *
  * @since 6.1.0
+ *
+ * @global WP_Styles $wp_styles
  */
 function wp_add_global_styles_for_blocks() {
+    global $wp_styles;
+
     $tree        = WP_Theme_JSON_Resolver::get_merged_data();
     $block_nodes = $tree->get_styles_block_nodes();
@@ -312 +316 @@
 
         $stylesheet_handle = 'global-styles';
+
+        /*
+         * When `wp_should_load_separate_core_block_assets()` is true, block styles are
+         * enqueued for each block on the page in class WP_Block's render function.
+         * This means there will be a handle in the styles queue for each of those blocks.
+         * Block-specific global styles should be attached to the global-styles handle, but
+         * only for blocks on the page, thus we check if the block's handle is in the queue
+         * before adding the inline style.
+         * This conditional loading only applies to core blocks.
+         */
         if ( isset( $metadata['name'] ) ) {
-            /*
-             * These block styles are added on block_render.
-             * This hooks inline CSS to them so that they are loaded conditionally
-             * based on whether or not the block is used on the page.
-             */
             if ( str_starts_with( $metadata['name'], 'core/' ) ) {
-                $block_name        = str_replace( 'core/', '', $metadata['name'] );
-                $stylesheet_handle = 'wp-block-' . $block_name;
+                $block_name   = str_replace( 'core/', '', $metadata['name'] );
+                $block_handle = 'wp-block-' . $block_name;
+                if ( in_array( $block_handle, $wp_styles->queue ) ) {
+                    wp_add_inline_style( $stylesheet_handle, $block_css );
+                }
+            } else {
+                wp_add_inline_style( $stylesheet_handle, $block_css );
             }
-            wp_add_inline_style( $stylesheet_handle, $block_css );
         }
 
@@ -330 +343 @@
             if ( $block_name ) {
                 if ( str_starts_with( $block_name, 'core/' ) ) {
-                    $block_name        = str_replace( 'core/', '', $block_name );
-                    $stylesheet_handle = 'wp-block-' . $block_name;
+                    $block_name   = str_replace( 'core/', '', $block_name );
+                    $block_handle = 'wp-block-' . $block_name;
+                    if ( in_array( $block_handle, $wp_styles->queue ) ) {
+                        wp_add_inline_style( $stylesheet_handle, $block_css );
+                    }
+                } else {
+                    wp_add_inline_style( $stylesheet_handle, $block_css );
                 }
-                wp_add_inline_style( $stylesheet_handle, $block_css );
             }
         }