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

Timestamp:

06/04/2024 05:34:12 AM (12 months ago)

Author:

ellatrix

Message:

Editor: add textAlign block support.

See ​https://github.com/WordPress/gutenberg/pull/59531.
See ​https://github.com/WordPress/gutenberg/pull/61182.
See ​https://github.com/WordPress/gutenberg/pull/61717.
See ​https://github.com/WordPress/wordpress-develop/pull/6590.

Fixes #61256.

Props wildworks, ellatrix.

File:

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

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

@@ -32 +32 @@
     $has_letter_spacing_support  = isset( $typography_supports['__experimentalLetterSpacing'] ) ? $typography_supports['__experimentalLetterSpacing'] : false;
     $has_line_height_support     = isset( $typography_supports['lineHeight'] ) ? $typography_supports['lineHeight'] : false;
+    $has_text_align_support      = isset( $typography_supports['textAlign'] ) ? $typography_supports['textAlign'] : false;
     $has_text_columns_support    = isset( $typography_supports['textColumns'] ) ? $typography_supports['textColumns'] : false;
     $has_text_decoration_support = isset( $typography_supports['__experimentalTextDecoration'] ) ? $typography_supports['__experimentalTextDecoration'] : false;
@@ -43 +44 @@
         || $has_letter_spacing_support
         || $has_line_height_support
+        || $has_text_align_support
         || $has_text_columns_support
         || $has_text_decoration_support
@@ -107 +109 @@
     $has_letter_spacing_support  = isset( $typography_supports['__experimentalLetterSpacing'] ) ? $typography_supports['__experimentalLetterSpacing'] : false;
     $has_line_height_support     = isset( $typography_supports['lineHeight'] ) ? $typography_supports['lineHeight'] : false;
+    $has_text_align_support      = isset( $typography_supports['textAlign'] ) ? $typography_supports['textAlign'] : false;
     $has_text_columns_support    = isset( $typography_supports['textColumns'] ) ? $typography_supports['textColumns'] : false;
     $has_text_decoration_support = isset( $typography_supports['__experimentalTextDecoration'] ) ? $typography_supports['__experimentalTextDecoration'] : false;
@@ -118 +121 @@
     $should_skip_font_weight     = wp_should_skip_block_supports_serialization( $block_type, 'typography', 'fontWeight' );
     $should_skip_line_height     = wp_should_skip_block_supports_serialization( $block_type, 'typography', 'lineHeight' );
+    $should_skip_text_align      = wp_should_skip_block_supports_serialization( $block_type, 'typography', 'textAlign' );
     $should_skip_text_columns    = wp_should_skip_block_supports_serialization( $block_type, 'typography', 'textColumns' );
     $should_skip_text_decoration = wp_should_skip_block_supports_serialization( $block_type, 'typography', 'textDecoration' );
@@ -177 +181 @@
     }
 
+    if ( $has_text_align_support && ! $should_skip_text_align ) {
+        $typography_block_styles['textAlign'] = isset( $block_attributes['style']['typography']['textAlign'] )
+            ? $block_attributes['style']['typography']['textAlign']
+            : null;
+    }
+
     if ( $has_text_columns_support && ! $should_skip_text_columns && isset( $block_attributes['style']['typography']['textColumns'] ) ) {
         $typography_block_styles['textColumns'] = isset( $block_attributes['style']['typography']['textColumns'] )
@@ -226 +236 @@
 
     $attributes = array();
+    $classnames = array();
     $styles     = wp_style_engine_get_styles(
         array( 'typography' => $typography_block_styles ),
@@ -232 +243 @@
 
     if ( ! empty( $styles['classnames'] ) ) {
-        $attributes['class'] = $styles['classnames'];
+        $classnames[] = $styles['classnames'];
+    }
+
+    if ( $has_text_align_support && ! $should_skip_text_align && isset( $block_attributes['style']['typography']['textAlign'] ) ) {
+        $classnames[] = 'has-text-align-' . $block_attributes['style']['typography']['textAlign'];
+    }
+
+    if ( ! empty( $classnames ) ) {
+        $attributes['class'] = implode( ' ', $classnames );
     }