Skip to content

Make sure base global styles are loaded before block styles. #5892

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
tellthemachines wants to merge 12 commits into from
Closed

Make sure base global styles are loaded before block styles. #5892

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b643d7a
Make sure base global styles are loaded before block styles.
tellthemachines Jan 18, 2024
83367d8
Separate base and per-block global styles when single stylesheet is e…
tellthemachines Jan 22, 2024
00dc2c3
Separate base and per-block custom CSS and enqueue in different places.
tellthemachines Jan 22, 2024
48ce988
Fix lint error.
tellthemachines Jan 22, 2024
be210d6
Fix undefined variable
tellthemachines Jan 22, 2024
aef490b
Remove custom CSS changes and address review feedback
tellthemachines Jan 24, 2024
0a7045a
Remove extra spaces
tellthemachines Jan 24, 2024
bef9311
Make sure global styles only load in the front end.
tellthemachines Jan 25, 2024
9010293
Remove unnecessary filter and function call.
tellthemachines Jan 29, 2024
6d050e0
Split out tests for separate core block assets
tellthemachines Jan 30, 2024
ca1698e
remove redundant test
tellthemachines Jan 30, 2024
1226e21
Fix spacing
tellthemachines Jan 31, 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
Prev Previous commit
Next Next commit
Separate base and per-block global styles when single stylesheet is e… 
…nabled.
  • Loading branch information
@tellthemachines
tellthemachines committed Jan 22, 2024
commit 83367d81c604eb2db5c310fb998e359c58bfdff8
10 changes: 9 additions & 1 deletion src/wp-includes/global-styles-and-settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,11 +302,15 @@ function wp_get_global_styles_custom_css() {
function wp_add_global_styles_for_blocks() {
$tree = WP_Theme_JSON_Resolver::get_merged_data();
$block_nodes = $tree->get_styles_block_nodes();

if ( ! wp_should_load_separate_core_block_assets() ) {
wp_register_style( 'global-styles-blocks', false );
}
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( 'global-styles-blocks', $block_css );
continue;
}

Expand Down Expand Up @@ -336,6 +340,10 @@ function wp_add_global_styles_for_blocks() {
}
}
}

if ( ! wp_should_load_separate_core_block_assets() ) {
wp_enqueue_style( 'global-styles-blocks' );
}
Copy link

@ajlende ajlende Jan 23, 2024

Choose a reason for hiding this comment

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

I'm not sure if this should be enqueued here (or registered above) as it's a rather large change for a public function that just used to add styles.

Copy link
Contributor Author

@tellthemachines tellthemachines Jan 24, 2024

Choose a reason for hiding this comment

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

Hmm good point, I'll see if I can find a more appropriate place.

}

/**
Expand Down