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

Timestamp:

05/18/2024 11:16:09 PM (11 months ago)

Author:

isabel_brison

Message:

Editor: pass fluid typography theme.json settings to wp_get_typography_font_size_value.

Updates wp_get_typography_font_size_value to accept an array of theme.json settings instead of a boolean derived from global state.

Props ramonopoly, audrasjb.
Fixes #61118.

File:

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

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

@@ -499 +499 @@
  * @since 6.3.0 Using layout.wideSize as max viewport width, and logarithmic scale factor to calculate minimum font scale.
  * @since 6.4.0 Added configurable min and max viewport width values to the typography.fluid theme.json schema.
- *
- * @param array $preset                     {
+ * @since 6.6.0 Deprecated bool argument $should_use_fluid_typography.
+ *
+ * @param array      $preset   {
  *     Required. fontSizes preset value as seen in theme.json.
  *
@@ -507 +508 @@
  *     @type string|int|float $size CSS font-size value, including units if applicable.
  * }
- * @param bool  $should_use_fluid_typography An override to switch fluid typography "on". Can be used for unit testing.
- *                                           Default is false.
+ * @param bool|array $settings Optional Theme JSON settings array that overrides any global theme settings.
+ *                             Default is false.
  * @return string|null Font-size value or null if a size is not passed in $preset.
  */
-function wp_get_typography_font_size_value( $preset, $should_use_fluid_typography = false ) {
+
+
+function wp_get_typography_font_size_value( $preset, $settings = array() ) {
     if ( ! isset( $preset['size'] ) ) {
         return null;
@@ -524 +527 @@
     }
 
-    // Checks if fluid font sizes are activated.
-    $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'] ) &&
-        ( true === $typography_settings['fluid'] || is_array( $typography_settings['fluid'] ) )
-    ) {
-        $should_use_fluid_typography = true;
-    }
+    /*
+     * As a boolean (deprecated since 6.6), $settings acts as an override to switch fluid typography "on" (`true`) or "off" (`false`).
+     */
+    if ( is_bool( $settings ) ) {
+        _deprecated_argument( __FUNCTION__, '6.6.0', __( '`boolean` type for second argument `$settings` is deprecated. Use `array()` instead.' ) );
+        $settings = array(
+            'typography' => array(
+                'fluid' => $settings,
+            ),
+        );
+    }
+
+    // Fallback to global settings as default.
+    $global_settings             = wp_get_global_settings();
+    $settings                    = wp_parse_args(
+        $settings,
+        $global_settings
+    );
+
+    $typography_settings         = isset( $settings['typography'] ) ? $settings['typography'] : array();
+    $should_use_fluid_typography = ! empty( $typography_settings['fluid'] );
 
     if ( ! $should_use_fluid_typography ) {
@@ -540 +553 @@
     }
 
-    $fluid_settings = isset( $typography_settings['fluid'] ) && is_array( $typography_settings['fluid'] )
-        ? $typography_settings['fluid']
-        : array();
+    // $typography_settings['fluid'] can be a bool or an array. Normalize to array.
+    $fluid_settings  = is_array( $typography_settings['fluid'] ) ? $typography_settings['fluid'] : array();
+    $layout_settings = isset( $settings['layout'] ) ? $settings['layout'] : array();
 
     // Defaults.