<!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>[55946] trunk: Editor: use `layout.wideSize` as max viewport width.</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/55946">55946</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/55946","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-20 05:26:47 +0000 (Tue, 20 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: use `layout.wideSize` as max viewport width.
Use the value of `layout.wideSize` as the maximum viewport width for fluid font size calculations.
Props ramonopoly.
Fixes <a href="https://core.trac.wordpress.org/ticket/58522">#58522</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesblocksupportstypographyphp">trunk/src/wp-includes/block-supports/typography.php</a></li>
<li><a href="#trunktestsphpunitdatathemedir1blockthemechildwithfluidtypographyconfigthemejson">trunk/tests/phpunit/data/themedir1/block-theme-child-with-fluid-typography-config/theme.json</a></li>
<li><a href="#trunktestsphpunittestsblocksupportstypographyphp">trunk/tests/phpunit/tests/block-supports/typography.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-20 04:57:27 UTC (rev 55945)
+++ trunk/src/wp-includes/block-supports/typography.php 2023-06-20 05:26:47 UTC (rev 55946)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -368,6 +368,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * width and min/max font sizes.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</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 Checks for unsupported min/max viewport values that cause invalid clamp values.
</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 array $args {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -433,6 +434,11 @@
</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">+ // Protects against unsupported units in min and max viewport widths.
+ if ( ! $minimum_viewport_width || ! $maximum_viewport_width ) {
+ return null;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Build CSS rule.
</span><span class="cx" style="display: block; padding: 0 10px"> * Borrowed from https://websemantics.uk/tools/responsive-font-calculator/.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -454,6 +460,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.1.1 Adjusted rules for min and max font sizes.
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.2.0 Added 'settings.typography.fluid.minFontSize' support.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 6.3.0 Using layout.wideSize as max viewport width.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $preset {
</span><span class="cx" style="display: block; padding: 0 10px"> * Required. fontSizes preset value as seen in theme.json.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -480,7 +487,10 @@
</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"> // Checks if fluid font sizes are activated.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $typography_settings = wp_get_global_settings( array( 'typography' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $global_settings = wp_get_global_settings();
+ $typography_settings = isset( $global_settings['typography'] ) ? $global_settings['typography'] : array();
+ $layout_settings = isset( $global_settings['layout'] ) ? $global_settings['layout'] : array();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if (
</span><span class="cx" style="display: block; padding: 0 10px"> isset( $typography_settings['fluid'] ) &&
</span><span class="cx" style="display: block; padding: 0 10px"> ( true === $typography_settings['fluid'] || is_array( $typography_settings['fluid'] ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -497,7 +507,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> : array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Defaults.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $default_maximum_viewport_width = '1600px';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $default_maximum_viewport_width = isset( $layout_settings['wideSize'] ) ? $layout_settings['wideSize'] : '1600px';
</ins><span class="cx" style="display: block; padding: 0 10px"> $default_minimum_viewport_width = '768px';
</span><span class="cx" style="display: block; padding: 0 10px"> $default_minimum_font_size_factor = 0.75;
</span><span class="cx" style="display: block; padding: 0 10px"> $default_scale_factor = 1;
</span></span></pre></div>
<a id="trunktestsphpunitdatathemedir1blockthemechildwithfluidtypographyconfigthemejson"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/data/themedir1/block-theme-child-with-fluid-typography-config/theme.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/themedir1/block-theme-child-with-fluid-typography-config/theme.json 2023-06-20 04:57:27 UTC (rev 55945)
+++ trunk/tests/phpunit/data/themedir1/block-theme-child-with-fluid-typography-config/theme.json 2023-06-20 05:26:47 UTC (rev 55946)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,6 +2,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "version": 2,
</span><span class="cx" style="display: block; padding: 0 10px"> "settings": {
</span><span class="cx" style="display: block; padding: 0 10px"> "appearanceTools": true,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "layout": {
+ "wideSize": "1000px"
+ },
</ins><span class="cx" style="display: block; padding: 0 10px"> "typography": {
</span><span class="cx" style="display: block; padding: 0 10px"> "fluid": {
</span><span class="cx" style="display: block; padding: 0 10px"> "minFontSize": "16px"
</span></span></pre></div>
<a id="trunktestsphpunittestsblocksupportstypographyphp"></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/typography.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/block-supports/typography.php 2023-06-20 04:57:27 UTC (rev 55945)
+++ trunk/tests/phpunit/tests/block-supports/typography.php 2023-06-20 05:26:47 UTC (rev 55946)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -568,6 +568,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 56467
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 57065
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 57529
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 58522
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_register_typography_support
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -638,7 +639,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'returns clamp value using custom fluid config' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'font_size_value' => '17px',
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme_slug' => 'block-theme-child-with-fluid-typography-config',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'expected_output' => 'font-size:clamp(16px, 1rem + ((1vw - 7.68px) * 0.12), 17px);',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'expected_output' => 'font-size:clamp(16px, 1rem + ((1vw - 7.68px) * 0.431), 17px);',
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'returns value when font size <= custom min font size bound' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'font_size_value' => '15px',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -847,4 +848,90 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'size: array' => array( array( '10' ) ),
</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">+
+ /**
+ * Tests computed font size values.
+ *
+ * @ticket 58522
+ *
+ * @covers ::wp_get_computed_fluid_typography_value
+ *
+ * @dataProvider data_wp_get_computed_fluid_typography_value
+ *
+ * @param array $args {
+ * Optional. An associative array of values to calculate a fluid formula for font size. Default is empty array.
+ *
+ * @type string $maximum_viewport_width Maximum size up to which type will have fluidity.
+ * @type string $minimum_viewport_width Minimum viewport size from which type will have fluidity.
+ * @type string $maximum_font_size Maximum font size for any clamp() calculation.
+ * @type string $minimum_font_size Minimum font size for any clamp() calculation.
+ * @type int $scale_factor A scale factor to determine how fast a font scales within boundaries.
+ * }
+ * @param string $expected_output Expected value of style property from gutenberg_apply_typography_support().
+ */
+ public function test_wp_get_computed_fluid_typography_value( $args, $expected_output ) {
+ $actual = wp_get_computed_fluid_typography_value( $args );
+ $this->assertSame( $expected_output, $actual );
+ }
+
+ /**
+ * Data provider.
+ *
+ * @return array
+ */
+ public function data_wp_get_computed_fluid_typography_value() {
+ return array(
+ 'returns clamped value with valid args' => array(
+ 'args' => array(
+ 'minimum_viewport_width' => '320px',
+ 'maximum_viewport_width' => '1000px',
+ 'minimum_font_size' => '50px',
+ 'maximum_font_size' => '100px',
+ 'scale_factor' => 1,
+ ),
+ 'expected_output' => 'clamp(50px, 3.125rem + ((1vw - 3.2px) * 7.353), 100px)',
+ ),
+ 'returns `null` when `maximum_viewport_width` is an unsupported unit' => array(
+ 'args' => array(
+ 'minimum_viewport_width' => '320px',
+ 'maximum_viewport_width' => 'calc(100% - 60px)',
+ 'minimum_font_size' => '50px',
+ 'maximum_font_size' => '100px',
+ 'scale_factor' => 1,
+ ),
+ 'expected_output' => null,
+ ),
+ 'returns `null` when `minimum_viewport_width` is an unsupported unit' => array(
+ 'args' => array(
+ 'minimum_viewport_width' => 'calc(100% - 60px)',
+ 'maximum_viewport_width' => '1000px',
+ 'minimum_font_size' => '50px',
+ 'maximum_font_size' => '100px',
+ 'scale_factor' => 1,
+ ),
+ 'expected_output' => null,
+ ),
+ 'returns `null` when `minimum_font_size` is an unsupported unit' => array(
+ 'args' => array(
+ 'minimum_viewport_width' => '320em',
+ 'maximum_viewport_width' => '1000em',
+ 'minimum_font_size' => '10vw',
+ 'maximum_font_size' => '100em',
+ 'scale_factor' => 1,
+ ),
+ 'expected_output' => null,
+ ),
+ 'returns `null` when `maximum_font_size` is an unsupported unit' => array(
+ 'args' => array(
+ 'minimum_viewport_width' => '320em',
+ 'maximum_viewport_width' => '1000em',
+ 'minimum_font_size' => '50px',
+ 'maximum_font_size' => '100%',
+ 'scale_factor' => 1,
+ ),
+ 'expected_output' => null,
+ ),
+ );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins></span></pre>
</div>
</div>
</body>
</html>