Changeset 56649

Timestamp:

09/21/2023 04:16:05 PM (12 months ago)

Author:

Bernhard Reiter

Message:

Blocks: Implement automatic block insertion into Block Hooks.

Block Hooks allow a third-party block to specify a position relative to a given block into which it will then be automatically inserted (e.g. a "Like" button block can ask to be inserted after the Post Content block, or an eCommerce shopping cart block can ask to be inserted after the Navigation block).

The underlying idea is to provide an extensibility mechanism for Block Themes, in analogy to WordPress' ​Hooks concept that has allowed extending Classic Themes through filters and actions.

The two core tenets for Block Hooks are:

1. Insertion into the frontend should happen right after a plugin containing a hooked block is activated (i.e. the user isn't required to insert the block manually in the editor first); similarly, disabling the plugin should remove the hooked block from the frontend.
2. The user has the ultimate power to customize that automatic insertion: The hooked block is also visible in the editor, and the user's decision to persist, dismiss (i.e. remove), customize, or move it will be respected (and reflected on the frontend).

To account for both tenets, the tradeoff was made to limit automatic block insertion to unmodified templates (and template parts, respectively). The reason for this is that the simplest way of storing the information whether a block has been persisted to (or dismissed from) a given template (or part) is right in the template markup.

To accommodate for that tradeoff, ​UI controls (toggles) are being added to increase visibility of hooked blocks, and to allow for their later insertion into templates (or parts) that already have been modified by the user.

For hooked blocks to appear both in the frontend and in the editor (see tenet number 2), they need to be inserted into both the frontend markup and the REST API (templates and patterns endpoints) equally. As a consequence, this means that automatic insertion couldn't (only) be implemented at block render stage, as for the editor, the serialized (but unrendered) markup needs to be modified.

Furthermore, hooked blocks also have to be inserted into block patterns. Since practically no filters exist for the patterns registry, this has to be done in the registry's get_registered and get_all_registered methods.

Props gziolo.
Fixes #59313.

Location:

trunk

Files:

• src/wp-includes/block-template-utils.php (modified) (1 diff)
• src/wp-includes/blocks.php (modified) (2 diffs)
• src/wp-includes/class-wp-block-patterns-registry.php (modified) (2 diffs)
• tests/phpunit/tests/blocks/serialize.php (modified) (2 diffs)
• tests/phpunit/tests/rest-api/rest-block-type-controller.php (modified) (1 diff)

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

@@ -602 +602 @@
     }
 
-    $blocks            = parse_blocks( $template_content );
-    $template->content = traverse_and_serialize_blocks( $blocks, '_inject_theme_attribute_in_template_part_block' );
+    $blocks               = parse_blocks( $template_content );
+    $before_block_visitor = make_before_block_visitor( $template );
+    $after_block_visitor  = make_after_block_visitor( $template );
+    $template->content    = traverse_and_serialize_blocks( $blocks, $before_block_visitor, $after_block_visitor );
 
     return $template;

trunk/src/wp-includes/blocks.php

