<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[59324] branches/6.7/src/wp-admin/site-editor.php: Global styles: preload `/global-styles` endpoint responses</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/59324">59324</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/59324","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>peterwilsoncc</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-10-29 22:53:22 +0000 (Tue, 29 Oct 2024)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="https://core.trac.wordpress.org/changeset/62042">[62042]</a>.
Reviewed by peterwilsoncc.
Merges <a href="https://core.trac.wordpress.org/changeset/59316">[59316]</a> to the 6.7 branch.
Props ellatrix, ramonopoly, apermo, peterwilsoncc.
Fixes <a href="https://core.trac.wordpress.org/ticket/62315">#62315</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches67srcwpadmineditformblocksphp">branches/6.7/src/wp-admin/edit-form-blocks.php</a></li>
<li><a href="#branches67srcwpadminsiteeditorphp">branches/6.7/src/wp-admin/site-editor.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches67">branches/6.7/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/6.7
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/6.7 2024-10-29 17:05:26 UTC (rev 59323)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/6.7 2024-10-29 22:53:22 UTC (rev 59324)
</ins><a id="branches67"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/6.7</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43747,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43785,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43929,43931-43942,43946-43947,43949-43956,43959-43964,43967-43969,43988,43994,44014,44017,44047,44183,44185,44187-44206,44208-44213,44231-44232,44235,44248,44284,44287-44288
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.5:49373-49379,49381
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.8:51889
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:58570,59279-59280,59283,59286,59289-59290,59293,59306-59307,59318-59319
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:58570,59279-59280,59283,59286,59289-59290,59293,59306-59307,59316,59318-59319
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches67srcwpadmineditformblocksphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.7/src/wp-admin/edit-form-blocks.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.7/src/wp-admin/edit-form-blocks.php 2024-10-29 17:05:26 UTC (rev 59323)
+++ branches/6.7/src/wp-admin/edit-form-blocks.php 2024-10-29 22:53:22 UTC (rev 59324)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,6 +51,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $rest_path = rest_get_route_for_post( $post );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$active_theme = get_stylesheet();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Preload common data.
</span><span class="cx" style="display: block; padding: 0 10px"> $preload_paths = array(
</span><span class="cx" style="display: block; padding: 0 10px"> '/wp/v2/types?context=view',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,8 +67,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf( '%s/autosaves?context=edit', $rest_path ),
</span><span class="cx" style="display: block; padding: 0 10px"> '/wp/v2/settings',
</span><span class="cx" style="display: block; padding: 0 10px"> array( '/wp/v2/settings', 'OPTIONS' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '/wp/v2/global-styles/themes/' . get_stylesheet(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '/wp/v2/global-styles/themes/' . $active_theme . '?context=view',
+ '/wp/v2/global-styles/themes/' . $active_theme . '/variations?context=view',
</ins><span class="cx" style="display: block; padding: 0 10px"> '/wp/v2/themes?context=edit&status=active',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array( '/wp/v2/global-styles/' . WP_Theme_JSON_Resolver::get_user_global_styles_post_id(), 'OPTIONS' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '/wp/v2/global-styles/' . WP_Theme_JSON_Resolver::get_user_global_styles_post_id() . '?context=edit',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches67srcwpadminsiteeditorphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.7/src/wp-admin/site-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.7/src/wp-admin/site-editor.php 2024-10-29 17:05:26 UTC (rev 59323)
+++ branches/6.7/src/wp-admin/site-editor.php 2024-10-29 22:53:22 UTC (rev 59324)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,8 +97,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '/wp/v2/template-parts?context=edit&per_page=-1',
</span><span class="cx" style="display: block; padding: 0 10px"> '/wp/v2/themes?context=edit&status=active',
</span><span class="cx" style="display: block; padding: 0 10px"> '/wp/v2/global-styles/' . $active_global_styles_id . '?context=edit',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '/wp/v2/global-styles/' . $active_global_styles_id,
- '/wp/v2/global-styles/themes/' . $active_theme,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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',
</ins><span class="cx" style="display: block; padding: 0 10px"> array( $navigation_rest_route, 'OPTIONS' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> add_query_arg(
</span></span></pre>
</div>
</div>
</body>
</html>