Skip to content
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

Fix: Global styles for non-core blocks aren't loaded on the front end #44053

Closed
wants to merge 1 commit into from
Closed

Fix: Global styles for non-core blocks aren't loaded on the front end #44053

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 25 additions & 6 deletions lib/compat/wordpress-6.1/get-global-styles-and-settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,34 @@
* Adds global style rules to the inline style for each block.
*/
function wp_add_global_styles_for_blocks() {
global $wp_styles;

// Default to "global-styles".
$default_handle = 'global-styles';

$tree = WP_Theme_JSON_Resolver_Gutenberg::get_merged_data();
$block_nodes = $tree->get_styles_block_nodes();

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 );
wp_add_inline_style( $default_handle, $block_css );
continue;
}

if ( isset( $metadata['name'] ) ) {
$block_name = str_replace( 'core/', '', $metadata['name'] );
$handle = $default_handle;
$block_stylesheet_handle = generate_block_asset_handle( $metadata['name'], 'style' );

if ( isset( $wp_styles->registered[ $block_stylesheet_handle ] ) ) {
$handle = $block_stylesheet_handle;
}

// 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.
wp_add_inline_style( 'wp-block-' . $block_name, $block_css );
wp_add_inline_style( $handle, $block_css );
}

// The likes of block element styles from theme.json do not have $metadata['name'] set.
Expand All @@ -33,16 +45,23 @@ function wp_add_global_styles_for_blocks() {
array_filter(
$metadata['path'],
function ( $item ) {
if ( str_contains( $item, 'core/' ) ) {
if ( str_contains( $item, '/' ) ) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think to check only slashes is the only way to include non-core blocks, is there a better approach?

return true;
}
return false;
}
)
);

if ( isset( $result[0] ) ) {
$block_name = str_replace( 'core/', '', $result[0] );
wp_add_inline_style( 'wp-block-' . $block_name, $block_css );
$handle = $default_handle;
$block_stylesheet_handle = generate_block_asset_handle( $result['0'], 'style' );

if ( isset( $wp_styles->registered[ $block_stylesheet_handle ] ) ) {
$handle = $block_stylesheet_handle;
}

wp_add_inline_style( $handle, $block_css );
}
}
}
Expand Down