<!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>[56807] trunk/src/wp-includes/block-supports/elements.php: Editor: Improve performance of `wp_render_elements_support()`.</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/56807">56807</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/56807","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>flixos90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-10-09 17:05:31 +0000 (Mon, 09 Oct 2023)</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'>Editor: Improve performance of `wp_render_elements_support()`.
By skipping iterations in block supports when not necessary, this changeset improves performance of the function notably.
The performance enhancement leads to even a notable improvement for overall page load time: For example, the Twenty Twenty-Four home page loads ~2% faster with this changeset.
Props dmsnell, spacedmonkey, costdev, hellofromTonya, aaronrobertshaw.
Fixes <a href="https://core.trac.wordpress.org/ticket/59544">#59544</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesblocksupportselementsphp">trunk/src/wp-includes/block-supports/elements.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesblocksupportselementsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/block-supports/elements.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/block-supports/elements.php 2023-10-09 16:38:26 UTC (rev 56806)
+++ trunk/src/wp-includes/block-supports/elements.php 2023-10-09 17:05:31 UTC (rev 56807)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Filtered block content.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_render_elements_support( $block_content, $block ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $block_content || empty( $block['attrs'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $block_content || ! isset( $block['attrs']['style']['elements'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $block_content;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,42 +41,42 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'button' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'skip' => wp_should_skip_block_supports_serialization( $block_type, 'color', 'button' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'paths' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'style.elements.button.color.text',
- 'style.elements.button.color.background',
- 'style.elements.button.color.gradient',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array( 'button', 'color', 'text' ),
+ array( 'button', 'color', 'background' ),
+ array( 'button', 'color', 'gradient' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'link' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'skip' => wp_should_skip_block_supports_serialization( $block_type, 'color', 'link' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'paths' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'style.elements.link.color.text',
- 'style.elements.link.:hover.color.text',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array( 'link', 'color', 'text' ),
+ array( 'link', ':hover', 'color', 'text' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'heading' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'skip' => wp_should_skip_block_supports_serialization( $block_type, 'color', 'heading' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'paths' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'style.elements.heading.color.text',
- 'style.elements.heading.color.background',
- 'style.elements.heading.color.gradient',
- 'style.elements.h1.color.text',
- 'style.elements.h1.color.background',
- 'style.elements.h1.color.gradient',
- 'style.elements.h2.color.text',
- 'style.elements.h2.color.background',
- 'style.elements.h2.color.gradient',
- 'style.elements.h3.color.text',
- 'style.elements.h3.color.background',
- 'style.elements.h3.color.gradient',
- 'style.elements.h4.color.text',
- 'style.elements.h4.color.background',
- 'style.elements.h4.color.gradient',
- 'style.elements.h5.color.text',
- 'style.elements.h5.color.background',
- 'style.elements.h5.color.gradient',
- 'style.elements.h6.color.text',
- 'style.elements.h6.color.background',
- 'style.elements.h6.color.gradient',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array( 'heading', 'color', 'text' ),
+ array( 'heading', 'color', 'background' ),
+ array( 'heading', 'color', 'gradient' ),
+ array( 'h1', 'color', 'text' ),
+ array( 'h1', 'color', 'background' ),
+ array( 'h1', 'color', 'gradient' ),
+ array( 'h2', 'color', 'text' ),
+ array( 'h2', 'color', 'background' ),
+ array( 'h2', 'color', 'gradient' ),
+ array( 'h3', 'color', 'text' ),
+ array( 'h3', 'color', 'background' ),
+ array( 'h3', 'color', 'gradient' ),
+ array( 'h4', 'color', 'text' ),
+ array( 'h4', 'color', 'background' ),
+ array( 'h4', 'color', 'gradient' ),
+ array( 'h5', 'color', 'text' ),
+ array( 'h5', 'color', 'background' ),
+ array( 'h5', 'color', 'gradient' ),
+ array( 'h6', 'color', 'text' ),
+ array( 'h6', 'color', 'background' ),
+ array( 'h6', 'color', 'gradient' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,7 +89,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $block_content;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $element_colors_set = 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $elements_style_attributes = $block['attrs']['style']['elements'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $element_color_properties as $element_config ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $element_config['skip'] ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,24 +97,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $element_config['paths'] as $path ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( null !== _wp_array_get( $block['attrs'], explode( '.', $path ), null ) ) {
- ++$element_colors_set;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( null !== _wp_array_get( $elements_style_attributes, $path, null ) ) {
+ /*
+ * It only takes a single custom attribute to require that the custom
+ * class name be added to the block, so once one is found there's no
+ * need to continue looking for others.
+ *
+ * As is done with the layout hook, this code assumes that the block
+ * contains a single wrapper and that it's the first element in the
+ * rendered output. That first element, if it exists, gets the class.
+ */
+ $tags = new WP_HTML_Tag_Processor( $block_content );
+ if ( $tags->next_tag() ) {
+ $tags->add_class( wp_get_elements_class_name( $block ) );
+ }
+
+ return $tags->get_updated_html();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $element_colors_set ) {
- return $block_content;
- }
-
- // Like the layout hook this assumes the hook only applies to blocks with a single wrapper.
- // Add the class name to the first element, presuming it's the wrapper, if it exists.
- $tags = new WP_HTML_Tag_Processor( $block_content );
- if ( $tags->next_tag() ) {
- $tags->add_class( wp_get_elements_class_name( $block ) );
- }
-
- return $tags->get_updated_html();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If no custom attributes were found then there's nothing to modify.
+ return $block_content;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre>
</div>
</div>
</body>
</html>