Changeset 59101 for trunk/src/wp-includes/block-template-utils.php

Timestamp:

09/27/2024 09:18:46 AM (20 months ago)

Author:

Bernhard Reiter

Message:

Block Hooks: apply_block_hooks_to_content in Patterns, Templates.

In the Patterns registry, use apply_block_hooks_to_content (introduced in [58291]) instead of the WP_Block_Patterns_Registry class's private get_content method. (The latter is removed as part of this changeset.)

In a similar vein, use apply_block_hooks_to_content in the _build_block_template_result_from_file and _build_block_template_result_from_post functions, respectively.

For that to work, apply_block_hooks_to_content is amended to inject the theme attribute into Template Part blocks, even if no hooked blocks are present.

This kind of centralization is required as a preparation for #61902.

Props bernhard-reiter, jonsurrell.
See #61902.

File:

• trunk/src/wp-includes/block-template-utils.php (modified) (3 diffs)

trunk/src/wp-includes/block-template-utils.php

@@ -616 +616 @@
     }
 
-    $hooked_blocks        = get_hooked_blocks();
-    $has_hooked_blocks    = ! empty( $hooked_blocks ) || has_filter( 'hooked_block_types' );
-    $before_block_visitor = '_inject_theme_attribute_in_template_part_block';
-    $after_block_visitor  = null;
-
-    if ( $has_hooked_blocks ) {
-        $before_block_visitor = make_before_block_visitor( $hooked_blocks, $template, 'insert_hooked_blocks_and_set_ignored_hooked_blocks_metadata' );
-        $after_block_visitor  = make_after_block_visitor( $hooked_blocks, $template, 'insert_hooked_blocks_and_set_ignored_hooked_blocks_metadata' );
-    }
-
-    if ( 'wp_template_part' === $template->type && $has_hooked_blocks ) {
+    if ( 'wp_template_part' === $template->type ) {
         /*
          * In order for hooked blocks to be inserted at positions first_child and last_child in a template part,
@@ -636 +626 @@
             $template->content
         );
-        $content           = traverse_and_serialize_blocks( parse_blocks( $content ), $before_block_visitor, $after_block_visitor );
+        $content           = apply_block_hooks_to_content(
+            $content,
+            $template,
+            'insert_hooked_blocks_and_set_ignored_hooked_blocks_metadata'
+        );
         $template->content = remove_serialized_parent_block( $content );
     } else {
-        $template->content = traverse_and_serialize_blocks(
-            parse_blocks( $template->content ),
-            $before_block_visitor,
-            $after_block_visitor
+        $template->content = apply_block_hooks_to_content(
+            $template->content,
+            $template,
+            'insert_hooked_blocks_and_set_ignored_hooked_blocks_metadata'
         );
     }
@@ -1037 +1031 @@
     }
 
-    $hooked_blocks = get_hooked_blocks();
-    if ( ! empty( $hooked_blocks ) || has_filter( 'hooked_block_types' ) ) {
-        $before_block_visitor = make_before_block_visitor( $hooked_blocks, $template, 'insert_hooked_blocks_and_set_ignored_hooked_blocks_metadata' );
-        $after_block_visitor  = make_after_block_visitor( $hooked_blocks, $template, 'insert_hooked_blocks_and_set_ignored_hooked_blocks_metadata' );
-        if ( 'wp_template_part' === $template->type ) {
-            $existing_ignored_hooked_blocks = get_post_meta( $post->ID, '_wp_ignored_hooked_blocks', true );
-            $attributes                     = ! empty( $existing_ignored_hooked_blocks ) ? array( 'metadata' => array( 'ignoredHookedBlocks' => json_decode( $existing_ignored_hooked_blocks, true ) ) ) : array();
-
-            /*
-             * In order for hooked blocks to be inserted at positions first_child and last_child in a template part,
-             * we need to wrap its content a mock template part block and traverse it.
-             */
-            $content           = get_comment_delimited_block_content(
-                'core/template-part',
-                $attributes,
-                $template->content
-            );
-            $content           = traverse_and_serialize_blocks( parse_blocks( $content ), $before_block_visitor, $after_block_visitor );
-            $template->content = remove_serialized_parent_block( $content );
-        } else {
-            $template->content = traverse_and_serialize_blocks(
-                parse_blocks( $template->content ),
-                $before_block_visitor,
-                $after_block_visitor
-            );
-        }
+    if ( 'wp_template_part' === $template->type ) {
+        $existing_ignored_hooked_blocks = get_post_meta( $post->ID, '_wp_ignored_hooked_blocks', true );
+        $attributes                     = ! empty( $existing_ignored_hooked_blocks ) ? array( 'metadata' => array( 'ignoredHookedBlocks' => json_decode( $existing_ignored_hooked_blocks, true ) ) ) : array();
+
+        /*
+         * In order for hooked blocks to be inserted at positions first_child and last_child in a template part,
+         * we need to wrap its content a mock template part block and traverse it.
+         */
+        $content           = get_comment_delimited_block_content(
+            'core/template-part',
+            $attributes,
+            $template->content
+        );
+        $content           = apply_block_hooks_to_content(
+            $content,
+            $template,
+            'insert_hooked_blocks_and_set_ignored_hooked_blocks_metadata'
+        );
+        $template->content = remove_serialized_parent_block( $content );
+    } else {
+        $template->content = apply_block_hooks_to_content(
+            $template->content,
+            $template,
+            'insert_hooked_blocks_and_set_ignored_hooked_blocks_metadata'
+        );
     }