Changeset 58234

Timestamp:

05/29/2024 11:55:27 AM (2 months ago)

Author:

gziolo

Message:

Interactivity API: Move directive processing to WP_Block class

Integrates the directives processing into the WP_Block class. It removes the overhead of running additional hooks when rendering blocks and simplifies the way we detect whether the directive processing should run on an interactive region of the produced final HTML for the blocks.

Introduces interactivity_process_directives filter to offer a way to opt out from directives processing. It's needed in Gutenberg: ​https://github.com/WordPress/gutenberg/pull/62095.

Props gziolo, cbravobernal.
Fixes #61185.

Location:

trunk

Files:

• src/wp-includes/class-wp-block.php (modified) (2 diffs)
• src/wp-includes/deprecated.php (modified) (1 diff)
• src/wp-includes/interactivity-api/interactivity-api.php (modified) (1 diff)
• tests/phpunit/tests/interactivity-api/wpInteractivityAPIFunctions.php (modified) (1 diff)

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

@@ -409 +409 @@
     public function render( $options = array() ) {
         global $post;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         $options = wp_parse_args(
             $options,
@@ -534 +557 @@
         $block_content = apply_filters( "render_block_{$this->name}", $block_content, $this->parsed_block, $this );
 
+
+
+
+
+
+
         return $block_content;
     }

trunk/src/wp-includes/deprecated.php

@@ -6319 +6319 @@
     return $block_content;
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/src/wp-includes/interactivity-api/interactivity-api.php

@@ -7 +7 @@
  * @since 6.5.0
  */
-
-/**
- * Processes the directives on the rendered HTML of the interactive blocks.
- *
- * This processes only one root interactive block at a time because the
- * rendered HTML of that block contains the rendered HTML of all its inner
- * blocks, including any interactive block. It does so by ignoring all the
- * interactive inner blocks until the root interactive block is processed.
- *
- * @since 6.5.0
- *
- * @param array $parsed_block The parsed block.
- * @return array The same parsed block.
- */
-function wp_interactivity_process_directives_of_interactive_blocks( array $parsed_block ): array {
-    static $root_interactive_block = null;
-
-    /*
-     * Checks whether a root interactive block is already annotated for
-     * processing, and if it is, it ignores the subsequent ones.
-     */
-    if ( null === $root_interactive_block ) {
-        $block_name = $parsed_block['blockName'];
-        $block_type = WP_Block_Type_Registry::get_instance()->get_registered( $block_name );
-
-        if (
-            isset( $block_name ) &&
-            ( ( isset( $block_type->supports['interactivity'] ) && true === $block_type->supports['interactivity'] ) ||
-            ( isset( $block_type->supports['interactivity']['interactive'] ) && true === $block_type->supports['interactivity']['interactive'] ) )
-        ) {
-            // Annotates the root interactive block for processing.
-            $root_interactive_block = array( $block_name, $parsed_block );
-
-            /*
-             * Adds a filter to process the root interactive block once it has
-             * finished rendering.
-             */
-            $process_interactive_blocks = static function ( string $content, array $parsed_block ) use ( &$root_interactive_block, &$process_interactive_blocks ): string {
-                // Checks whether the current block is the root interactive block.
-                list($root_block_name, $root_parsed_block) = $root_interactive_block;
-                if ( $root_block_name === $parsed_block['blockName'] && $parsed_block === $root_parsed_block ) {
-                    // The root interactive blocks has finished rendering, process it.
-                    $content = wp_interactivity_process_directives( $content );
-                    // Removes the filter and reset the root interactive block.
-                    remove_filter( 'render_block_' . $parsed_block['blockName'], $process_interactive_blocks );
-                    $root_interactive_block = null;
-                }
-                return $content;
-            };
-
-            /*
-             * Uses a priority of 100 to ensure that other filters can add additional
-             * directives before the processing starts.
-             */
-            add_filter( 'render_block_' . $block_name, $process_interactive_blocks, 100, 2 );
-        }
-    }
-
-    return $parsed_block;
-}
-/*
- * Uses a priority of 100 to ensure that other filters can add additional attributes to
- * $parsed_block before the processing starts.
- */
-add_filter( 'render_block_data', 'wp_interactivity_process_directives_of_interactive_blocks', 100, 1 );
 
 /**

trunk/tests/phpunit/tests/interactivity-api/wpInteractivityAPIFunctions.php

@@ -526 +526 @@
         $this->assertNull( $input_value );
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }