<!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>[58413] trunk: Section styles: add slug to override non-kebab-cased variations.</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/58413">58413</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/58413","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>oandregal</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-06-14 09:03:40 +0000 (Fri, 14 Jun 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'>Section styles: add slug to override non-kebab-cased variations.
Props aaronrobertshaw, oandregal.
Fixes <a href="https://core.trac.wordpress.org/ticket/61440">#61440</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesblocksupportsblockstylevariationsphp">trunk/src/wp-includes/block-supports/block-style-variations.php</a></li>
<li><a href="#trunksrcwpincludesclasswpthemejsonphp">trunk/src/wp-includes/class-wp-theme-json.php</a></li>
<li><a href="#trunktestsphpunittestsblocksupportsblockstylevariationsphp">trunk/tests/phpunit/tests/block-supports/block-style-variations.php</a></li>
<li><a href="#trunktestsphpunitteststhemewpThemeJsonResolverphp">trunk/tests/phpunit/tests/theme/wpThemeJsonResolver.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunitdatathemedir1blockthemestylesblockstylevariationwithslugjson">trunk/tests/phpunit/data/themedir1/block-theme/styles/block-style-variation-with-slug.json</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesblocksupportsblockstylevariationsphp"></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/block-style-variations.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/block-supports/block-style-variations.php 2024-06-14 08:33:37 UTC (rev 58412)
+++ trunk/src/wp-includes/block-supports/block-style-variations.php 2024-06-14 09:03:40 UTC (rev 58413)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -249,7 +249,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Block style variations read in via standalone theme.json partials
</span><span class="cx" style="display: block; padding: 0 10px"> * need to have their name set to the kebab case version of their title.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $variation_name = $have_named_variations ? $key : _wp_to_kebab_case( $variation['title'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $variation_name = $have_named_variations ? $key : ( $variation['slug'] ?? _wp_to_kebab_case( $variation['title'] ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $supported_blocks as $block_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Add block style variation data under current block type.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -441,7 +441,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Block style variations read in via standalone theme.json partials
</span><span class="cx" style="display: block; padding: 0 10px"> * need to have their name set to the kebab case version of their title.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $variation_name = $have_named_variations ? $key : _wp_to_kebab_case( $variation['title'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $variation_name = $have_named_variations ? $key : ( $variation['slug'] ?? _wp_to_kebab_case( $variation['title'] ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $variation_label = $variation['title'] ?? $variation_name;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $supported_blocks as $block_type ) {
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpthemejsonphp"></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/class-wp-theme-json.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-theme-json.php 2024-06-14 08:33:37 UTC (rev 58412)
+++ trunk/src/wp-includes/class-wp-theme-json.php 2024-06-14 09:03:40 UTC (rev 58413)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -358,6 +358,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'description',
</span><span class="cx" style="display: block; padding: 0 10px"> 'patterns',
</span><span class="cx" style="display: block; padding: 0 10px"> 'settings',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'slug',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'styles',
</span><span class="cx" style="display: block; padding: 0 10px"> 'templateParts',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3244,7 +3245,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.3.2 Preserves global styles block variations when securing styles.
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.6.0 Updated to allow variation element styles and $origin parameter.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $theme_json Structure to sanitize.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $theme_json Structure to sanitize.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $origin Optional. What source of data this object represents.
</span><span class="cx" style="display: block; padding: 0 10px"> * One of 'blocks', 'default', 'theme', or 'custom'. Default 'theme'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Sanitized structure.
</span></span></pre></div>
<a id="trunktestsphpunitdatathemedir1blockthemestylesblockstylevariationwithslugjson"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/data/themedir1/block-theme/styles/block-style-variation-with-slug.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/themedir1/block-theme/styles/block-style-variation-with-slug.json (rev 0)
+++ trunk/tests/phpunit/data/themedir1/block-theme/styles/block-style-variation-with-slug.json 2024-06-14 09:03:40 UTC (rev 58413)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,12 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+{
+ "version": 3,
+ "blockTypes": [ "core/group", "core/columns" ],
+ "slug": "WithSlug",
+ "title": "With Slug",
+ "styles": {
+ "color": {
+ "background": "aliceblue",
+ "text": "midnightblue"
+ }
+ }
+}
</ins></span></pre></div>
<a id="trunktestsphpunittestsblocksupportsblockstylevariationsphp"></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/block-style-variations.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/block-supports/block-style-variations.php 2024-06-14 08:33:37 UTC (rev 58412)
+++ trunk/tests/phpunit/tests/block-supports/block-style-variations.php 2024-06-14 09:03:40 UTC (rev 58413)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,6 +61,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * variation file within `/styles`, are added to the theme data.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 61312
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 61440
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_add_registered_block_styles_to_theme_data() {
</span><span class="cx" style="display: block; padding: 0 10px"> switch_theme( 'block-theme' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,9 +99,25 @@
</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">+ /*
+ * This style is to be deliberately overwritten by the theme.json partial
+ * See `tests/phpunit/data/themedir1/block-theme/styles/block-style-variation-with-slug.json`.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> register_block_style(
</span><span class="cx" style="display: block; padding: 0 10px"> 'core/group',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => 'WithSlug',
+ 'style_data' => array(
+ 'color' => array(
+ 'background' => 'whitesmoke',
+ 'text' => 'black',
+ ),
+ ),
+ )
+ );
+ register_block_style(
+ 'core/group',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'my-variation',
</span><span class="cx" style="display: block; padding: 0 10px"> 'style_data' => $variation_styles_data,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,6 +127,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $group_styles = $theme_json['styles']['blocks']['core/group'] ?? array();
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'variations' => array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // @ticket 61440
+ 'WithSlug' => array(
+ 'color' => array(
+ 'background' => 'aliceblue',
+ 'text' => 'midnightblue',
+ ),
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'my-variation' => $variation_styles_data,
</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">@@ -133,7 +157,8 @@
</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"> unregister_block_style( 'core/group', 'my-variation' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unregister_block_style( 'core/group', 'WithSlug' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSameSetsWithIndex( $group_styles, $expected );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSameSetsWithIndex( $expected, $group_styles );
</ins><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="trunktestsphpunitteststhemewpThemeJsonResolverphp"></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/theme/wpThemeJsonResolver.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/theme/wpThemeJsonResolver.php 2024-06-14 08:33:37 UTC (rev 58412)
+++ trunk/tests/phpunit/tests/theme/wpThemeJsonResolver.php 2024-06-14 09:03:40 UTC (rev 58413)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1160,6 +1160,19 @@
</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">+ // @ticket 61440
+ array(
+ 'blockTypes' => array( 'core/group', 'core/columns' ),
+ 'version' => 3,
+ 'slug' => 'WithSlug',
+ 'title' => 'With Slug',
+ 'styles' => array(
+ 'color' => array(
+ 'background' => 'aliceblue',
+ 'text' => 'midnightblue',
+ ),
+ ),
+ ),
</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>