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

Timestamp:

04/05/2022 12:06:48 PM (3 years ago)

Author:

gziolo

Message:

Editor: Backport block support changes from the Gutenberg plugin

Migrate spacing, border, color, dimensions, elements and typography and associated tests for block supports in the block editor.

Related changes in Gutenberg:

• Include individual serialization changes from ​https://github.com/WordPress/gutenberg/commit/6de16981c7fef3db7cc4a9d6cfcb0ad85c916c62
• Skip Style Engine integration from ​https://github.com/WordPress/gutenberg/commit/44925a947fde29feaab512e0adf4291272209d59%60

Props ramonopoly, aaronrobertshaw.
See #55505.

File:

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

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

@@ -82 +82 @@
     }
 
-    $skip_typography_serialization = _wp_array_get( $typography_supports, array( '__experimentalSkipSerialization' ), false );
-    if ( $skip_typography_serialization ) {
+    if ( wp_should_skip_block_supports_serialization( $block_type, 'typography' ) ) {
         return array();
     }
@@ -100 +99 @@
     $has_text_transform_support  = _wp_array_get( $typography_supports, array( '__experimentalTextTransform' ), false );
 
-    if ( $has_font_size_support ) {
+    if ( $has_font_size_support && ! wp_should_skip_block_supports_serialization( $block_type, 'typography', 'fontSize' ) ) {
         $has_named_font_size  = array_key_exists( 'fontSize', $block_attributes );
         $has_custom_font_size = isset( $block_attributes['style']['typography']['fontSize'] );
@@ -111 +110 @@
     }
 
-    if ( $has_font_family_support ) {
+    if ( $has_font_family_support && ! wp_should_skip_block_supports_serialization( $block_type, 'typography', 'fontFamily' ) ) {
         $has_named_font_family  = array_key_exists( 'fontFamily', $block_attributes );
         $has_custom_font_family = isset( $block_attributes['style']['typography']['fontFamily'] );
@@ -130 +129 @@
     }
 
-    if ( $has_font_style_support ) {
+    if ( $has_font_style_support && ! wp_should_skip_block_supports_serialization( $block_type, 'typography', 'fontStyle' ) ) {
         $font_style = wp_typography_get_css_variable_inline_style( $block_attributes, 'fontStyle', 'font-style' );
         if ( $font_style ) {
@@ -137 +136 @@
     }
 
-    if ( $has_font_weight_support ) {
+    if ( $has_font_weight_support && ! wp_should_skip_block_supports_serialization( $block_type, 'typography', 'fontWeight' ) ) {
         $font_weight = wp_typography_get_css_variable_inline_style( $block_attributes, 'fontWeight', 'font-weight' );
         if ( $font_weight ) {
@@ -144 +143 @@
     }
 
-    if ( $has_line_height_support ) {
+    if ( $has_line_height_support && ! wp_should_skip_block_supports_serialization( $block_type, 'typography', 'lineHeight' ) ) {
         $has_line_height = isset( $block_attributes['style']['typography']['lineHeight'] );
         if ( $has_line_height ) {
@@ -151 +150 @@
     }
 
-    if ( $has_text_decoration_support ) {
+    if ( $has_text_decoration_support && ! wp_should_skip_block_supports_serialization( $block_type, 'typography', 'textDecoration' ) ) {
         $text_decoration_style = wp_typography_get_css_variable_inline_style( $block_attributes, 'textDecoration', 'text-decoration' );
         if ( $text_decoration_style ) {
@@ -158 +157 @@
     }
 
-    if ( $has_text_transform_support ) {
+    if ( $has_text_transform_support && ! wp_should_skip_block_supports_serialization( $block_type, 'typography', 'textTransform' ) ) {
         $text_transform_style = wp_typography_get_css_variable_inline_style( $block_attributes, 'textTransform', 'text-transform' );
         if ( $text_transform_style ) {
@@ -165 +164 @@
     }
 
-    if ( $has_letter_spacing_support ) {
+    if ( $has_letter_spacing_support && ! wp_should_skip_block_supports_serialization( $block_type, 'typography', 'letterSpacing' ) ) {
         $letter_spacing_style = wp_typography_get_css_variable_inline_style( $block_attributes, 'letterSpacing', 'letter-spacing' );
         if ( $letter_spacing_style ) {