Changeset 56737

Timestamp:

09/27/2023 06:59:01 PM (13 months ago)

Author:

costdev

Message:

Editor: Don't use fluid layout value in typography.

Changes fluid typography calculation to use fallback value if layout wide size is a fluid value.

Props ramonopoly, mukesh27, jastos, aurooba.
Merges [56503] to the 6.3 branch.
Fixes #58754.

Location:

branches/6.3

Files:

• . (modified) (1 prop)
• src/wp-includes/block-supports/typography.php (modified) (1 diff)
• tests/phpunit/data/themedir1/block-theme-child-with-fluid-layout (copied) (copied from trunk/tests/phpunit/data/themedir1/block-theme-child-with-fluid-layout)
• tests/phpunit/tests/block-supports/typography.php (modified) (1 diff)
• tests/phpunit/tests/theme/themeDir.php (modified) (1 diff)

branches/6.3/src/wp-includes/block-supports/typography.php

@@ -518 +518 @@
 
     // Defaults.
-    $default_maximum_viewport_width       = isset( $layout_settings['wideSize'] ) ? $layout_settings['wideSize'] : '1600px';
+    $default_maximum_viewport_width       = isset( $layout_settings['wideSize'] ) && ! empty( wp_get_typography_value_and_unit( $layout_settings['wideSize'] ) ) ? $layout_settings['wideSize'] : '1600px';
     $default_minimum_viewport_width       = '320px';
     $default_minimum_font_size_factor_max = 0.75;

branches/6.3/tests/phpunit/tests/block-supports/typography.php

@@ -700 +700 @@
                 'expected_output' => 'font-size:15px;',
             ),
+            'returns clamp value using default config if layout is fluid' => array(
+                'font_size_value' => '15px',
+                'theme_slug'      => 'block-theme-child-with-fluid-layout',
+                'expected_output' => 'font-size:clamp(14px, 0.875rem + ((1vw - 3.2px) * 0.078), 15px);',
+            ),
         );
     }

branches/6.3/tests/phpunit/tests/theme/themeDir.php

@@ -180 +180 @@
             'Block Theme Child Theme',
             'Block Theme Child with no theme.json',
+            'Block Theme Child Theme With Fluid Layout',
             'Block Theme Child Theme With Fluid Typography',
             'Block Theme Child Theme With Fluid Typography Config',