Changeset 54408

Timestamp:

10/07/2022 09:38:15 AM (2 years ago)

Author:

audrasjb

Message:

Editor: Add missing blocks origin to theme.json.

This changeset updates the blocks origin name from core to blocks and adds it to the list of valid origins for theme.json.
(See the original fix in ​Gutenberg's PR 44363).

Why?

• This new origin was missing from the list.
• The core name is not reflective of what it does, as this data origin is related to block styles, whether they come with WordPress or third-party blocks.
• The existing filter for this piece of data is called theme_json_blocks, to reflect it filters "block" data.
• Though core origin was used in the past for default, this commit reverts it. Why? It was confusing. The goal is to use names that communicate what part of the pipeline are processing (default > blocks > theme > custom).

How?

• Renames the string, from core to blocks.
• Adds blocks to the list of valid origins.
• Verifies that the $theme_json->get_stylesheet() call uses the proper $origins at all times.

Follow-up to [54162], [54251].

Props oandregal, czapla, jorgefilipecosta, scruffian, bernhard-reiter hellofromTonya.
See #56467.

Location:

trunk/src/wp-includes

Files:

• class-wp-theme-json-resolver.php (modified) (1 diff)
• class-wp-theme-json.php (modified) (1 diff)
• global-styles-and-settings.php (modified) (4 diffs)
• script-loader.php (modified) (2 diffs)

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

@@ -296 +296 @@
          * @param WP_Theme_JSON_Data Class to access and update the underlying data.
          */
-        $theme_json = apply_filters( 'theme_json_blocks', new WP_Theme_JSON_Data( $config, 'core' ) );
+        $theme_json = apply_filters( 'theme_json_blocks', new WP_Theme_JSON_Data( $config, 'blocks' ) );
         $config     = $theme_json->get_data();
 
-        // Core here means it's the lower level part of the styles chain.
-        // It can be a core or a third-party block.
-        return new WP_Theme_JSON( $config, 'core' );
+        return new WP_Theme_JSON( $config, 'blocks' );
     }
 

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

@@ -51 +51 @@
      *
      * @since 5.8.0
+     * @since 6.1.0 Added 'blocks'.
      * @var string[]
      */
     const VALID_ORIGINS = array(
         'default',
+        'blocks',
         'theme',
         'custom',

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

@@ -114 +114 @@
 
     /*
-     * If variables are part of the stylesheet,
-     * we add them for all origins (default, theme, user).
+     * If variables are part of the stylesheet, then add them.
      * This is so themes without a theme.json still work as before 5.9:
      * they can override the default presets.
@@ -122 +121 @@
     $styles_variables = '';
     if ( in_array( 'variables', $types, true ) ) {
-        $styles_variables = $tree->get_stylesheet( array( 'variables' ) );
+        /*
+         * Only use the default, theme, and custom origins. Why?
+         * Because styles for `blocks` origin are added at a later phase
+         * (i.e. in the render cycle). Here, only the ones in use are rendered.
+         * @see wp_add_global_styles_for_blocks
+         */
+        $origins          = array( 'default', 'theme', 'custom' );
+        $styles_variables = $tree->get_stylesheet( array( 'variables' ), $origins );
         $types            = array_diff( $types, array( 'variables' ) );
     }
@@ -134 +140 @@
     $styles_rest = '';
     if ( ! empty( $types ) ) {
+        /*
+         * Only use the default, theme, and custom origins. Why?
+         * Because styles for `blocks` origin are added at a later phase
+         * (i.e. in the render cycle). Here, only the ones in use are rendered.
+         * @see wp_add_global_styles_for_blocks
+         */
         $origins = array( 'default', 'theme', 'custom' );
         if ( ! $supports_theme_json ) {
@@ -204 +216 @@
     foreach ( $block_nodes as $metadata ) {
         $block_css = $tree->get_styles_for_block( $metadata );
+
+        if ( ! wp_should_load_separate_core_block_assets() ) {
+            wp_add_inline_style( 'global-styles', $block_css );
+            continue;
+        }
 
         if ( isset( $metadata['name'] ) ) {

trunk/src/wp-includes/script-loader.php

@@ -2410 +2410 @@
 
     /*
-     * If we are loading CSS for each block separately, then we can load the theme.json CSS conditionally.
+     * If loading the CSS for each block separately, then load the theme.json CSS conditionally.
      * This removes the CSS from the global-styles stylesheet and adds it to the inline CSS for each block.
+     * This filter must be registered before calling wp_get_global_stylesheet();
      */
-    if ( $separate_assets ) {
-        add_filter( 'theme_json_get_style_nodes', 'wp_filter_out_block_nodes' );
-        // Add each block as an inline css.
-        wp_add_global_styles_for_blocks();
-    }
+    add_filter( 'theme_json_get_style_nodes', 'wp_filter_out_block_nodes' );
 
     $stylesheet = wp_get_global_stylesheet();
@@ -2428 +2425 @@
     wp_add_inline_style( 'global-styles', $stylesheet );
     wp_enqueue_style( 'global-styles' );
+
+    // Add each block as an inline css.
+    wp_add_global_styles_for_blocks();
 }