Changeset 58466 for trunk/tests/phpunit/tests/theme/wpThemeJson.php

Timestamp:

06/24/2024 08:49:52 AM (9 months ago)

Author:

oandregal

Message:

Section styles: improve performance and conceptual consistency.

These changes involve:

• Move shared variation definitions from styles.blocks.variations to styles.variations
• Remove blockTypes from styles.variations.
• Do not register shared variations from theme style variation or primary theme.json files.
• Move the merging of theme.json data into the WP_Theme_JSON_Resolver and WP_Theme_JSON classes.

These changes improve performance and are more future-proof API wise.
See conversation at ​https://github.com/WordPress/gutenberg/issues/62686

Props aaronrobertshaw, oandregal, andrewserong, joemcgill, talldanwp, andrewserong, ramonopoly, richtabor, youknowriad.

See #61312, #61451.

File:

• trunk/tests/phpunit/tests/theme/wpThemeJson.php (modified) (1 diff)

trunk/tests/phpunit/tests/theme/wpThemeJson.php

@@ -3932 +3932 @@
 
     /**
+     * @ticket 61451
+     */
+    public function test_unwraps_block_style_variations() {
+        register_block_style(
+            array( 'core/paragraph', 'core/group' ),
+            array(
+                'name'  => 'myVariation',
+                'label' => 'My variation',
+            )
+        );
+
+        $input = new WP_Theme_JSON(
+            array(
+                'version' => WP_Theme_JSON::LATEST_SCHEMA,
+                'styles'  => array(
+                    'variations' => array(
+                        'myVariation' => array(
+                            'color'      => array(
+                                'background' => 'topLevel',
+                                'gradient'   => 'topLevel',
+                            ),
+                            'typography' => array(
+                                'fontFamily' => 'topLevel',
+                            ),
+                        ),
+                    ),
+                    'blocks'     => array(
+                        'core/paragraph' => array(
+                            'variations' => array(
+                                'myVariation' => array(
+                                    'color'   => array(
+                                        'background' => 'blockLevel',
+                                        'text'       => 'blockLevel',
+                                    ),
+                                    'outline' => array(
+                                        'offset' => 'blockLevel',
+                                    ),
+                                ),
+                            ),
+                        ),
+                    ),
+                ),
+            )
+        );
+
+        $expected = array(
+            'version' => WP_Theme_JSON::LATEST_SCHEMA,
+            'styles'  => array(
+                'blocks' => array(
+                    'core/paragraph' => array(
+                        'variations' => array(
+                            'myVariation' => array(
+                                'color'      => array(
+                                    'background' => 'blockLevel',
+                                    'gradient'   => 'topLevel',
+                                    'text'       => 'blockLevel',
+                                ),
+                                'typography' => array(
+                                    'fontFamily' => 'topLevel',
+                                ),
+                                'outline'    => array(
+                                    'offset' => 'blockLevel',
+                                ),
+                            ),
+                        ),
+                    ),
+                    'core/group'     => array(
+                        'variations' => array(
+                            'myVariation' => array(
+                                'color'      => array(
+                                    'background' => 'topLevel',
+                                    'gradient'   => 'topLevel',
+                                ),
+                                'typography' => array(
+                                    'fontFamily' => 'topLevel',
+                                ),
+                            ),
+                        ),
+                    ),
+                ),
+            ),
+        );
+        $this->assertSameSetsWithIndex( $expected, $input->get_raw_data(), 'Unwrapped block style variations do not match' );
+    }
+
+    /**
      * @ticket 57583
      *