@@ -752 +752 @@
     $hooked_blocks = array();
     foreach ( $block_types as $block_type ) {
+        if ( ! property_exists( $block_type, 'block_hooks' ) || ! is_array( $block_type->block_hooks ) ) {
+            continue;
+        }
         foreach ( $block_type->block_hooks as $anchor_block_type => $relative_position ) {
             if ( $anchor_block_type === $name ) {
@@ -759 +762 @@
     }
     return $hooked_blocks;
+}
+
+/**
+ * Returns a function that injects the theme attribute into, and hooked blocks before, a given block.
+ *
+ * The returned function can be used as `$pre_callback` argument to `traverse_and_serialize_block(s)`,
+ * where it will inject the `theme` attribute into all Template Part blocks, and prepend the markup for
+ * any blocks hooked `before` the given block and as its parent's `first_child`, respectively.
+ *
+ * @since 6.4.0
+ * @access private
+ *
+ * @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 ) {
+    /**
+     * Injects hooked blocks before the given block, injects the `theme` attribute into Template Part blocks, and returns the serialized markup.
+     *
+     * If the current block is a Template Part block, inject the `theme` attribute.
+     * Furthermore, prepend the markup for any blocks hooked `before` the given block and as its parent's
+     * `first_child`, respectively, to the serialized markup for the given block.
+     *
+     * @param array $block  The block to inject the theme attribute into, and hooked blocks before.
+     * @param array $parent The parent block of the given block.
+     * @param array $prev   The previous sibling block of the given block.
+     * @return string The serialized markup for the given block, with the markup for any hooked blocks prepended to it.
+     */
+    return function( &$block, $parent = null, $prev = null ) use ( $context ) {
+        _inject_theme_attribute_in_template_part_block( $block );
+
+        $markup = '';
+
+        if ( $parent && ! $prev ) {
+            // Candidate for first-child insertion.
+            $hooked_blocks_for_parent = get_hooked_blocks( $parent['blockName'] );
+            foreach ( $hooked_blocks_for_parent as $hooked_block_type => $relative_position ) {
+                if ( 'first_child' === $relative_position ) {
+                    $hooked_block_markup = get_comment_delimited_block_content( $hooked_block_type, array(), '' );
+                    /** This filter is documented in wp-includes/blocks.php */
+                    $markup .= apply_filters( 'inject_hooked_block_markup', $hooked_block_markup, $hooked_block_type, $relative_position, $parent, $context );
+                }
+            }
+        }
+
+        $hooked_blocks = get_hooked_blocks( $block['blockName'] );
+        foreach ( $hooked_blocks as $hooked_block_type => $relative_position ) {
+            if ( 'before' === $relative_position ) {
+                $hooked_block_markup = get_comment_delimited_block_content( $hooked_block_type, array(), '' );
+                /**
+                 * Filters the serialized markup of a hooked block.
+                 *
+                 * @since 6.4.0
+                 *
+                 * @param string                  $hooked_block_markup The serialized markup of the hooked block.
+                 * @param string                  $hooked_block_type   The type of the hooked block.
+                 * @param string                  $relative_position   The relative position of the hooked block.
+                 *                                                     Can be one of 'before', 'after', 'first_child', or 'last_child'.
+                 * @param array                   $block               The anchor block.
+                 * @param WP_Block_Template|array $context             The block template, template part, or pattern that the anchor block belongs to.
+                 */
+                $markup .= apply_filters( 'inject_hooked_block_markup', $hooked_block_markup, $hooked_block_type, $relative_position, $block, $context );
+            }
+        }
+
+        return $markup;
+    };
+}
+
+/**
+ * Returns a function that injects the hooked blocks after a given block.
+ *
+ * The returned function can be used as `$post_callback` argument to `traverse_and_serialize_block(s)`,
+ * where it will append the markup for any blocks hooked `after` the given block and as its parent's
+ * `last_child`, respectively.
+ *
+ * @since 6.4.0
+ * @access private
+ *
+ * @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 ) {
+    /**
+     * Injects hooked blocks after the given block, and returns the serialized markup.
+     *
+     * Append the markup for any blocks hooked `after` the given block and as its parent's
+     * `last_child`, respectively, to the serialized markup for the given block.
+     *
+     * @param array $block  The block to inject the hooked blocks after.
+     * @param array $parent The parent block of the given block.
+     * @param array $next   The next sibling block of the given block.
+     * @return string The serialized markup for the given block, with the markup for any hooked blocks appended to it.
+     */
+    return function( &$block, $parent = null, $next = null ) use ( $context ) {
+        $markup = '';
+
+        $hooked_blocks = get_hooked_blocks( $block['blockName'] );
+        foreach ( $hooked_blocks as $hooked_block_type => $relative_position ) {
+            if ( 'after' === $relative_position ) {
+                $hooked_block_markup = get_comment_delimited_block_content( $hooked_block_type, array(), '' );
+                /** This filter is documented in wp-includes/blocks.php */
+                $markup .= apply_filters( 'inject_hooked_block_markup', $hooked_block_markup, $hooked_block_type, $relative_position, $block, $context );
+            }
+        }
+
+        if ( $parent && ! $next ) {
+            // Candidate for last-child insertion.
+            $hooked_blocks_for_parent = get_hooked_blocks( $parent['blockName'] );
+            foreach ( $hooked_blocks_for_parent as $hooked_block_type => $relative_position ) {
+                if ( 'last_child' === $relative_position ) {
+                    $hooked_block_markup = get_comment_delimited_block_content( $hooked_block_type, array(), '' );
+                    /** This filter is documented in wp-includes/blocks.php */
+                    $markup .= apply_filters( 'inject_hooked_block_markup', $hooked_block_markup, $hooked_block_type, $relative_position, $parent, $context );
+                }
+            }
+        }
+
+        return $markup;
+    };
 }
 

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

@@ -166 +166 @@
         }
 
