Changeset 58413

Timestamp:

06/14/2024 09:03:40 AM (9 months ago)

Author:

oandregal

Message:

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

Props aaronrobertshaw, oandregal.
Fixes #61440.

Location:

trunk

Files:

• src/wp-includes/block-supports/block-style-variations.php (modified) (2 diffs)
• src/wp-includes/class-wp-theme-json.php (modified) (2 diffs)
• tests/phpunit/data/themedir1/block-theme/styles/block-style-variation-with-slug.json (added)
• tests/phpunit/tests/block-supports/block-style-variations.php (modified) (4 diffs)
• tests/phpunit/tests/theme/wpThemeJsonResolver.php (modified) (1 diff)

trunk/src/wp-includes/block-supports/block-style-variations.php

@@ -250 +250 @@
          * 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 ) {
@@ -442 +442 @@
          * 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;
 

trunk/src/wp-includes/class-wp-theme-json.php

@@ -359 +359 @@
         'patterns',
         'settings',
+        'slug',
         'styles',
         'templateParts',
@@ -3245 +3246 @@
      * @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'.

trunk/tests/phpunit/tests/block-supports/block-style-variations.php

@@ -62 +62 @@
      *
      * @ticket 61312
+     * @ticket 61440
      */
     public function test_add_registered_block_styles_to_theme_data() {
@@ -99 +100 @@
         );
 
+        /*
+         * 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',
@@ -111 +128 @@
         $expected     = array(
             'variations' => array(
+                // @ticket 61440
+                'WithSlug'                => array(
+                    'color' => array(
+                        'background' => 'aliceblue',
+                        'text'       => 'midnightblue',
+                    ),
+                ),
                 'my-variation'            => $variation_styles_data,
 
@@ -134 +158 @@
 
         unregister_block_style( 'core/group', 'my-variation' );
+        unregister_block_style( 'core/group', 'WithSlug' );
 
-        $this->assertSameSetsWithIndex( $group_styles, $expected );
+        $this->assertSameSetsWithIndex( $expected, $group_styles );
     }
 }

trunk/tests/phpunit/tests/theme/wpThemeJsonResolver.php

@@ -1161 +1161 @@
                         ),
                     ),
+                    // @ticket 61440
+                    array(
+                        'blockTypes' => array( 'core/group', 'core/columns' ),
+                        'version'    => 3,
+                        'slug'       => 'WithSlug',
+                        'title'      => 'With Slug',
+                        'styles'     => array(
+                            'color' => array(
+                                'background' => 'aliceblue',
+                                'text'       => 'midnightblue',
+                            ),
+                        ),
+                    ),
                 ),
             ),