Changeset 59324 for branches/6.7

Timestamp:

10/29/2024 10:53:22 PM (22 months ago)

Author:

peterwilsoncc

Message:

Global styles: preload /global-styles endpoint responses

This commit fixes a regression whereby requests to global styles endpoints were not being preloaded, resulting in several requests being fired clientside unnecessarily.

For performance reasons, we preload the requests so that the data is in the editor store and ready to use straight away.

The outcome is that the editor loads more quickly.

Follow-up to [62042].

Reviewed by peterwilsoncc.
Merges [59316] to the 6.7 branch.

Props ellatrix, ramonopoly, apermo, peterwilsoncc.
Fixes #62315.

Location:

branches/6.7

Files:

• . (modified) (1 prop)
• src/wp-admin/edit-form-blocks.php (modified) (2 diffs)
• src/wp-admin/site-editor.php (modified) (1 diff)

branches/6.7/src/wp-admin/edit-form-blocks.php

@@ -51 +51 @@
 
 $rest_path = rest_get_route_for_post( $post );
+
+$active_theme = get_stylesheet();
 
 // Preload common data.
@@ -66 +68 @@
         '/wp/v2/settings',
         array( '/wp/v2/settings', 'OPTIONS' ),
-        '/wp/v2/global-styles/themes/' . get_stylesheet(),
+        '/wp/v2/global-styles/themes/' . $active_theme . '?context=view',
+        '/wp/v2/global-styles/themes/' . $active_theme . '/variations?context=view',
         '/wp/v2/themes?context=edit&status=active',
+        array( '/wp/v2/global-styles/' . WP_Theme_JSON_Resolver::get_user_global_styles_post_id(), 'OPTIONS' ),
         '/wp/v2/global-styles/' . WP_Theme_JSON_Resolver::get_user_global_styles_post_id() . '?context=edit',
 );

branches/6.7/src/wp-admin/site-editor.php

@@ -98 +98 @@
         '/wp/v2/themes?context=edit&status=active',
         '/wp/v2/global-styles/' . $active_global_styles_id . '?context=edit',
-        '/wp/v2/global-styles/' . $active_global_styles_id,
-        '/wp/v2/global-styles/themes/' . $active_theme,
+        array( '/wp/v2/global-styles/' . $active_global_styles_id, 'OPTIONS' ),
+        '/wp/v2/global-styles/themes/' . $active_theme . '?context=view',
+        '/wp/v2/global-styles/themes/' . $active_theme . '/variations?context=view',
         array( $navigation_rest_route, 'OPTIONS' ),
         array(