Skip to content

Global Styles: Avoid unnecessary processing of theme.json variation partials #6837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
aaronrobertshaw wants to merge 4 commits into from
Closed

Global Styles: Avoid unnecessary processing of theme.json variation partials #6837

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ad493ea
Global Styles: Avoid unnecessary processing of theme.json variation p…
aaronrobertshaw Jun 17, 2024
fb4809a
Address feedback
aaronrobertshaw Jun 17, 2024
5e08be5
Add more detailed explanatory comment
aaronrobertshaw Jun 17, 2024
646df13
Remove changes unrelated to gutenberg/62529.
oandregal Jun 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions src/wp-includes/block-supports/block-style-variations.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,23 @@ function wp_register_block_style_variations_from_theme_json_data( $variations )
* @access private
*/
function wp_register_block_style_variations_from_theme() {
/*
* Skip any registration of styles if no theme.json or variation partials are present.
*
* Given the possibility of hybrid themes, this check can't rely on if the theme
* is a block theme or not. Instead:
* - If there is a primary theme.json, continue.
* - If there is a partials directory, continue.
* - The only variations to be registered from the global styles user origin,
* are those that have been copied in from the selected theme style variation.
* For a theme style variation to be selected it would have to have a partial
* theme.json file covered by the previous check.
*/
$has_partials_directory = is_dir( get_stylesheet_directory() . '/styles' ) || is_dir( get_template_directory() . '/styles' );
if ( ! wp_theme_has_theme_json() && ! $has_partials_directory ) {
return;
}

// Partials from `/styles`.
$variations_partials = WP_Theme_JSON_Resolver::get_style_variations( 'block' );
wp_register_block_style_variations_from_theme_json_data( $variations_partials );
Expand Down