From ae50e2c014a97b6a4ddef377412a1b2dac55c6ff Mon Sep 17 00:00:00 2001 From: audrasjb Date: Fri, 7 Oct 2022 09:40:13 +0000 Subject: [PATCH] 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 [https://github.com//pull/3319 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. Built from https://develop.svn.wordpress.org/trunk@54408 git-svn-id: http://core.svn.wordpress.org/trunk@53967 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-wp-theme-json-resolver.php | 6 ++--- wp-includes/class-wp-theme-json.php | 2 ++ wp-includes/global-styles-and-settings.php | 23 +++++++++++++++++--- wp-includes/script-loader.php | 12 +++++----- wp-includes/version.php | 2 +- 5 files changed, 31 insertions(+), 14 deletions(-) diff --git a/wp-includes/class-wp-theme-json-resolver.php b/wp-includes/class-wp-theme-json-resolver.php index 16b74c8c72..e97c31a4f5 100644 --- a/wp-includes/class-wp-theme-json-resolver.php +++ b/wp-includes/class-wp-theme-json-resolver.php @@ -295,12 +295,10 @@ class WP_Theme_JSON_Resolver { * * @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' ); } /** diff --git a/wp-includes/class-wp-theme-json.php b/wp-includes/class-wp-theme-json.php index 40262661e4..91a56936ac 100644 --- a/wp-includes/class-wp-theme-json.php +++ b/wp-includes/class-wp-theme-json.php @@ -50,10 +50,12 @@ class WP_Theme_JSON { * The sources of data this object can represent. * * @since 5.8.0 + * @since 6.1.0 Added 'blocks'. * @var string[] */ const VALID_ORIGINS = array( 'default', + 'blocks', 'theme', 'custom', ); diff --git a/wp-includes/global-styles-and-settings.php b/wp-includes/global-styles-and-settings.php index 1187837ed6..da1cb97c07 100644 --- a/wp-includes/global-styles-and-settings.php +++ b/wp-includes/global-styles-and-settings.php @@ -113,15 +113,21 @@ function wp_get_global_stylesheet( $types = array() ) { } /* - * 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. * See https://core.trac.wordpress.org/ticket/54782 */ $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' ) ); } @@ -133,6 +139,12 @@ function wp_get_global_stylesheet( $types = array() ) { */ $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 ) { $origins = array( 'default' ); @@ -204,6 +216,11 @@ function wp_add_global_styles_for_blocks() { 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'] ) ) { $block_name = str_replace( 'core/', '', $metadata['name'] ); /* diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 9a45d9a6f5..f3014a241f 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -2409,14 +2409,11 @@ function wp_enqueue_global_styles() { } /* - * 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(); @@ -2427,6 +2424,9 @@ function wp_enqueue_global_styles() { wp_register_style( 'global-styles', false, array(), true, true ); 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(); } /** diff --git a/wp-includes/version.php b/wp-includes/version.php index 9583eb88a6..45e689d862 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.1-beta3-54407'; +$wp_version = '6.1-beta3-54408'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.