Changeset 49226 for trunk/src/wp-includes/block-supports/colors.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/colors.php (modified) (7 diffs)

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

@@ -8 +8 @@
 /**
  * Registers the style and colors block attributes for block types that support it.
+ *
+ * @access private
  *
  * @param WP_Block_Type $block_type Block Type.
@@ -54 +56 @@
  * This will be applied to the block markup in the front-end.
  *
- * @param  array         $attributes       Comprehensive list of attributes to be applied.
- * @param  array         $block_attributes Block attributes.
+ * @access private
+ *
  * @param  WP_Block_Type $block_type       Block type.
+* @param  array         $block_attributes Block attributes.
  *
  * @return array Colors CSS classes and inline styles.
  */
-function wp_apply_colors_support( $attributes, $block_attributes, $block_type ) {
+function wp_apply_colors_support( $block_type, $block_attributes ) {
         $color_support                 = wp_array_get( $block_type->supports, array( '__experimentalColor' ), false );
         $has_text_colors_support       = true === $color_support || ( is_array( $color_support ) && wp_array_get( $color_support, array( 'text' ), true ) );
@@ -66 +69 @@
         $has_link_colors_support       = wp_array_get( $color_support, array( 'linkColor' ), false );
         $has_gradients_support         = wp_array_get( $color_support, array( 'gradients' ), false );
+        $classes                       = array();
+        $styles                        = array();
 
         // Text Colors.
@@ -75 +80 @@
                 // Apply required generic class.
                 if ( $has_custom_text_color || $has_named_text_color ) {
-                        $attributes['css_classes'][] = 'has-text-color';
+                        $classes[] = 'has-text-color';
                 }
                 // Apply color class or inline style.
                 if ( $has_named_text_color ) {
-                        $attributes['css_classes'][] = sprintf( 'has-%s-color', $block_attributes['textColor'] );
+                        $classes[] = sprintf( 'has-%s-color', $block_attributes['textColor'] );
                 } elseif ( $has_custom_text_color ) {
-                        $attributes['inline_styles'][] = sprintf( 'color: %s;', $block_attributes['style']['color']['text'] );
+                        $styles[] = sprintf( 'color: %s;', $block_attributes['style']['color']['text'] );
                 }
         }
@@ -90 +95 @@
                 // Apply required class and style.
                 if ( $has_link_color ) {
-                        $attributes['css_classes'][] = 'has-link-color';
+                        $classes[] = 'has-link-color';
                         // If link is a named color.
                         if ( strpos( $block_attributes['style']['color']['link'], 'var:preset|color|' ) !== false ) {
                                 // Get the name from the string and add proper styles.
-                                $index_to_splice               = strrpos( $block_attributes['style']['color']['link'], '|' ) + 1;
-                                $link_color_name               = substr( $block_attributes['style']['color']['link'], $index_to_splice );
-                                $attributes['inline_styles'][] = sprintf( '--wp--style--color--link:var(--wp--preset--color--%s);', $link_color_name );
+                                $index_to_splice = strrpos( $block_attributes['style']['color']['link'], '|' ) + 1;
+                                $link_color_name = substr( $block_attributes['style']['color']['link'], $index_to_splice );
+                                $styles[]        = sprintf( '--wp--style--color--link: var(--wp--preset--color--%s);', $link_color_name );
                         } else {
-                                $attributes['inline_styles'][] = sprintf( '--wp--style--color--link: %s;', $block_attributes['style']['color']['link'] );
+                                $styles[] = sprintf( '--wp--style--color--link: %s;', $block_attributes['style']['color']['link'] );
                         }
                 }
@@ -110 +115 @@
                 // Apply required background class.
                 if ( $has_custom_background_color || $has_named_background_color ) {
-                        $attributes['css_classes'][] = 'has-background';
+                        $classes[] = 'has-background';
                 }
                 // Apply background color classes or styles.
                 if ( $has_named_background_color ) {
-                        $attributes['css_classes'][] = sprintf( 'has-%s-background-color', $block_attributes['backgroundColor'] );
+                        $classes[] = sprintf( 'has-%s-background-color', $block_attributes['backgroundColor'] );
                 } elseif ( $has_custom_background_color ) {
-                        $attributes['inline_styles'][] = sprintf( 'background-color: %s;', $block_attributes['style']['color']['background'] );
+                        $styles[] = sprintf( 'background-color: %s;', $block_attributes['style']['color']['background'] );
                 }
         }
@@ -126 +131 @@
 
                 if ( $has_named_gradient || $has_custom_gradient ) {
-                        $attributes['css_classes'][] = 'has-background';
+                        $classes[] = 'has-background';
                 }
                 // Apply required background class.
                 if ( $has_named_gradient ) {
-                        $attributes['css_classes'][] = sprintf( 'has-%s-gradient-background', $block_attributes['gradient'] );
+                        $classes[] = sprintf( 'has-%s-gradient-background', $block_attributes['gradient'] );
                 } elseif ( $has_custom_gradient ) {
-                        $attributes['inline_styles'][] = sprintf( 'background: %s;', $block_attributes['style']['color']['gradient'] );
+                        $styles[] = sprintf( 'background: %s;', $block_attributes['style']['color']['gradient'] );
                 }
+        }
+
+        $attributes = array();
+        if ( ! empty( $classes ) ) {
+                $attributes['class'] = implode( ' ', $classes );
+        }
+        if ( ! empty( $styles ) ) {
+                $attributes['style'] = implode( ' ', $styles );
         }
 
         return $attributes;
 }
+
+// Register the block support.
+WP_Block_Supports::get_instance()->register(
+        'colors',
+        array(
+                'register_attribute' => 'wp_register_colors_support',
+                'apply'              => 'wp_apply_colors_support',
+        )
+);