Changeset 58171 for trunk/src/wp-includes/class-wp-theme-json.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/class-wp-theme-json.php (modified) (4 diffs)

trunk/src/wp-includes/class-wp-theme-json.php

@@ -1832 +1832 @@
      *
      * @since 5.9.0
+     * @since 6.6.0 Passing $settings to the callbacks defined in static::PRESETS_METADATA.
      *
      * @param array    $settings        Settings to process.
@@ -1858 +1859 @@
                 ) {
                     $value_func = $preset_metadata['value_func'];
-                    $value      = call_user_func( $value_func, $preset );
+                    $value      = call_user_func( $value_func, $preset, $settings );
                 } else {
                     // If we don't have a value, then don't add it to the result.
@@ -2051 +2052 @@
      * @since 6.1.0 Added `$theme_json`, `$selector`, and `$use_root_padding` parameters.
      * @since 6.5.0 Output a `min-height: unset` rule when `aspect-ratio` is set.
+     * @since 6.6.0 Passing current theme JSON settings to wp_get_typography_font_size_value().
      *
      * @param array   $styles Styles to process.
@@ -2118 +2120 @@
                  * Values that already have a clamp() function will not pass the test,
                  * and therefore the original $value will be returned.
+                 * Pass the current theme_json settings to override any global settings.
                  */
-                $value = wp_get_typography_font_size_value( array( 'size' => $value ) );
+                $value = wp_get_typography_font_size_value( array( 'size' => $value ), $settings );
             }