Changeset 54211 for trunk/src/wp-includes/block-supports/elements.php

Timestamp:

09/19/2022 08:12:02 PM (3 years ago)

Author:

audrasjb

Message:

Editor: Backport block supports (border, color, elements, spacing) from Gutenberg to WP 6.1.

This changeset backports border, color, elements and spacing block supports changes from Gutenberg to WP 6.1.

See tracking issue on Gutenberg repository: ​gutenberg#43440.

Props ramonopoly, glendaviesnz, bernhard-reiter, audrasjb, costdev.
See #56467.

File:

• trunk/src/wp-includes/block-supports/elements.php (modified) (2 diffs)

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

@@ -90 +90 @@
  *
  * @since 6.0.0
+ * @since 6.1.0 Implemented the style engine to generate CSS and classnames.
  * @access private
  *
@@ -98 +99 @@
  */
 function wp_render_elements_support_styles( $pre_render, $block ) {
-    $block_type                    = WP_Block_Type_Registry::get_instance()->get_registered( $block['blockName'] );
+    $block_type           = WP_Block_Type_Registry::get_instance()->get_registered( $block['blockName'] );
+    $element_block_styles = isset( $block['attrs']['style']['elements'] ) ? $block['attrs']['style']['elements'] : null;
+
+    /*
+    * For now we only care about link color.
+    */
     $skip_link_color_serialization = wp_should_skip_block_supports_serialization( $block_type, 'color', 'link' );
+
     if ( $skip_link_color_serialization ) {
         return null;
     }
+    $class_name        = wp_get_elements_class_name( $block );
+    $link_block_styles = isset( $element_block_styles['link'] ) ? $element_block_styles['link'] : null;
 
-    $link_color = null;
-    if ( ! empty( $block['attrs'] ) ) {
-        $link_color = _wp_array_get( $block['attrs'], array( 'style', 'elements', 'link', 'color', 'text' ), null );
-    }
-
-    /*
-    * For now we only care about link color.
-    * This code in the future when we have a public API
-    * should take advantage of WP_Theme_JSON::compute_style_properties
-    * and work for any element and style.
-    */
-    if ( null === $link_color ) {
-        return null;
-    }
-
-    $class_name = wp_get_elements_class_name( $block );
-
-    if ( strpos( $link_color, 'var:preset|color|' ) !== false ) {
-        // Get the name from the string and add proper styles.
-        $index_to_splice = strrpos( $link_color, '|' ) + 1;
-        $link_color_name = substr( $link_color, $index_to_splice );
-        $link_color      = "var(--wp--preset--color--$link_color_name)";
-    }
-    $link_color_declaration = esc_html( safecss_filter_attr( "color: $link_color" ) );
-
-    $style = ".$class_name a{" . $link_color_declaration . ';}';
-
-    wp_enqueue_block_support_styles( $style );
+    wp_style_engine_get_styles(
+        $link_block_styles,
+        array(
+            'selector' => ".$class_name a",
+            'context'  => 'block-supports',
+        )
+    );
 
     return null;