Skip to content

Update: register block style variations defined by the theme using the init action #6756

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

Update: register block style variations defined by the theme using the init action #6756

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
cdba16a
Register block style variations defined by the theme on init
oandregal Jun 7, 2024
ff580e0
Remove registration from wp_theme_json_data_* filters
oandregal Jun 7, 2024
f574d7d
Add comment
oandregal Jun 10, 2024
522b51d
Rename for clarity
oandregal Jun 10, 2024
bfcf9f2
Update wp_register_block_style_variations_from_theme
oandregal Jun 11, 2024
f29b5cc
Remove docblock
oandregal Jun 11, 2024
86f5227
Update wp_register_block_style_variations_from_theme_json_data
oandregal Jun 11, 2024
8c53d8d
Update test_add_registered_block_styles_to_theme_data to register var…
oandregal Jun 11, 2024
d51c763
Register teh newly created style variations.
oandregal Jun 11, 2024
10a638a
Address feedback
oandregal Jun 12, 2024
a40bb88
Test newly created variations are returned by the endpoint
oandregal Jun 12, 2024
f6309c0
Lint: accomodate to core standards
oandregal Jun 12, 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
Rename for clarity
  • Loading branch information
@oandregal
oandregal committed Jun 12, 2024
commit 522b51de58a3f3140e832f831e3cf7603d339654
8 changes: 4 additions & 4 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 @@ -224,7 +224,7 @@ function wp_render_block_style_variation_class_name( $block_content, $block ) {
*
* @return array Block variations data to be merged under `styles.blocks`.
*/
function wp_resolve_and_register_block_style_variations( $variations ) {
function wp_resolve_block_style_variations( $variations ) {
$variations_data = array();

if ( empty( $variations ) ) {
Expand Down Expand Up @@ -312,7 +312,7 @@ function wp_merge_block_style_variations_data( $variations_data, $theme_json, $o
function wp_resolve_block_style_variations_from_theme_style_variation( $theme_json ) {
$theme_json_data = $theme_json->get_data();
$shared_variations = $theme_json_data['styles']['blocks']['variations'] ?? array();
$variations_data = wp_resolve_and_register_block_style_variations( $shared_variations );
$variations_data = wp_resolve_block_style_variations( $shared_variations );

return wp_merge_block_style_variations_data( $variations_data, $theme_json, 'user' );
}
Expand All @@ -330,7 +330,7 @@ function wp_resolve_block_style_variations_from_theme_style_variation( $theme_js
*/
function wp_resolve_block_style_variations_from_theme_json_partials( $theme_json ) {
$block_style_variations = WP_Theme_JSON_Resolver::get_style_variations( 'block' );
$variations_data = wp_resolve_and_register_block_style_variations( $block_style_variations );
$variations_data = wp_resolve_block_style_variations( $block_style_variations );

return wp_merge_block_style_variations_data( $variations_data, $theme_json );
}
Expand All @@ -349,7 +349,7 @@ function wp_resolve_block_style_variations_from_theme_json_partials( $theme_json
function wp_resolve_block_style_variations_from_primary_theme_json( $theme_json ) {
$theme_json_data = $theme_json->get_data();
$block_style_variations = $theme_json_data['styles']['blocks']['variations'] ?? array();
$variations_data = wp_resolve_and_register_block_style_variations( $block_style_variations );
$variations_data = wp_resolve_block_style_variations( $block_style_variations );

return wp_merge_block_style_variations_data( $variations_data, $theme_json );
}
Expand Down