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

Timestamp:

05/21/2021 10:12:42 AM (5 years ago)

Author:

youknowriad

Message:

Block Editor: Updated the WordPress packages from Gutenberg 10.7.0 RC.

This also includes:

• The removal of the Post Author block.
• Renaming build_query_vars_from_query_block function.
• Update the block supports.

Props gziolo.
See #52991.
-This line, and those below, will be ignored--

M package-lock.json
M package.json
M src/wp-includes/assets/script-loader-packages.php
M src/wp-includes/block-supports/colors.php
AM src/wp-includes/block-supports/elements.php
D src/wp-includes/block-supports/padding.php
AM src/wp-includes/block-supports/spacing.php
M src/wp-includes/block-supports/typography.php
M src/wp-includes/blocks/column/block.json
M src/wp-includes/blocks/index.php
D src/wp-includes/blocks/post-author
D src/wp-includes/blocks/post-author.php
M src/wp-includes/blocks/post-content.php
M src/wp-includes/blocks/post-featured-image.php
M src/wp-includes/blocks/query/block.json
M src/wp-includes/blocks/query-loop/block.json
M src/wp-includes/blocks/query-loop.php
M src/wp-includes/blocks/query-pagination/block.json
M src/wp-includes/blocks/query-pagination-next.php
M src/wp-includes/blocks/query-pagination-numbers.php
M src/wp-includes/blocks/site-tagline/block.json
M src/wp-includes/blocks/site-title/block.json
M src/wp-includes/blocks.php
M src/wp-settings.php
M tests/phpunit/tests/blocks/block.php
M tools/webpack/packages.js

File:

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

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

@@ -69 +69 @@
     }
 
-    $classes = array();
-    $styles  = array();
+    $attributes = array();
+    $classes    = array();
+    $styles     = array();
 
     $has_font_family_support     = _wp_array_get( $block_type->supports, array( '__experimentalFontFamily' ), false );
@@ -82 +83 @@
     $skip_font_size_support_serialization = _wp_array_get( $block_type->supports, array( '__experimentalSkipFontSizeSerialization' ), false );
 
+    // Covers all typography features _except_ font size.
+    $skip_typography_serialization = _wp_array_get( $block_type->supports, array( '__experimentalSkipTypographySerialization' ), false );
+
     // Font Size.
     if ( $has_font_size_support && ! $skip_font_size_support_serialization ) {
@@ -96 +100 @@
 
     // Font Family.
-    if ( $has_font_family_support ) {
+    if ( $has_font_family_support && ! $skip_typography_serialization ) {
         $has_font_family = isset( $block_attributes['style']['typography']['fontFamily'] );
         // Apply required class and style.
@@ -107 +111 @@
                 $styles[]         = sprintf( 'font-family: var(--wp--preset--font-family--%s);', $font_family_name );
             } else {
-                $styles[] = sprintf( 'font-family: %s;', $block_attributes['style']['color']['fontFamily'] );
+                $styles[] = sprintf( 'font-family: %s;', $block_attributes['style']['typography']['fontFamily'] );
             }
         }
@@ -113 +117 @@
 
     // Font style.
-    if ( $has_font_style_support ) {
+    if ( $has_font_style_support && ! $skip_typography_serialization ) {
         // Apply font style.
         $font_style = wp_typography_get_css_variable_inline_style( $block_attributes, 'fontStyle', 'font-style' );
@@ -122 +126 @@
 
     // Font weight.
-    if ( $has_font_weight_support ) {
+    if ( $has_font_weight_support && ! $skip_typography_serialization ) {
         // Apply font weight.
         $font_weight = wp_typography_get_css_variable_inline_style( $block_attributes, 'fontWeight', 'font-weight' );
@@ -131 +135 @@
 
     // Line Height.
-    if ( $has_line_height_support ) {
+    if ( $has_line_height_support && ! $skip_typography_serialization ) {
         $has_line_height = isset( $block_attributes['style']['typography']['lineHeight'] );
         // Add the style (no classes for line-height).
@@ -140 +144 @@
 
     // Text Decoration.
-    if ( $has_text_decoration_support ) {
+    if ( $has_text_decoration_support && ! $skip_typography_serialization ) {
         $text_decoration_style = wp_typography_get_css_variable_inline_style( $block_attributes, 'textDecoration', 'text-decoration' );
         if ( $text_decoration_style ) {
@@ -148 +152 @@
 
     // Text Transform.
-    if ( $has_text_transform_support ) {
+    if ( $has_text_transform_support && ! $skip_typography_serialization ) {
         $text_transform_style = wp_typography_get_css_variable_inline_style( $block_attributes, 'textTransform', 'text-transform' );
         if ( $text_transform_style ) {
@@ -155 +159 @@
     }
 
-    $attributes = array();
     if ( ! empty( $classes ) ) {
         $attributes['class'] = implode( ' ', $classes );