Changeset 55133 for trunk/src/wp-includes/block-supports/typography.php

Timestamp:

01/24/2023 08:38:25 PM (2 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.

File:

• trunk/src/wp-includes/block-supports/typography.php (modified) (3 diffs)

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.