mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-04-05 20:53:07 +02:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Section styles: add slug to override non-kebab-cased variations.

Browse Source 
Props aaronrobertshaw, oandregal.
Fixes #61440.


git-svn-id: https://develop.svn.wordpress.org/trunk@58413 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
André 2024-06-14 09:03:40 +00:00
parent 6d2a39f1b0
commit 5983b3c04b
5 changed files with 55 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wp-includes/block-supports/block-style-variations.php
View File

@ -249,7 +249,7 @@ function wp_resolve_block_style_variations( $variations ) {
* Block style variations read in via standalone theme.json partials
* need to have their name set to the kebab case version of their title.
*/
$variation_name = $have_named_variations ? $key : _wp_to_kebab_case( $variation['title'] );
$variation_name = $have_named_variations ? $key : ( $variation['slug'] ?? _wp_to_kebab_case( $variation['title'] ) );
foreach ( $supported_blocks as $block_type ) {
// Add block style variation data under current block type.
@ -441,7 +441,7 @@ function wp_register_block_style_variations_from_theme_json_data( $variations )
* Block style variations read in via standalone theme.json partials
* need to have their name set to the kebab case version of their title.
*/
$variation_name = $have_named_variations ? $key : _wp_to_kebab_case( $variation['title'] );
$variation_name = $have_named_variations ? $key : ( $variation['slug'] ?? _wp_to_kebab_case( $variation['title'] ) );
$variation_label = $variation['title'] ?? $variation_name;
foreach ( $supported_blocks as $block_type ) {

3
src/wp-includes/class-wp-theme-json.php
View File

@ -358,6 +358,7 @@ class WP_Theme_JSON {
'description',
'patterns',
'settings',
'slug',
'styles',
'templateParts',
'title',
@ -3244,7 +3245,7 @@ class WP_Theme_JSON {
* @since 6.3.2 Preserves global styles block variations when securing styles.
* @since 6.6.0 Updated to allow variation element styles and $origin parameter.
*
* @param array $theme_json Structure to sanitize.
* @param array $theme_json Structure to sanitize.
* @param string $origin Optional. What source of data this object represents.
* One of 'blocks', 'default', 'theme', or 'custom'. Default 'theme'.
* @return array Sanitized structure.

12
tests/phpunit/data/themedir1/block-theme/styles/block-style-variation-with-slug.json Normal file
View File

@ -0,0 +1,12 @@
{
"version": 3,
"blockTypes": [ "core/group", "core/columns" ],
"slug": "WithSlug",
"title": "With Slug",
"styles": {
"color": {
"background": "aliceblue",
"text": "midnightblue"
}
}
}

27
tests/phpunit/tests/block-supports/block-style-variations.php
View File

@ -61,6 +61,7 @@ class WP_Block_Supports_Block_Style_Variations_Test extends WP_UnitTestCase {
* variation file within `/styles`, are added to the theme data.
*
* @ticket 61312
* @ticket 61440
*/
public function test_add_registered_block_styles_to_theme_data() {
switch_theme( 'block-theme' );
@ -98,6 +99,22 @@ class WP_Block_Supports_Block_Style_Variations_Test extends WP_UnitTestCase {
),
);
/*
* This style is to be deliberately overwritten by the theme.json partial
* See `tests/phpunit/data/themedir1/block-theme/styles/block-style-variation-with-slug.json`.
*/
register_block_style(
'core/group',
array(
'name' => 'WithSlug',
'style_data' => array(
'color' => array(
'background' => 'whitesmoke',
'text' => 'black',
),
),
)
);
register_block_style(
'core/group',
array(
@ -110,6 +127,13 @@ class WP_Block_Supports_Block_Style_Variations_Test extends WP_UnitTestCase {
$group_styles = $theme_json['styles']['blocks']['core/group'] ?? array();
$expected = array(
'variations' => array(
// @ticket 61440
'WithSlug' => array(
'color' => array(
'background' => 'aliceblue',
'text' => 'midnightblue',
),
),
'my-variation' => $variation_styles_data,
/*
@ -133,7 +157,8 @@ class WP_Block_Supports_Block_Style_Variations_Test extends WP_UnitTestCase {
);
unregister_block_style( 'core/group', 'my-variation' );
unregister_block_style( 'core/group', 'WithSlug' );
$this->assertSameSetsWithIndex( $group_styles, $expected );
$this->assertSameSetsWithIndex( $expected, $group_styles );
}
}

13
tests/phpunit/tests/theme/wpThemeJsonResolver.php
View File

@ -1160,6 +1160,19 @@ class Tests_Theme_wpThemeJsonResolver extends WP_UnitTestCase {
),
),
),
// @ticket 61440
array(
'blockTypes' => array( 'core/group', 'core/columns' ),
'version' => 3,
'slug' => 'WithSlug',
'title' => 'With Slug',
'styles' => array(
'color' => array(
'background' => 'aliceblue',
'text' => 'midnightblue',
),
),
),
),
),
);