<!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>[57246] trunk: Editor: add layout classes to legacy Group inner container.</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/57246">57246</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/57246","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>isabel_brison</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-01-08 06:12:00 +0000 (Mon, 08 Jan 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'>Editor: add layout classes to legacy Group inner container.
Moves generated layout classes into the Group block inner container in classic themes, so that block gap support can work correctly.
Props flixos90, mukesh27.
Fixes <a href="https://core.trac.wordpress.org/ticket/60130">#60130</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesblocksupportslayoutphp">trunk/src/wp-includes/block-supports/layout.php</a></li>
<li><a href="#trunktestsphpunittestsblocksupportslayoutphp">trunk/tests/phpunit/tests/block-supports/layout.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesblocksupportslayoutphp"></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/layout.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/block-supports/layout.php 2024-01-07 16:07:47 UTC (rev 57245)
+++ trunk/src/wp-includes/block-supports/layout.php 2024-01-08 06:12:00 UTC (rev 57246)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -638,7 +638,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * for features like the enhanced pagination of the Query block.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $container_class = wp_unique_prefixed_id(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp-container-' . sanitize_title( $block['blockName'] ) . '-layout-'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wp-container-' . sanitize_title( $block['blockName'] ) . '-is-layout-'
</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"> // Set the correct layout type for blocks using legacy content width.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -883,17 +883,45 @@
</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">- $replace_regex = sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * This filter runs after the layout classnames have been added to the block, so they
+ * have to be removed from the outer wrapper and then added to the inner.
+ */
+ $layout_classes = array();
+ $processor = new WP_HTML_Tag_Processor( $block_content );
+
+ if ( $processor->next_tag( array( 'class_name' => 'wp-block-group' ) ) ) {
+ foreach ( $processor->class_list() as $class_name ) {
+ if ( str_contains( $class_name, 'is-layout-' ) ) {
+ $layout_classes[] = $class_name;
+ $processor->remove_class( $class_name );
+ }
+ }
+ }
+
+ $content_without_layout_classes = $processor->get_updated_html();
+ $replace_regex = sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> '/(^\s*<%1$s\b[^>]*wp-block-group[^>]*>)(.*)(<\/%1$s>\s*$)/ms',
</span><span class="cx" style="display: block; padding: 0 10px"> preg_quote( $tag_name, '/' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $updated_content = preg_replace_callback(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $updated_content = preg_replace_callback(
</ins><span class="cx" style="display: block; padding: 0 10px"> $replace_regex,
</span><span class="cx" style="display: block; padding: 0 10px"> static function ( $matches ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $matches[1] . '<div class="wp-block-group__inner-container">' . $matches[2] . '</div>' . $matches[3];
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_content
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content_without_layout_classes
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Add layout classes to inner wrapper.
+ if ( ! empty( $layout_classes ) ) {
+ $processor = new WP_HTML_Tag_Processor( $updated_content );
+ if ( $processor->next_tag( array( 'class_name' => 'wp-block-group__inner-container' ) ) ) {
+ foreach ( $layout_classes as $class_name ) {
+ $processor->add_class( $class_name );
+ }
+ }
+ $updated_content = $processor->get_updated_html();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> return $updated_content;
</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="trunktestsphpunittestsblocksupportslayoutphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/block-supports/layout.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/block-supports/layout.php 2024-01-07 16:07:47 UTC (rev 57245)
+++ trunk/tests/phpunit/tests/block-supports/layout.php 2024-01-08 06:12:00 UTC (rev 57246)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -252,4 +252,94 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Check that wp_restore_group_inner_container() restores the legacy inner container on the Group block.
+ *
+ * @ticket 60130
+ *
+ * @covers ::wp_restore_group_inner_container
+ *
+ * @dataProvider data_restore_group_inner_container
+ *
+ * @param array $args Dataset to test.
+ * @param string $expected_output The expected output.
+ */
+ public function test_restore_group_inner_container( $args, $expected_output ) {
+ $actual_output = wp_restore_group_inner_container( $args['block_content'], $args['block'] );
+ $this->assertEquals( $expected_output, $actual_output );
+ }
+
+ /**
+ * Data provider for test_restore_group_inner_container.
+ *
+ * @return array
+ */
+ public function data_restore_group_inner_container() {
+ return array(
+ 'group block with existing inner container' => array(
+ 'args' => array(
+ 'block_content' => '<div class="wp-block-group"><div class="wp-block-group__inner-container"></div></div>',
+ 'block' => array(
+ 'blockName' => 'core/group',
+ 'attrs' => array(
+ 'layout' => array(
+ 'type' => 'default',
+ ),
+ ),
+ 'innerBlocks' => array(),
+ 'innerHTML' => '<div class="wp-block-group"><div class="wp-block-group__inner-container"></div></div>',
+ 'innerContent' => array(
+ '<div class="wp-block-group"><div class="wp-block-group__inner-container">',
+ ' ',
+ ' </div></div>',
+ ),
+ ),
+ ),
+ 'expected_output' => '<div class="wp-block-group"><div class="wp-block-group__inner-container"></div></div>',
+ ),
+ 'group block with no existing inner container' => array(
+ 'args' => array(
+ 'block_content' => '<div class="wp-block-group"></div>',
+ 'block' => array(
+ 'blockName' => 'core/group',
+ 'attrs' => array(
+ 'layout' => array(
+ 'type' => 'default',
+ ),
+ ),
+ 'innerBlocks' => array(),
+ 'innerHTML' => '<div class="wp-block-group"></div>',
+ 'innerContent' => array(
+ '<div class="wp-block-group">',
+ ' ',
+ ' </div>',
+ ),
+ ),
+ ),
+ 'expected_output' => '<div class="wp-block-group"><div class="wp-block-group__inner-container"></div></div>',
+ ),
+ 'group block with layout classnames' => array(
+ 'args' => array(
+ 'block_content' => '<div class="wp-block-group is-layout-constrained wp-block-group-is-layout-constrained"></div>',
+ 'block' => array(
+ 'blockName' => 'core/group',
+ 'attrs' => array(
+ 'layout' => array(
+ 'type' => 'default',
+ ),
+ ),
+ 'innerBlocks' => array(),
+ 'innerHTML' => '<div class="wp-block-group"></div>',
+ 'innerContent' => array(
+ '<div class="wp-block-group">',
+ ' ',
+ ' </div>',
+ ),
+ ),
+ ),
+ 'expected_output' => '<div class="wp-block-group"><div class="wp-block-group__inner-container is-layout-constrained wp-block-group-is-layout-constrained"></div></div>',
+ ),
+ );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>