<!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>[55133] trunk: Editor: Adds 'settings.typography.fluid.minFontSize' support to wp_get_typography_font_size_value().</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/55133">55133</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/55133","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>hellofromTonya</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-01-24 20:38:25 +0000 (Tue, 24 Jan 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: Adds 'settings.typography.fluid.minFontSize' support to wp_get_typography_font_size_value().
In `wp_get_typography_font_size_value()`, adds support for using a minimum font size for fluid typography when defined in a theme's `theme.json` file.
Reference:
* Part of [https://github.com/WordPress/gutenberg/pull/42489 Gutenberg PR 42489]
Follow-up to <a href="https://core.trac.wordpress.org/changeset/54497">[54497]</a>, <a href="https://core.trac.wordpress.org/changeset/54260">[54260]</a>.
Props andrewserong, ramonopoly, hellofromTonya, joen.
Fixes <a href="https://core.trac.wordpress.org/ticket/57529">#57529</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesblocksupportstypographyphp">trunk/src/wp-includes/block-supports/typography.php</a></li>
<li><a href="#trunktestsphpunittestsblocksupportstypographyphp">trunk/tests/phpunit/tests/block-supports/typography.php</a></li>
<li><a href="#trunktestsphpunitteststhemethemeDirphp">trunk/tests/phpunit/tests/theme/themeDir.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/tests/phpunit/data/themedir1/block-theme-child-with-fluid-typography-config/</li>
<li><a href="#trunktestsphpunitdatathemedir1blockthemechildwithfluidtypographyconfigstylecss">trunk/tests/phpunit/data/themedir1/block-theme-child-with-fluid-typography-config/style.css</a></li>
<li><a href="#trunktestsphpunitdatathemedir1blockthemechildwithfluidtypographyconfigthemejson">trunk/tests/phpunit/data/themedir1/block-theme-child-with-fluid-typography-config/theme.json</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-01-24 16:52:42 UTC (rev 55132)
+++ trunk/src/wp-includes/block-supports/typography.php 2023-01-24 20:38:25 UTC (rev 55133)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -453,6 +453,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> * @since 6.1.1 Adjusted rules for min and max font sizes.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 6.2.0 Added 'settings.typography.fluid.minFontSize' support.
</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">@@ -479,19 +480,29 @@
</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' ) );
- $should_use_fluid_typography = isset( $typography_settings['fluid'] ) && true === $typography_settings['fluid'] ? true : $should_use_fluid_typography;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $typography_settings = wp_get_global_settings( array( 'typography' ) );
+ if (
+ isset( $typography_settings['fluid'] ) &&
+ ( true === $typography_settings['fluid'] || is_array( $typography_settings['fluid'] ) )
+ ) {
+ $should_use_fluid_typography = true;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $should_use_fluid_typography ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $preset['size'];
</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">+ $fluid_settings = isset( $typography_settings['fluid'] ) && is_array( $typography_settings['fluid'] )
+ ? $typography_settings['fluid']
+ : array();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Defaults.
</span><span class="cx" style="display: block; padding: 0 10px"> $default_maximum_viewport_width = '1600px';
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $default_minimum_font_size_limit = '14px';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $has_min_font_size = isset( $fluid_settings['minFontSize'] ) && ! empty( wp_get_typography_value_and_unit( $fluid_settings['minFontSize'] ) );
+ $default_minimum_font_size_limit = $has_min_font_size ? $fluid_settings['minFontSize'] : '14px';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Font sizes.
</span><span class="cx" style="display: block; padding: 0 10px"> $fluid_font_size_settings = isset( $preset['fluid'] ) ? $preset['fluid'] : null;
</span></span></pre></div>
<a id="trunktestsphpunitdatathemedir1blockthemechildwithfluidtypographyconfigstylecss"></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-child-with-fluid-typography-config/style.css</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/style.css (rev 0)
+++ trunk/tests/phpunit/data/themedir1/block-theme-child-with-fluid-typography-config/style.css 2023-01-24 20:38:25 UTC (rev 55133)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,8 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/*
+Theme Name: Block Theme Child Theme With Fluid Typography Config
+Theme URI: https://wordpress.org/
+Description: For testing purposes only.
+Template: block-theme
+Version: 1.0.0
+Text Domain: block-theme-child-with-fluid-typography
+*/
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/data/themedir1/block-theme-child-with-fluid-typography-config/style.css
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunktestsphpunitdatathemedir1blockthemechildwithfluidtypographyconfigthemejson"></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-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 (rev 0)
+++ trunk/tests/phpunit/data/themedir1/block-theme-child-with-fluid-typography-config/theme.json 2023-01-24 20:38:25 UTC (rev 55133)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,11 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+{
+ "version": 2,
+ "settings": {
+ "appearanceTools": true,
+ "typography": {
+ "fluid": {
+ "minFontSize": "16px"
+ }
+ }
+ }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/data/themedir1/block-theme-child-with-fluid-typography-config/theme.json
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><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-01-24 16:52:42 UTC (rev 55132)
+++ trunk/tests/phpunit/tests/block-supports/typography.php 2023-01-24 20:38:25 UTC (rev 55133)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -567,21 +567,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 57529
</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="cx" style="display: block; padding: 0 10px"> * @dataProvider data_generate_block_supports_font_size_fixtures
</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 string $font_size_value The block supports custom font size value.
- * @param bool $should_use_fluid_typography An override to switch fluid typography "on". Can be used for unit testing.
- * @param string $expected_output Expected value of style property from wp_apply_typography_support().
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $font_size_value The block supports custom font size value.
+ * @param string $theme_slug A theme slug corresponding to an available test theme.
+ * @param string $expected_output Expected value of style property from wp_apply_typography_support().
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_should_covert_font_sizes_to_fluid_values( $font_size_value, $should_use_fluid_typography, $expected_output ) {
- if ( $should_use_fluid_typography ) {
- switch_theme( 'block-theme-child-with-fluid-typography' );
- } else {
- switch_theme( 'default' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_should_covert_font_sizes_to_fluid_values( $font_size_value, $theme_slug, $expected_output ) {
+ switch_theme( $theme_slug );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->test_block_name = 'test/font-size-fluid-value';
</span><span class="cx" style="display: block; padding: 0 10px"> register_block_type(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -623,16 +620,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function data_generate_block_supports_font_size_fixtures() {
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'default_return_value' => array(
- 'font_size_value' => '50px',
- 'should_use_fluid_typography' => false,
- 'expected_output' => 'font-size:50px;',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'returns value when fluid typography is not active' => array(
+ 'font_size_value' => '15px',
+ 'theme_slug' => 'default',
+ 'expected_output' => 'font-size:15px;',
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'return_value_with_fluid_typography' => array(
- 'font_size_value' => '50px',
- 'should_use_fluid_typography' => true,
- 'expected_output' => 'font-size:clamp(37.5px, 2.344rem + ((1vw - 7.68px) * 1.502), 50px);',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'returns clamp value using default config' => array(
+ 'font_size_value' => '15px',
+ 'theme_slug' => 'block-theme-child-with-fluid-typography',
+ 'expected_output' => 'font-size:clamp(14px, 0.875rem + ((1vw - 7.68px) * 0.12), 15px);',
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'returns value when font size <= default min font size bound' => array(
+ 'font_size_value' => '13px',
+ 'theme_slug' => 'block-theme-child-with-fluid-typography',
+ 'expected_output' => 'font-size:13px;',
+ ),
+ 'returns clamp value using custom fluid config' => array(
+ 'font_size_value' => '17px',
+ 'theme_slug' => 'block-theme-child-with-fluid-typography-config',
+ 'expected_output' => 'font-size:clamp(16px, 1rem + ((1vw - 7.68px) * 0.12), 17px);',
+ ),
+ 'returns value when font size <= custom min font size bound' => array(
+ 'font_size_value' => '15px',
+ 'theme_slug' => 'block-theme-child-with-fluid-typography-config',
+ 'expected_output' => 'font-size:15px;',
+ ),
</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>
<a id="trunktestsphpunitteststhemethemeDirphp"></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/themeDir.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/theme/themeDir.php 2023-01-24 16:52:42 UTC (rev 55132)
+++ trunk/tests/phpunit/tests/theme/themeDir.php 2023-01-24 20:38:25 UTC (rev 55133)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,6 +180,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'Block Theme Child Theme',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Block Theme Child with no theme.json',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Block Theme Child Theme With Fluid Typography',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Block Theme Child Theme With Fluid Typography Config',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'Block Theme [0.4.0]',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Block Theme [1.0.0] in subdirectory',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Block Theme Deprecated Path',
</span></span></pre>
</div>
</div>
</body>
</html>