Changeset 56805 for trunk/src/wp-includes/blocks.php

Timestamp:

10/09/2023 04:38:25 PM (19 months ago)

Author:

Bernhard Reiter

Message:

Blocks: Call get_hooked_blocks only once per template/part/pattern.

Prior to this changeset, get_hooked_blocks was called four times for every parsed block in each template, template part, and pattern. With this changeset applied, get_hooked_blocks is called only once per template, template part, or pattern.

Additionally, get_hooked_blocks is called only once when returning the list of all registered patterns. (The latter modification brings the implementation closer to its state prior to Block Hooks.)

Finally, when there are no registered hooked blocks or hooked_block_types filters, parsing, hooked block insertion, and re-serializing is skipped altogether.

Props gziolo, flixos90, joemcgill, dmsnell, spacedmonkey, hellofromtonya.
Fixes #59383.

File:

• trunk/src/wp-includes/blocks.php (modified) (9 diffs)

trunk/src/wp-includes/blocks.php

@@ -724 +724 @@
 
 /**
- * Retrieves block types hooked into the given block, grouped by their relative position.
+ * Retrieves block types hooked into the given block, grouped by anchor block type and the relative position.
  *
  * @since 6.4.0
  *
- * @param string $name Block type name including namespace.
- * @return array[] Array of block types grouped by their relative position.
- */
-function get_hooked_blocks( $name ) {
+ * @return array[] Array of block types grouped by anchor block type and the relative position.
+ */
+function get_hooked_blocks() {
     $block_types   = WP_Block_Type_Registry::get_instance()->get_all_registered();
     $hooked_blocks = array();
@@ -739 +738 @@
         }
         foreach ( $block_type->block_hooks as $anchor_block_type => $relative_position ) {
-            if ( $anchor_block_type !== $name ) {
-                continue;
-            }
-            if ( ! isset( $hooked_blocks[ $relative_position ] ) ) {
-                $hooked_blocks[ $relative_position ] = array();
-            }
-            $hooked_blocks[ $relative_position ][] = $block_type->name;
-        }
-    }
+            if ( ! isset( $hooked_blocks[ $anchor_block_type ] ) ) {
+                $hooked_blocks[ $anchor_block_type ] = array();
+            }
+            if ( ! isset( $hooked_blocks[ $anchor_block_type ][ $relative_position ] ) ) {
+                $hooked_blocks[ $anchor_block_type ][ $relative_position ] = array();
+            }
+            $hooked_blocks[ $anchor_block_type ][ $relative_position ][] = $block_type->name;
+        }
+    }
+
     return $hooked_blocks;
 }
@@ -761 +761 @@
  * @access private
  *
- * @param WP_Block_Template|array $context A block template, template part, or pattern that the blocks belong to.
+ * @param array                   $hooked_blocks An array of blocks hooked to another given block.
+ * @param WP_Block_Template|array $context       A block template, template part, or pattern that the blocks belong to.
  * @return callable A function that returns the serialized markup for the given block,
  *                  including the markup for any hooked blocks before it.
  */
-function make_before_block_visitor( $context ) {
+function make_before_block_visitor( $hooked_blocks, $context ) {
     /**
      * Injects hooked blocks before the given block, injects the `theme` attribute into Template Part blocks, and returns the serialized markup.
@@ -778 +779 @@
      * @return string The serialized markup for the given block, with the markup for any hooked blocks prepended to it.
      */
-    return function ( &$block, $parent_block = null, $prev = null ) use ( $context ) {
+    return function ( &$block, $parent_block = null, $prev = null ) use ( $hooked_blocks, $context ) {
         _inject_theme_attribute_in_template_part_block( $block );
 
@@ -787 +788 @@
             $relative_position  = 'first_child';
             $anchor_block_type  = $parent_block['blockName'];
-            $hooked_block_types = get_hooked_blocks( $anchor_block_type );
-            $hooked_block_types = isset( $hooked_block_types[ $relative_position ] )
-                ? $hooked_block_types[ $relative_position ]
+            $hooked_block_types = isset( $hooked_blocks[ $anchor_block_type ][ $relative_position ] )
+                ? $hooked_blocks[ $anchor_block_type ][ $relative_position ]
                 : array();
 
@@ -811 +811 @@
         $relative_position  = 'before';
         $anchor_block_type  = $block['blockName'];
-        $hooked_block_types = get_hooked_blocks( $anchor_block_type );
-        $hooked_block_types = isset( $hooked_block_types[ $relative_position ] )
-            ? $hooked_block_types[ $relative_position ]
+        $hooked_block_types = isset( $hooked_blocks[ $anchor_block_type ][ $relative_position ] )
+            ? $hooked_blocks[ $anchor_block_type ][ $relative_position ]
             : array();
 
@@ -836 +835 @@
  * @access private
  *
- * @param WP_Block_Template|array $context A block template, template part, or pattern that the blocks belong to.
+ * @param array                   $hooked_blocks An array of blocks hooked to another block.
+ * @param WP_Block_Template|array $context       A block template, template part, or pattern that the blocks belong to.
  * @return callable A function that returns the serialized markup for the given block,
  *                  including the markup for any hooked blocks after it.
  */
-function make_after_block_visitor( $context ) {
+function make_after_block_visitor( $hooked_blocks, $context ) {
     /**
      * Injects hooked blocks after the given block, and returns the serialized markup.
@@ -852 +852 @@
      * @return string The serialized markup for the given block, with the markup for any hooked blocks appended to it.
      */
-    return function ( &$block, $parent_block = null, $next = null ) use ( $context ) {
+    return function ( &$block, $parent_block = null, $next = null ) use ( $hooked_blocks, $context ) {
         $markup = '';
 
         $relative_position  = 'after';
         $anchor_block_type  = $block['blockName'];
-        $hooked_block_types = get_hooked_blocks( $anchor_block_type );
-        $hooked_block_types = isset( $hooked_block_types[ $relative_position ] )
-            ? $hooked_block_types[ $relative_position ]
-            : array();
+        $hooked_block_types = isset( $hooked_blocks[ $anchor_block_type ][ $relative_position ] )
+                ? $hooked_blocks[ $anchor_block_type ][ $relative_position ]
+                : array();
 
         /** This filter is documented in wp-includes/blocks.php */
@@ -872 +871 @@
             $relative_position  = 'last_child';
             $anchor_block_type  = $parent_block['blockName'];
-            $hooked_block_types = get_hooked_blocks( $anchor_block_type );
-            $hooked_block_types = isset( $hooked_block_types[ $relative_position ] )
-                ? $hooked_block_types[ $relative_position ]
+            $hooked_block_types = isset( $hooked_blocks[ $anchor_block_type ][ $relative_position ] )
+                ? $hooked_blocks[ $anchor_block_type ][ $relative_position ]
                 : array();