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

Timestamp:

06/20/2023 05:26:47 AM (23 months ago)

Author:

isabel_brison

Message:

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 #58522.

File:

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

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

@@ -369 +369 @@
  *
  * @since 6.1.0
+ * @since 6.3.0 Checks for unsupported min/max viewport values that cause invalid clamp values.
  * @access private
  *
@@ -434 +435 @@
     );
 
+    // Protects against unsupported units in min and max viewport widths.
+    if ( ! $minimum_viewport_width || ! $maximum_viewport_width ) {
+        return null;
+    }
+
     /*
      * Build CSS rule.
@@ -455 +461 @@
  * @since 6.1.1 Adjusted rules for min and max font sizes.
  * @since 6.2.0 Added 'settings.typography.fluid.minFontSize' support.
+ * @since 6.3.0 Using layout.wideSize as max viewport width.
  *
  * @param array $preset                     {
@@ -481 +488 @@
 
     // Checks if fluid font sizes are activated.
-    $typography_settings = wp_get_global_settings( array( 'typography' ) );
+    $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();
+
     if (
         isset( $typography_settings['fluid'] ) &&
@@ -498 +508 @@
 
     // Defaults.
-    $default_maximum_viewport_width   = '1600px';
+    $default_maximum_viewport_width   = isset( $layout_settings['wideSize'] ) ? $layout_settings['wideSize'] : '1600px';
     $default_minimum_viewport_width   = '768px';
     $default_minimum_font_size_factor = 0.75;