Skip to content

Block API: Allow more than 1 block stylesheets #32510

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

Merged
merged 20 commits into from
Oct 7, 2021
Merged

Block API: Allow more than 1 block stylesheets #32510

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
0b3f55b
working POC with the comments-form block.
aristath Jun 8, 2021
403715c
add gutenberg_enqueue_block_style function
aristath Jun 9, 2021
3d86def
now works for the editor too!
aristath Jun 9, 2021
47c6163
function was renamed
aristath Jun 17, 2021
115417e
$register arg is not necessary
aristath Jul 15, 2021
dc71737
Change hook to enqueue_block_assets
aristath Jul 15, 2021
ac830fc
Use array_shift
aristath Jul 15, 2021
46f29f5
Add RTL styles
aristath Jul 15, 2021
d2049ab
Update lib/blocks.php
aristath Jul 15, 2021
24ae1ea
Rename function to wp_enqueue_block_style
aristath Jul 21, 2021
05d08c8
Wrap function in a function_exists check
aristath Jul 21, 2021
5dcf487
WIP tests
aristath Sep 27, 2021
0adfc74
tests now run properly
aristath Sep 28, 2021
0582145
await for selector instead of snapshot
aristath Oct 5, 2021
a790220
Add support for file paths
aristath Oct 6, 2021
6bc1604
CS fix
aristath Oct 6, 2021
a646016
Spacing fix
aristath Oct 7, 2021
baac268
Add comment to explain _why_ we're expecting errors.
aristath Oct 7, 2021
032a7f9
make the handle unique when using a path
aristath Oct 7, 2021
7b3e854
Add test for stylesheet loaded via path instead of handle
aristath Oct 7, 2021
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
Next Next commit
working POC with the comments-form block.
  • Loading branch information
@aristath
aristath committed Oct 7, 2021
commit 0b3f55b74ce8391761f25a3812667c8fd7711dc7
40 changes: 40 additions & 0 deletions lib/blocks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,3 +512,43 @@ function gutenberg_migrate_old_typography_shape( $metadata ) {
if ( ! function_exists( 'wp_migrate_old_typography_shape' ) ) {
add_filter( 'block_type_metadata', 'gutenberg_migrate_old_typography_shape' );
}

/**
* Allow multiple block styles.
*
* @param array $metadata Metadata for registering a block type.
*
* @return array
*/
function gutenberg_multiple_block_styles( $metadata ) {
foreach ( array( 'style', 'editorStyle' ) as $key ) {
if ( isset( $metadata[ $key ] ) && is_array( $metadata[ $key ] ) ) {

// Enqueue multiple styles on block render.
add_filter(
"render_block_{$metadata['name']}",
/**
* Filters the content of a single block.
*
* @since 5.0.0
*
* @param string $block_content The block content about to be appended.
* @param array $block The full block, including name and attributes.
*/
function( $block_content, $block ) use ( $metadata, $key ) {
foreach ( $metadata[ $key ] as $handle ) {
wp_enqueue_style( $handle );
}
return $block_content;
},
10,
2
);

// Only return the 1st item in the array.
$metadata[ $key ] = $metadata[ $key ][0];
}
}
return $metadata;
}
add_filter( 'block_type_metadata', 'gutenberg_multiple_block_styles' );
2 changes: 1 addition & 1 deletion packages/block-library/src/post-comments-form/block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@
"lineHeight": true
}
},
"style": "wp-block-post-comments-form"
"style": [ "wp-block-post-comments-form", "wp-block-buttons", "wp-block-button" ]
}
14 changes: 0 additions & 14 deletions packages/block-library/src/post-comments-form/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,3 @@ function gutenberg_comment_form_block_form_defaults( $fields ) {
return $fields;
}
add_filter( 'comment_form_defaults', 'gutenberg_comment_form_block_form_defaults' );

add_action(
'wp_enqueue_scripts',
/**
* Add the button stylesheet as a dependency for the post-comment form stylesheet.
*/
function() {
global $wp_styles;
if ( ! empty( $wp_styles->registered ) && ! empty( $wp_styles->registered['wp-block-post-comments-form'] ) ) {
$wp_styles->registered['wp-block-post-comments-form']->deps[] = 'wp-block-button';
}
},
1
);