-        return $this->registered_patterns[ $pattern_name ];
+        $pattern              = $this->registered_patterns[ $pattern_name ];
+        $blocks               = parse_blocks( $pattern['content'] );
+        $before_block_visitor = make_before_block_visitor( $pattern );
+        $after_block_visitor  = make_after_block_visitor( $pattern );
+        $pattern['content']   = traverse_and_serialize_blocks( $blocks, $before_block_visitor, $after_block_visitor );
+
+        return $pattern;
     }
 
@@ -179 +185 @@
      */
     public function get_all_registered( $outside_init_only = false ) {
-        return array_values(
+        $patterns = array_values(
             $outside_init_only
                 ? $this->registered_patterns_outside_init
                 : $this->registered_patterns
         );
+
+        foreach ( $patterns as $index => $pattern ) {
+            $blocks                        = parse_blocks( $pattern['content'] );
+            $before_block_visitor          = make_before_block_visitor( $pattern );
+            $after_block_visitor           = make_after_block_visitor( $pattern );
+            $patterns[ $index ]['content'] = traverse_and_serialize_blocks( $blocks, $before_block_visitor, $after_block_visitor );
+        }
+        return $patterns;
     }
 

trunk/tests/phpunit/tests/blocks/serialize.php

@@ -63 +63 @@
      * @covers ::traverse_and_serialize_blocks
      */
-    public function test_traverse_and_serialize_blocks() {
+    public function test_traverse_and_serialize_blocks_pre_callback_modifies_current_block() {
         $markup = "<!-- wp:outer --><!-- wp:inner {\"key\":\"value\"} -->Example.<!-- /wp:inner -->\n\nExample.\n\n<!-- wp:void /--><!-- /wp:outer -->";
         $blocks = parse_blocks( $markup );
@@ -82 +82 @@
 
     /**
+     * @ticket 59313
+     *
+     * @covers ::traverse_and_serialize_blocks
+     */
+    public function test_traverse_and_serialize_blocks_pre_callback_prepends_to_inner_block() {
+        $markup = "<!-- wp:outer --><!-- wp:inner {\"key\":\"value\"} -->Example.<!-- /wp:inner -->\n\nExample.\n\n<!-- wp:void /--><!-- /wp:outer -->";
+        $blocks = parse_blocks( $markup );
+
+        $actual = traverse_and_serialize_blocks( $blocks, array( __CLASS__, 'insert_next_to_inner_block_callback' ) );
+
+        $this->assertSame(
+            "<!-- wp:outer --><!-- wp:tests/inserted-block /--><!-- wp:inner {\"key\":\"value\"} -->Example.<!-- /wp:inner -->\n\nExample.\n\n<!-- wp:void /--><!-- /wp:outer -->",
+            $actual
+        );
+    }
+
+    /**
+     * @ticket 59313
+     *
+     * @covers ::traverse_and_serialize_blocks
+     */
+    public function test_traverse_and_serialize_blocks_post_callback_appends_to_inner_block() {
+        $markup = "<!-- wp:outer --><!-- wp:inner {\"key\":\"value\"} -->Example.<!-- /wp:inner -->\n\nExample.\n\n<!-- wp:void /--><!-- /wp:outer -->";
+        $blocks = parse_blocks( $markup );
+
+        $actual = traverse_and_serialize_blocks( $blocks, null, array( __CLASS__, 'insert_next_to_inner_block_callback' ) );
+
+        $this->assertSame(
+            "<!-- wp:outer --><!-- wp:inner {\"key\":\"value\"} -->Example.<!-- /wp:inner --><!-- wp:tests/inserted-block /-->\n\nExample.\n\n<!-- wp:void /--><!-- /wp:outer -->",
+            $actual
+        );
+    }
+
+    public static function insert_next_to_inner_block_callback( $block ) {
+        if ( 'core/inner' !== $block['blockName'] ) {
+            return '';
+        }
+
+        return get_comment_delimited_block_content( 'tests/inserted-block', array(), '' );
+    }
+
+    /**
+     * @ticket 59313
+     *
+     * @covers ::traverse_and_serialize_blocks
+     */
+    public function test_traverse_and_serialize_blocks_pre_callback_prepends_to_child_blocks() {
+        $markup = "<!-- wp:outer --><!-- wp:inner {\"key\":\"value\"} -->Example.<!-- /wp:inner -->\n\nExample.\n\n<!-- wp:void /--><!-- /wp:outer -->";
+        $blocks = parse_blocks( $markup );
+
+        $actual = traverse_and_serialize_blocks( $blocks, array( __CLASS__, 'insert_next_to_child_blocks_callback' ) );
+
+        $this->assertSame(
+            "<!-- wp:outer --><!-- wp:tests/inserted-block {\"parent\":\"core/outer\"} /--><!-- wp:inner {\"key\":\"value\"} -->Example.<!-- /wp:inner -->\n\nExample.\n\n<!-- wp:tests/inserted-block {\"parent\":\"core/outer\"} /--><!-- wp:void /--><!-- /wp:outer -->",
+            $actual
+        );
+    }
+
+    /**
+     * @ticket 59313
+     *
+     * @covers ::traverse_and_serialize_blocks
+     */
+    public function test_traverse_and_serialize_blocks_post_callback_appends_to_child_blocks() {
+        $markup = "<!-- wp:outer --><!-- wp:inner {\"key\":\"value\"} -->Example.<!-- /wp:inner -->\n\nExample.\n\n<!-- wp:void /--><!-- /wp:outer -->";
+        $blocks = parse_blocks( $markup );
+
+        $actual = traverse_and_serialize_blocks( $blocks, null, array( __CLASS__, 'insert_next_to_child_blocks_callback' ) );
+
+        $this->assertSame(
+            "<!-- wp:outer --><!-- wp:inner {\"key\":\"value\"} -->Example.<!-- /wp:inner --><!-- wp:tests/inserted-block {\"parent\":\"core/outer\"} /-->\n\nExample.\n\n<!-- wp:void /--><!-- wp:tests/inserted-block {\"parent\":\"core/outer\"} /--><!-- /wp:outer -->",
+            $actual
+        );
+    }
+
+    public static function insert_next_to_child_blocks_callback( $block, $parent_block ) {
+        if ( ! isset( $parent_block ) ) {
+            return '';
+        }
+
+        return get_comment_delimited_block_content(
+            'tests/inserted-block',
+            array(
+                'parent' => $parent_block['blockName'],
+            ),
+            ''
+        );
+    }
+
+    /**
+     * @ticket 59313
+     *
+     * @covers ::traverse_and_serialize_blocks
+     */
+    public function test_traverse_and_serialize_blocks_pre_callback_prepends_if_prev_block() {
+        $markup = "<!-- wp:outer --><!-- wp:inner {\"key\":\"value\"} -->Example.<!-- /wp:inner -->\n\nExample.\n\n<!-- wp:void /--><!-- /wp:outer -->";
+        $blocks = parse_blocks( $markup );
+
+        $actual = traverse_and_serialize_blocks( $blocks, array( __CLASS__, 'insert_next_to_if_prev_or_next_block_callback' ) );
+
+        $this->assertSame(
+            "<!-- wp:outer --><!-- wp:inner {\"key\":\"value\"} -->Example.<!-- /wp:inner -->\n\nExample.\n\n<!-- wp:tests/inserted-block {\"prev_or_next\":\"core/inner\"} /--><!-- wp:void /--><!-- /wp:outer -->",
+            $actual
+        );
+    }
+
+    /**
+     * @ticket 59313
+     *
+     * @covers ::traverse_and_serialize_blocks
+     */
+    public function test_traverse_and_serialize_blocks_post_callback_appends_if_prev_block() {
+        $markup = "<!-- wp:outer --><!-- wp:inner {\"key\":\"value\"} -->Example.<!-- /wp:inner -->\n\nExample.\n\n<!-- wp:void /--><!-- /wp:outer -->";
+        $blocks = parse_blocks( $markup );
+
+        $actual = traverse_and_serialize_blocks( $blocks, null, array( __CLASS__, 'insert_next_to_if_prev_or_next_block_callback' ) );
+
+        $this->assertSame(
+            "<!-- wp:outer --><!-- wp:inner {\"key\":\"value\"} -->Example.<!-- /wp:inner --><!-- wp:tests/inserted-block {\"prev_or_next\":\"core/void\"} /-->\n\nExample.\n\n<!-- wp:void /--><!-- /wp:outer -->",
+            $actual
+        );
+    }
+
+    public static function insert_next_to_if_prev_or_next_block_callback( $block, $parent_block, $prev_or_next ) {
+        if ( ! isset( $prev_or_next ) ) {
+            return '';
+        }
+
+        return get_comment_delimited_block_content(
+            'tests/inserted-block',
+            array(
+                'prev_or_next' => $prev_or_next['blockName'],
+            ),
+            ''
+        );
+    }
+
+    /**
      * @ticket 59327
      * @ticket 59412

trunk/tests/phpunit/tests/rest-api/rest-block-type-controller.php

@@ -63 +63 @@
         self::delete_user( self::$subscriber_id );
         unregister_block_type( 'fake/test' );
+        unregister_block_type( 'fake/invalid' );
+        unregister_block_type( 'fake/false' );
     }