Changeset 58466 for trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php

Timestamp:

06/24/2024 08:49:52 AM (10 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/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php (modified) (2 diffs)

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php

@@ -266 +266 @@
             }
 
-            // Register theme-defined variations.
-            WP_Theme_JSON_Resolver::get_theme_data();
-
-            // Register user-defined variations.
-            if ( ! empty( $config['styles']['blocks']['variations'] ) ) {
-                wp_register_block_style_variations_from_theme_json_data( $config['styles']['blocks']['variations'] );
-            }
+            // Register theme-defined variations e.g. from block style variation partials under `/styles`.
+            $variations = WP_Theme_JSON_Resolver::get_style_variations( 'block' );
+            wp_register_block_style_variations_from_theme_json_partials( $variations );
 
             if ( isset( $request['settings'] ) ) {
@@ -636 +632 @@
 
         $response   = array();
+
+        // Register theme-defined variations e.g. from block style variation partials under `/styles`.
+        $partials = WP_Theme_JSON_Resolver::get_style_variations( 'block' );
+        wp_register_block_style_variations_from_theme_json_partials( $partials );
+
         $variations = WP_Theme_JSON_Resolver::get_style_variations();
-
         foreach ( $variations as $variation ) {
             $variation_theme_json = new WP_Theme_JSON( $variation );