<!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>[55985] trunk: Editor: add text columns to typography 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/55985">55985</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/55985","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>2023-06-22 08:16:05 +0000 (Thu, 22 Jun 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: add text columns to typography support.
Adds a text columns feature to the typography block support that uses CSS `column-count` for multi-column text.
Props ramonopoly, aaronrobertshaw.
Fixes <a href="https://core.trac.wordpress.org/ticket/58549">#58549</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesblocksupportstypographyphp">trunk/src/wp-includes/block-supports/typography.php</a></li>
<li><a href="#trunksrcwpincludesclasswpthemejsonphp">trunk/src/wp-includes/class-wp-theme-json.php</a></li>
<li><a href="#trunksrcwpincludesstyleengineclasswpstyleenginephp">trunk/src/wp-includes/style-engine/class-wp-style-engine.php</a></li>
<li><a href="#trunktestsphpunittestsstyleenginestyleEnginephp">trunk/tests/phpunit/tests/style-engine/styleEngine.php</a></li>
<li><a href="#trunktestsphpunitteststhemewpThemeJsonphp">trunk/tests/phpunit/tests/theme/wpThemeJson.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesblocksupportstypographyphp"></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/typography.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/block-supports/typography.php 2023-06-22 07:52:24 UTC (rev 55984)
+++ trunk/src/wp-includes/block-supports/typography.php 2023-06-22 08:16:05 UTC (rev 55985)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,6 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Registers the style and typography block attributes for block types that support it.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.6.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 6.3.0 Added support for text-columns.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Block_Type $block_type Block Type.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,6 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $has_font_weight_support = _wp_array_get( $typography_supports, array( '__experimentalFontWeight' ), false );
</span><span class="cx" style="display: block; padding: 0 10px"> $has_letter_spacing_support = _wp_array_get( $typography_supports, array( '__experimentalLetterSpacing' ), false );
</span><span class="cx" style="display: block; padding: 0 10px"> $has_line_height_support = _wp_array_get( $typography_supports, array( 'lineHeight' ), false );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $has_text_columns_support = _wp_array_get( $typography_supports, array( 'textColumns' ), false );
</ins><span class="cx" style="display: block; padding: 0 10px"> $has_text_decoration_support = _wp_array_get( $typography_supports, array( '__experimentalTextDecoration' ), false );
</span><span class="cx" style="display: block; padding: 0 10px"> $has_text_transform_support = _wp_array_get( $typography_supports, array( '__experimentalTextTransform' ), false );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,6 +41,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> || $has_font_weight_support
</span><span class="cx" style="display: block; padding: 0 10px"> || $has_letter_spacing_support
</span><span class="cx" style="display: block; padding: 0 10px"> || $has_line_height_support
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ || $has_text_columns_support
</ins><span class="cx" style="display: block; padding: 0 10px"> || $has_text_decoration_support
</span><span class="cx" style="display: block; padding: 0 10px"> || $has_text_transform_support;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,6 +75,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.1.0 Used the style engine to generate CSS and classnames.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 6.3.0 Added support for text-columns.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Block_Type $block_type Block type.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,6 +102,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $has_font_weight_support = _wp_array_get( $typography_supports, array( '__experimentalFontWeight' ), false );
</span><span class="cx" style="display: block; padding: 0 10px"> $has_letter_spacing_support = _wp_array_get( $typography_supports, array( '__experimentalLetterSpacing' ), false );
</span><span class="cx" style="display: block; padding: 0 10px"> $has_line_height_support = _wp_array_get( $typography_supports, array( 'lineHeight' ), false );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $has_text_columns_support = _wp_array_get( $typography_supports, array( 'textColumns' ), false );
</ins><span class="cx" style="display: block; padding: 0 10px"> $has_text_decoration_support = _wp_array_get( $typography_supports, array( '__experimentalTextDecoration' ), false );
</span><span class="cx" style="display: block; padding: 0 10px"> $has_text_transform_support = _wp_array_get( $typography_supports, array( '__experimentalTextTransform' ), false );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,6 +112,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $should_skip_font_style = wp_should_skip_block_supports_serialization( $block_type, 'typography', 'fontStyle' );
</span><span class="cx" style="display: block; padding: 0 10px"> $should_skip_font_weight = wp_should_skip_block_supports_serialization( $block_type, 'typography', 'fontWeight' );
</span><span class="cx" style="display: block; padding: 0 10px"> $should_skip_line_height = wp_should_skip_block_supports_serialization( $block_type, 'typography', 'lineHeight' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $should_skip_text_columns = wp_should_skip_block_supports_serialization( $block_type, 'typography', 'textColumns' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $should_skip_text_decoration = wp_should_skip_block_supports_serialization( $block_type, 'typography', 'textDecoration' );
</span><span class="cx" style="display: block; padding: 0 10px"> $should_skip_text_transform = wp_should_skip_block_supports_serialization( $block_type, 'typography', 'textTransform' );
</span><span class="cx" style="display: block; padding: 0 10px"> $should_skip_letter_spacing = wp_should_skip_block_supports_serialization( $block_type, 'typography', 'letterSpacing' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -162,6 +168,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $typography_block_styles['lineHeight'] = _wp_array_get( $block_attributes, array( 'style', 'typography', 'lineHeight' ) );
</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">+ if ( $has_text_columns_support && ! $should_skip_text_columns && isset( $block_attributes['style']['typography']['textColumns'] ) ) {
+ $typography_block_styles['textColumns'] = _wp_array_get( $block_attributes, array( 'style', 'typography', 'textColumns' ), null );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if (
</span><span class="cx" style="display: block; padding: 0 10px"> $has_text_decoration_support &&
</span><span class="cx" style="display: block; padding: 0 10px"> ! $should_skip_text_decoration &&
</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 2023-06-22 07:52:24 UTC (rev 55984)
+++ trunk/src/wp-includes/class-wp-theme-json.php 2023-06-22 08:16:05 UTC (rev 55985)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -201,6 +201,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * `--wp--style--root--padding-*`, and `box-shadow` properties,
</span><span class="cx" style="display: block; padding: 0 10px"> * removed the `--wp--style--block-gap` property.
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.2.0 Added `outline-*`, and `min-height` properties.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 6.3.0 Added `column-count` property.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @var array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -228,6 +229,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'border-left-width' => array( 'border', 'left', 'width' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'border-left-style' => array( 'border', 'left', 'style' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'color' => array( 'color', 'text' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'column-count' => array( 'typography', 'textColumns' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'font-family' => array( 'typography', 'fontFamily' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'font-size' => array( 'typography', 'fontSize' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'font-style' => array( 'typography', 'fontStyle' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -334,6 +336,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.1.0 Added `layout.definitions` and `useRootPaddingAwareAlignments`.
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.2.0 Added `dimensions.minHeight`, 'shadow.presets', 'shadow.defaultPresets',
</span><span class="cx" style="display: block; padding: 0 10px"> * `position.fixed` and `position.sticky`.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 6.3.0 Added support for `typography.textColumns`.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @var array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> const VALID_SETTINGS = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -395,6 +399,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'fontWeight' => null,
</span><span class="cx" style="display: block; padding: 0 10px"> 'letterSpacing' => null,
</span><span class="cx" style="display: block; padding: 0 10px"> 'lineHeight' => null,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'textColumns' => null,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'textDecoration' => null,
</span><span class="cx" style="display: block; padding: 0 10px"> 'textTransform' => null,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -411,6 +416,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * added new property `shadow`,
</span><span class="cx" style="display: block; padding: 0 10px"> * updated `blockGap` to be allowed at any level.
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.2.0 Added `outline`, and `minHeight` properties.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 6.3.0 Added support for `typography.textColumns`.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @var array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -455,6 +461,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'fontWeight' => null,
</span><span class="cx" style="display: block; padding: 0 10px"> 'letterSpacing' => null,
</span><span class="cx" style="display: block; padding: 0 10px"> 'lineHeight' => null,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'textColumns' => null,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'textDecoration' => null,
</span><span class="cx" style="display: block; padding: 0 10px"> 'textTransform' => null,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span></span></pre></div>
<a id="trunksrcwpincludesstyleengineclasswpstyleenginephp"></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/style-engine/class-wp-style-engine.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/style-engine/class-wp-style-engine.php 2023-06-22 07:52:24 UTC (rev 55984)
+++ trunk/src/wp-includes/style-engine/class-wp-style-engine.php 2023-06-22 08:16:05 UTC (rev 55985)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,6 +21,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.1.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 6.3.0 Added support for text-columns.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> #[AllowDynamicProperties]
</span><span class="cx" style="display: block; padding: 0 10px"> final class WP_Style_Engine {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,6 +218,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'path' => array( 'typography', 'lineHeight' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'textColumns' => array(
+ 'property_keys' => array(
+ 'default' => 'column-count',
+ ),
+ 'path' => array( 'typography', 'textColumns' ),
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'textDecoration' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'property_keys' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => 'text-decoration',
</span></span></pre></div>
<a id="trunktestsphpunittestsstyleenginestyleEnginephp"></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/style-engine/styleEngine.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/style-engine/styleEngine.php 2023-06-22 07:52:24 UTC (rev 55984)
+++ trunk/tests/phpunit/tests/style-engine/styleEngine.php 2023-06-22 08:16:05 UTC (rev 55985)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,6 +25,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Tests generating block styles and classnames based on various manifestations of the $block_styles argument.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 56467
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 58549
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_style_engine_get_styles
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,6 +190,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'fontStyle' => 'italic',
</span><span class="cx" style="display: block; padding: 0 10px"> 'fontWeight' => '800',
</span><span class="cx" style="display: block; padding: 0 10px"> 'lineHeight' => '1.3',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'textColumns' => '2',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'textDecoration' => 'underline',
</span><span class="cx" style="display: block; padding: 0 10px"> 'textTransform' => 'uppercase',
</span><span class="cx" style="display: block; padding: 0 10px"> 'letterSpacing' => '2',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -196,7 +198,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'options' => null,
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected_output' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'css' => 'font-size:clamp(2em, 2vw, 4em);font-family:Roboto,Oxygen-Sans,Ubuntu,sans-serif;font-style:italic;font-weight:800;line-height:1.3;text-decoration:underline;text-transform:uppercase;letter-spacing:2;',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'css' => 'font-size:clamp(2em, 2vw, 4em);font-family:Roboto,Oxygen-Sans,Ubuntu,sans-serif;font-style:italic;font-weight:800;line-height:1.3;column-count:2;text-decoration:underline;text-transform:uppercase;letter-spacing:2;',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'declarations' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'font-size' => 'clamp(2em, 2vw, 4em)',
</span><span class="cx" style="display: block; padding: 0 10px"> 'font-family' => 'Roboto,Oxygen-Sans,Ubuntu,sans-serif',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -203,6 +205,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'font-style' => 'italic',
</span><span class="cx" style="display: block; padding: 0 10px"> 'font-weight' => '800',
</span><span class="cx" style="display: block; padding: 0 10px"> 'line-height' => '1.3',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'column-count' => '2',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'text-decoration' => 'underline',
</span><span class="cx" style="display: block; padding: 0 10px"> 'text-transform' => 'uppercase',
</span><span class="cx" style="display: block; padding: 0 10px"> 'letter-spacing' => '2',
</span></span></pre></div>
<a id="trunktestsphpunitteststhemewpThemeJsonphp"></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/wpThemeJson.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/theme/wpThemeJson.php 2023-06-22 07:52:24 UTC (rev 55984)
+++ trunk/tests/phpunit/tests/theme/wpThemeJson.php 2023-06-22 08:16:05 UTC (rev 55985)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -476,6 +476,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 53175
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 54336
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 56611
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 58549
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_stylesheet() {
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_json = new WP_Theme_JSON(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -548,7 +549,7 @@
</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"> 'blocks' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'core/group' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'core/group' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'color' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'gradient' => 'var:preset|gradient|custom-gradient',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -566,7 +567,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'padding' => '24px',
</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">- 'core/heading' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'core/heading' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'color' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'text' => '#123456',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -582,7 +583,7 @@
</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">- 'core/post-date' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'core/post-date' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'color' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'text' => '#123456',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -595,7 +596,12 @@
</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">- 'core/image' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'core/post-excerpt' => array(
+ 'typography' => array(
+ 'textColumns' => 2,
+ ),
+ ),
+ 'core/image' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'border' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'radius' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'topLeft' => '10px',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -621,7 +627,7 @@
</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"> $variables = "body{--wp--preset--color--grey: grey;--wp--preset--gradient--custom-gradient: linear-gradient(135deg,rgba(0,0,0) 0%,rgb(0,0,0) 100%);--wp--preset--duotone--custom-duotone: url('#wp-duotone-custom-duotone');--wp--preset--font-family--small: 14px;--wp--preset--font-family--big: 41px;}.wp-block-group{--wp--custom--base-font: 16;--wp--custom--line-height--small: 1.2;--wp--custom--line-height--medium: 1.4;--wp--custom--line-height--large: 1.8;}";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $styles = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }body{color: var(--wp--preset--color--grey);}a:where(:not(.wp-element-button)){background-color: #333;color: #111;}.wp-element-button, .wp-block-button__link{box-shadow: 10px 10px 5px 0px rgba(0,0,0,0.66);}.wp-block-group{background: var(--wp--preset--gradient--custom-gradient);border-radius: 10px;padding: 24px;}.wp-block-group a:where(:not(.wp-element-button)){color: #111;}.wp-block-heading{color: #123456;}.wp-block-heading a:where(:not(.wp-element-button)){background-color: #333;color: #111;font-size: 60px;}.wp-block-post-date{color: #123456;}.wp-block-post-date a:where(:not(.wp-element-button)){background-color: #777;co
lor: #555;}.wp-block-image{margin-bottom: 30px;}.wp-block-image img, .wp-block-image .components-placeholder{filter: var(--wp--preset--duotone--custom-duotone);}.wp-block-image img, .wp-block-image .wp-block-image__crop-area{border-top-left-radius: 10px;border-bottom-right-radius: 1em;}';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $styles = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }body{color: var(--wp--preset--color--grey);}a:where(:not(.wp-element-button)){background-color: #333;color: #111;}.wp-element-button, .wp-block-button__link{box-shadow: 10px 10px 5px 0px rgba(0,0,0,0.66);}.wp-block-group{background: var(--wp--preset--gradient--custom-gradient);border-radius: 10px;padding: 24px;}.wp-block-group a:where(:not(.wp-element-button)){color: #111;}.wp-block-heading{color: #123456;}.wp-block-heading a:where(:not(.wp-element-button)){background-color: #333;color: #111;font-size: 60px;}.wp-block-post-date{color: #123456;}.wp-block-post-date a:where(:not(.wp-element-button)){background-color: #777;col
or: #555;}.wp-block-post-excerpt{column-count: 2;}.wp-block-image{margin-bottom: 30px;}.wp-block-image img, .wp-block-image .components-placeholder{filter: var(--wp--preset--duotone--custom-duotone);}.wp-block-image img, .wp-block-image .wp-block-image__crop-area{border-top-left-radius: 10px;border-bottom-right-radius: 1em;}';
</ins><span class="cx" style="display: block; padding: 0 10px"> $presets = '.has-grey-color{color: var(--wp--preset--color--grey) !important;}.has-grey-background-color{background-color: var(--wp--preset--color--grey) !important;}.has-grey-border-color{border-color: var(--wp--preset--color--grey) !important;}.has-custom-gradient-gradient-background{background: var(--wp--preset--gradient--custom-gradient) !important;}.has-small-font-family{font-family: var(--wp--preset--font-family--small) !important;}.has-big-font-family{font-family: var(--wp--preset--font-family--big) !important;}';
</span><span class="cx" style="display: block; padding: 0 10px"> $all = $variables . $styles . $presets;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $all, $theme_json->get_stylesheet() );
</span></span></pre>
</div>
</div>
</body>
</html>