<!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>[50991] trunk/src: Block Editor: Add the layout block 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/50991">50991</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/50991","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>youknowriad</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-05-25 07:35:56 +0000 (Tue, 25 May 2021)</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'>Block Editor: Add the layout block support.
The layout block allows containers to define the size of their inner blocks
and the allowed allignments.
It's only enabled for themes with theme.json files.
Props nosolosw.
See <a href="https://core.trac.wordpress.org/ticket/53175">#53175</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmineditformblocksphp">trunk/src/wp-admin/edit-form-blocks.php</a></li>
<li><a href="#trunksrcwpincludesblocksupportslayoutphp">trunk/src/wp-includes/block-supports/layout.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmineditformblocksphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/edit-form-blocks.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-form-blocks.php 2021-05-25 05:20:01 UTC (rev 50990)
+++ trunk/src/wp-admin/edit-form-blocks.php 2021-05-25 07:35:56 UTC (rev 50991)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,6 +209,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'unlockNonce' => wp_create_nonce( 'update-post_' . $post->ID ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'ajaxUrl' => admin_url( 'admin-ajax.php' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'supportsLayout' => WP_Theme_JSON_Resolver::theme_has_support(),
</ins><span class="cx" style="display: block; padding: 0 10px"> '__experimentalBlockPatterns' => WP_Block_Patterns_Registry::get_instance()->get_all_registered(),
</span><span class="cx" style="display: block; padding: 0 10px"> '__experimentalBlockPatternCategories' => WP_Block_Pattern_Categories_Registry::get_instance()->get_all_registered(),
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<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 2021-05-25 05:20:01 UTC (rev 50990)
+++ trunk/src/wp-includes/block-supports/layout.php 2021-05-25 07:35:56 UTC (rev 50991)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,6 +7,104 @@
</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">+ * Registers the layout block attribute for block types that support it.
+ *
+ * @since 5.8.0
+ * @access private
+ *
+ * @param WP_Block_Type $block_type Block Type.
+ */
+function wp_register_layout_support( $block_type ) {
+ $support_layout = block_has_support( $block_type, array( '__experimentalLayout' ), false );
+ if ( $support_layout ) {
+ if ( ! $block_type->attributes ) {
+ $block_type->attributes = array();
+ }
+
+ if ( ! array_key_exists( 'layout', $block_type->attributes ) ) {
+ $block_type->attributes['layout'] = array(
+ 'type' => 'object',
+ );
+ }
+ }
+}
+
+/**
+ * Renders the layout config to the block wrapper.
+ *
+ * @since 5.8.0
+ * @access private
+ *
+ * @param string $block_content Rendered block content.
+ * @param array $block Block object.
+ * @return string Filtered block content.
+ */
+function wp_render_layout_support_flag( $block_content, $block ) {
+ $block_type = WP_Block_Type_Registry::get_instance()->get_registered( $block['blockName'] );
+ $support_layout = block_has_support( $block_type, array( '__experimentalLayout' ), false );
+ if ( ! $support_layout || ! isset( $block['attrs']['layout'] ) ) {
+ return $block_content;
+ }
+
+ $used_layout = $block['attrs']['layout'];
+ if ( isset( $used_layout['inherit'] ) && $used_layout['inherit'] ) {
+ $tree = WP_Theme_JSON_Resolver::get_merged_data();
+ $default_layout = _wp_array_get( $tree->get_settings(), array( 'layout' ) );
+ if ( ! $default_layout ) {
+ return $block_content;
+ }
+ $used_layout = $default_layout;
+ }
+
+ $id = uniqid();
+ $content_size = isset( $used_layout['contentSize'] ) ? $used_layout['contentSize'] : null;
+ $wide_size = isset( $used_layout['wideSize'] ) ? $used_layout['wideSize'] : null;
+
+ $all_max_width_value = $content_size ? $content_size : $wide_size;
+ $wide_max_width_value = $wide_size ? $wide_size : $content_size;
+
+ // Make sure there is a single CSS rule, and all tags are stripped for security.
+ $all_max_width_value = safecss_filter_attr( explode( ';', $all_max_width_value )[0] );
+ $wide_max_width_value = safecss_filter_attr( explode( ';', $wide_max_width_value )[0] );
+
+ $style = '';
+ if ( $content_size || $wide_size ) {
+ $style = ".wp-container-$id > * {";
+ $style .= 'max-width: ' . esc_html( $all_max_width_value ) . ';';
+ $style .= 'margin-left: auto !important;';
+ $style .= 'margin-right: auto !important;';
+ $style .= '}';
+
+ $style .= ".wp-container-$id > .alignwide { max-width: " . esc_html( $wide_max_width_value ) . ';}';
+
+ $style .= ".wp-container-$id .alignfull { max-width: none; }";
+ }
+
+ $style .= ".wp-container-$id .alignleft { float: left; margin-right: 2em; }";
+ $style .= ".wp-container-$id .alignright { float: right; margin-left: 2em; }";
+
+ // This assumes the hook only applies to blocks with a single wrapper.
+ // I think this is a reasonable limitation for that particular hook.
+ $content = preg_replace(
+ '/' . preg_quote( 'class="', '/' ) . '/',
+ 'class="wp-container-' . $id . ' ',
+ $block_content,
+ 1
+ );
+
+ return $content . '<style>' . $style . '</style>';
+}
+
+// Register the block support.
+WP_Block_Supports::get_instance()->register(
+ 'layout',
+ array(
+ 'register_attribute' => 'wp_register_layout_support',
+ )
+);
+add_filter( 'render_block', 'wp_render_layout_support_flag', 10, 2 );
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * For themes without theme.json file, make sure
</span><span class="cx" style="display: block; padding: 0 10px"> * to restore the inner div for the group block
</span><span class="cx" style="display: block; padding: 0 10px"> * to avoid breaking styles relying on that div.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,9 +120,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_restore_group_inner_container( $block_content, $block ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $group_with_inner_container_regex = '/(^\s*<div\b[^>]*wp-block-group(\s|")[^>]*>)(\s*<div\b[^>]*wp-block-group__inner-container(\s|")[^>]*>)((.|\S|\s)*)/';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // TODO: Add check for theme.json presence.
</del><span class="cx" style="display: block; padding: 0 10px"> if (
</span><span class="cx" style="display: block; padding: 0 10px"> 'core/group' !== $block['blockName'] ||
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ WP_Theme_JSON_Resolver::theme_has_support() ||
</ins><span class="cx" style="display: block; padding: 0 10px"> 1 === preg_match( $group_with_inner_container_regex, $block_content )
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $block_content;
</span></span></pre>
</div>
</div>
</body>
</html>