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

Timestamp:

11/09/2021 02:15:23 AM (3 years ago)

Author:

noisysocks

Message:

Add Site Editor and PHP changes from Gutenberg 10.1 - 11.9

• First pass at adding the site editor from the Gutenberg plugin to wp-admin/site-editor.php.
• Adds miscellaneous PHP changes from Gutenberg 10.1 - 11.9.

Follows [52042].
See #54337.
Props youknowriad, aristath, hellofromtonya, gziolo.

File:

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

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

@@ -29 +29 @@
     $has_font_style_support      = _wp_array_get( $typography_supports, array( '__experimentalFontStyle' ), false );
     $has_font_weight_support     = _wp_array_get( $typography_supports, array( '__experimentalFontWeight' ), false );
+    $has_letter_spacing_support  = _wp_array_get( $typography_supports, array( '__experimentalLetterSpacing' ), false );
     $has_line_height_support     = _wp_array_get( $typography_supports, array( 'lineHeight' ), false );
     $has_text_decoration_support = _wp_array_get( $typography_supports, array( '__experimentalTextDecoration' ), false );
@@ -37 +38 @@
         || $has_font_style_support
         || $has_font_weight_support
+        || $has_letter_spacing_support
         || $has_line_height_support
         || $has_text_decoration_support
@@ -94 +96 @@
     $has_font_style_support      = _wp_array_get( $typography_supports, array( '__experimentalFontStyle' ), false );
     $has_font_weight_support     = _wp_array_get( $typography_supports, array( '__experimentalFontWeight' ), false );
+    $has_letter_spacing_support  = _wp_array_get( $typography_supports, array( '__experimentalLetterSpacing' ), false );
     $has_line_height_support     = _wp_array_get( $typography_supports, array( 'lineHeight' ), false );
     $has_text_decoration_support = _wp_array_get( $typography_supports, array( '__experimentalTextDecoration' ), false );
@@ -103 +106 @@
 
         if ( $has_named_font_size ) {
-            $classes[] = sprintf( 'has-%s-font-size', $block_attributes['fontSize'] );
+            $classes[] = sprintf( 'has-%s-font-size', _wp_to_kebab_case( $block_attributes['fontSize'] ) );
         } elseif ( $has_custom_font_size ) {
             $styles[] = sprintf( 'font-size: %s;', $block_attributes['style']['typography']['fontSize'] );
@@ -110 +113 @@
 
     if ( $has_font_family_support ) {
-        $has_font_family = isset( $block_attributes['style']['typography']['fontFamily'] );
-        if ( $has_font_family ) {
-            $font_family = $block_attributes['style']['typography']['fontFamily'];
-            if ( strpos( $font_family, 'var:preset|font-family' ) !== false ) {
-                // Get the name from the string and add proper styles.
-                $index_to_splice  = strrpos( $font_family, '|' ) + 1;
-                $font_family_name = substr( $font_family, $index_to_splice );
-                $styles[]         = sprintf( 'font-family: var(--wp--preset--font-family--%s);', $font_family_name );
-            } else {
-                $styles[] = sprintf( 'font-family: %s;', $block_attributes['style']['typography']['fontFamily'] );
+        $has_named_font_family  = array_key_exists( 'fontFamily', $block_attributes );
+        $has_custom_font_family = isset( $block_attributes['style']['typography']['fontFamily'] );
+
+        if ( $has_named_font_family ) {
+            $classes[] = sprintf( 'has-%s-font-family', _wp_to_kebab_case( $block_attributes['fontFamily'] ) );
+        } elseif ( $has_custom_font_family ) {
+            // Before using classes, the value was serialized as a CSS Custom Property.
+            // We don't need this code path when it lands in core.
+            $font_family_custom = $block_attributes['style']['typography']['fontFamily'];
+            if ( strpos( $font_family_custom, 'var:preset|font-family' ) !== false ) {
+                $index_to_splice    = strrpos( $font_family_custom, '|' ) + 1;
+                $font_family_slug   = _wp_to_kebab_case( substr( $font_family_custom, $index_to_splice ) );
+                $font_family_custom = sprintf( 'var(--wp--preset--font-family--%s)', $font_family_slug );
             }
+            $styles[] = sprintf( 'font-family: %s;', $font_family_custom );
         }
     }
@@ -156 +163 @@
         if ( $text_transform_style ) {
             $styles[] = $text_transform_style;
+        }
+    }
+
+    if ( $has_letter_spacing_support ) {
+        $letter_spacing_style = wp_typography_get_css_variable_inline_style( $block_attributes, 'letterSpacing', 'letter-spacing' );
+        if ( $letter_spacing_style ) {
+            $styles[] = $letter_spacing_style;
         }
     }