Changeset 55133

Timestamp:

01/24/2023 08:38:25 PM (3 years ago)

Author:

hellofromTonya

Message:

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 ​Gutenberg PR 42489

Follow-up to [54497], [54260].

Props andrewserong, ramonopoly, hellofromTonya, joen.
Fixes #57529.

Location:

trunk

Files:

• src/wp-includes/block-supports/typography.php (modified) (3 diffs)
• tests/phpunit/data/themedir1/block-theme-child-with-fluid-typography-config (added)
• tests/phpunit/data/themedir1/block-theme-child-with-fluid-typography-config/style.css (added)
• tests/phpunit/data/themedir1/block-theme-child-with-fluid-typography-config/theme.json (added)
• tests/phpunit/tests/block-supports/typography.php (modified) (3 diffs)
• tests/phpunit/tests/theme/themeDir.php (modified) (1 diff)

trunk/src/wp-includes/block-supports/typography.php

@@ -454 +454 @@
  * @since 6.1.0
  * @since 6.1.1 Adjusted rules for min and max font sizes.
+ * @since 6.2.0 Added 'settings.typography.fluid.minFontSize' support.
  *
  * @param array $preset                     {
@@ -480 +481 @@
 
     // Checks if fluid font sizes are activated.
-    $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;
+    $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;
+    }
 
     if ( ! $should_use_fluid_typography ) {
         return $preset['size'];
     }
+
+    $fluid_settings = isset( $typography_settings['fluid'] ) && is_array( $typography_settings['fluid'] )
+        ? $typography_settings['fluid']
+        : array();
 
     // Defaults.
@@ -492 +502 @@
     $default_minimum_font_size_factor = 0.75;
     $default_scale_factor             = 1;
-    $default_minimum_font_size_limit  = '14px';
+    $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';
 
     // Font sizes.

trunk/tests/phpunit/tests/block-supports/typography.php

@@ -568 +568 @@
      * @ticket 56467
      * @ticket 57065
+     * @ticket 57529
      *
      * @covers ::wp_register_typography_support
@@ -573 +574 @@
      * @dataProvider data_generate_block_supports_font_size_fixtures
      *
-     * @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().
-     */
-    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' );
-        }
+     * @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().
+     */
+    public function test_should_covert_font_sizes_to_fluid_values( $font_size_value, $theme_slug, $expected_output ) {
+        switch_theme( $theme_slug );
 
         $this->test_block_name = 'test/font-size-fluid-value';
@@ -624 +621 @@
     public function data_generate_block_supports_font_size_fixtures() {
         return array(
-            'default_return_value'               => array(
-                'font_size_value'             => '50px',
-                'should_use_fluid_typography' => false,
-                'expected_output'             => 'font-size:50px;',
-            ),
-            '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);',
+            'returns value when fluid typography is not active' => array(
+                'font_size_value' => '15px',
+                'theme_slug'      => 'default',
+                'expected_output' => 'font-size:15px;',
+            ),
+            '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);',
+            ),
+            '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;',
             ),
         );

trunk/tests/phpunit/tests/theme/themeDir.php

@@ -181 +181 @@
             'Block Theme Child with no theme.json',
             'Block Theme Child Theme With Fluid Typography',
+            'Block Theme Child Theme With Fluid Typography Config',
             'Block Theme [0.4.0]',
             'Block Theme [1.0.0] in subdirectory',