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

Timestamp:

10/20/2020 01:33:02 PM (6 years ago)

Author:

youknowriad

Message:

Block Editor: Update the WordPress Packages to the latest version.

This includes the packages that match the Gutenberg 9.2 Release.
It is going to be the last block-editor features update for WordPress 5.6.
It also updates the block-supports code base to the latest APIs.

Props isabel_brison, noisysocks, desrosj.
Fixes #51570.

File:

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

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

@@ -9 +9 @@
  * Registers the style and typography block attributes for block types that support it.
  *
+ * @access private
+ *
  * @param WP_Block_Type $block_type Block Type.
  */
@@ -15 +17 @@
         if ( property_exists( $block_type, 'supports' ) ) {
                 $has_font_size_support = wp_array_get( $block_type->supports, array( '__experimentalFontSize' ), false );
-        }
-
-        $has_font_style_support = false;
-        if ( property_exists( $block_type, 'supports' ) ) {
-                $has_font_style_support = wp_array_get( $block_type->supports, array( '__experimentalFontStyle' ), false );
         }
 
@@ -31 +28 @@
         }
 
-        if ( ( $has_font_size_support || $has_font_style_support || $has_line_height_support ) && ! array_key_exists( 'style', $block_type->attributes ) ) {
+        if ( ( $has_font_size_support || $has_line_height_support ) && ! array_key_exists( 'style', $block_type->attributes ) ) {
                 $block_type->attributes['style'] = array(
                         'type' => 'object',
@@ -48 +45 @@
  * This will be applied to the block markup in the front-end.
  *
- * @param  array         $attributes       Comprehensive list of attributes to be applied.
+ * @access private
+ *
+ * @param  WP_Block_Type $block_type       Block type.
  * @param  array         $block_attributes Block attributes.
- * @param  WP_Block_Type $block_type       Block type.
  *
  * @return array Font size CSS classes and inline styles.
  */
-function wp_apply_typography_support( $attributes, $block_attributes, $block_type ) {
+function wp_apply_typography_support( $block_type, $block_attributes ) {
         $has_font_size_support = false;
+        $classes               = array();
+        $styles                = array();
         if ( property_exists( $block_type, 'supports' ) ) {
-                $has_font_size_support = wp_array_get( $block_type->supports, array( '__experimentalFontSize' ), false );
-        }
-
-        $has_font_style_support = false;
-        if ( property_exists( $block_type, 'supports' ) ) {
-                $has_font_style_support = wp_array_get( $block_type->supports, array( '__experimentalFontStyle' ), false );
+                $has_font_size_support = wp_array_get( $block_type->supports, array( 'fontSize' ), false );
         }
 
         $has_line_height_support = false;
         if ( property_exists( $block_type, 'supports' ) ) {
-                $has_line_height_support = wp_array_get( $block_type->supports, array( '__experimentalLineHeight' ), false );
+                $has_line_height_support = wp_array_get( $block_type->supports, array( 'lineHeight' ), false );
         }
 
@@ -77 +72 @@
                 // Apply required class or style.
                 if ( $has_named_font_size ) {
-                        $attributes['css_classes'][] = sprintf( 'has-%s-font-size', $block_attributes['fontSize'] );
+                        $classes[] = sprintf( 'has-%s-font-size', $block_attributes['fontSize'] );
                 } elseif ( $has_custom_font_size ) {
-                        $attributes['inline_styles'][] = sprintf( 'font-size: %spx;', $block_attributes['style']['typography']['fontSize'] );
-                }
-        }
-
-        // Font Styles e.g. bold, italic, underline & strikethrough.
-        if ( $has_font_style_support ) {
-                $has_font_styles = isset( $block_attributes['style']['typography']['fontStyles'] );
-
-                // Apply required CSS classes.
-                if ( $has_font_styles ) {
-                        $attributes['css_classes'][] = 'has-font-style';
-
-                        // CSS class names chosen to be more explicit than generic `has-<something>-font-style`.
-                        $font_style_classes = array(
-                                'bold'          => 'has-bold-font-weight',
-                                'italic'        => 'has-italic-font-style',
-                                'underline'     => 'has-underline-text-decoration',
-                                'strikethrough' => 'has-strikethrough-text-decoration',
-                        );
-
-                        $style_selections = $block_attributes['style']['typography']['fontStyles'];
-
-                        foreach ( $style_selections as $style => $turned_on ) {
-                                if ( $turned_on ) {
-                                        $attributes['css_classes'][] = $font_style_classes[ $style ];
-                                }
-                        }
+                        $styles[] = sprintf( 'font-size: %spx;', $block_attributes['style']['typography']['fontSize'] );
                 }
         }
@@ -114 +83 @@
                 // Add the style (no classes for line-height).
                 if ( $has_line_height ) {
-                        $attributes['inline_styles'][] = sprintf( 'line-height: %s;', $block_attributes['style']['typography']['lineHeight'] );
+                        $styles[] = sprintf( 'line-height: %s;', $block_attributes['style']['typography']['lineHeight'] );
                 }
+        }
+
+        $attributes = array();
+        if ( ! empty( $classes ) ) {
+                $attributes['class'] = implode( ' ', $classes );
+        }
+        if ( ! empty( $styles ) ) {
+                $attributes['style'] = implode( ' ', $styles );
         }
 
         return $attributes;
 }
+
+WP_Block_Supports::get_instance()->register(
+        'typography',
+        array(
+                'register_attribute' => 'wp_register_typography_support',
+                'apply'              => 'wp_apply_typography_support',
+        )
+);