Changeset 49310 for trunk/src/wp-includes/class-wp-block-supports.php

Timestamp:

10/26/2020 08:29:04 AM (5 years ago)

Author:

youknowriad

Message:

Block Editor: Fix WP_Block_Supports class compatibility with Gutenberg-provided class.

When using WordPress trunk with Gutenberg master, there's an incompatibility causing
the dynamic block generated classes to be omitted.
This commit refactors the block supports to fix that problem.

Props nosolosw.
Fixes #51606.

File:

• trunk/src/wp-includes/class-wp-block-supports.php (modified) (6 diffs)

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

@@ -23 +23 @@
      */
     private $block_supports = array();
+
+    /**
+     * Tracks the current block to be rendered.
+     *
+     * @var array
+     */
+    public static $block_to_render = null;
 
     /**
@@ -73 +80 @@
     }
 
-
     /**
      * Generates an array of HTML attributes, such as classes, by applying to
@@ -80 +86 @@
      * @since 5.6.0
      *
-     * @param  array $parsed_block Block as parsed from content.
      * @return array               Array of HTML attributes.
      */
-    public function apply_block_supports( $parsed_block ) {
-        $block_attributes = $parsed_block['attrs'];
+    public function apply_block_supports() {
+        $block_attributes = self::$block_to_render['attrs'];
         $block_type       = WP_Block_Type_Registry::get_instance()->get_registered(
-            $parsed_block['blockName']
+            self::$block_to_render['blockName']
         );
 
@@ -156 +161 @@
  * @since 5.6.0
  *
- * @global array    $current_parsed_block Block currently being parsed.
- *
  * @param array $extra_attributes Optional. Extra attributes to render on the block wrapper.
  *
@@ -163 +166 @@
  */
 function get_block_wrapper_attributes( $extra_attributes = array() ) {
-    global $current_parsed_block;
-    $new_attributes = WP_Block_Supports::get_instance()->apply_block_supports( $current_parsed_block );
+    $new_attributes = WP_Block_Supports::get_instance()->apply_block_supports();
 
     if ( empty( $new_attributes ) && empty( $extra_attributes ) ) {
@@ -209 +211 @@
     return implode( ' ', $normalized_attributes );
 }
-