Skip to content

Block Hooks: Fix child insertion next to Classic block #8337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ockham wants to merge 2 commits into from
Closed

Block Hooks: Fix child insertion next to Classic block #8337

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17c875c
Block Hooks: Add test coverage for child insertion
ockham Feb 17, 2025
6f893d0
Add test coverage for Classic block as sibling
ockham Feb 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions tests/phpunit/tests/blocks/applyBlockHooksToContent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,15 @@ public static function wpSetUpBeforeClass() {
)
);

register_block_type(
'tests/hooked-block-as-last-child',
array(
'block_hooks' => array(
'tests/anchor-block-for-child-insertion' => 'last_child',
),
)
);

register_block_type(
'tests/hooked-block-with-multiple-false',
array(
Expand Down Expand Up @@ -59,6 +68,7 @@ public static function wpTearDownAfterClass() {
$registry = WP_Block_Type_Registry::get_instance();

$registry->unregister( 'tests/hooked-block' );
$registry->unregister( 'tests/hooked-block-as-last-child' );
$registry->unregister( 'tests/hooked-block-with-multiple-false' );
$registry->unregister( 'tests/dynamically-hooked-block-with-multiple-false' );
}
Expand Down Expand Up @@ -91,6 +101,36 @@ public function test_apply_block_hooks_to_content_inserts_hooked_block() {
);
}

public function test_apply_block_hooks_to_content_inserts_hooked_block_as_last_child_if_sibling_is_present() {
$block_opener = '<!-- wp:tests/anchor-block-for-child-insertion -->';
$block_closer = '<!-- /wp:tests/anchor-block-for-child-insertion -->';
$sibling_block = '<!-- wp:tests/sibling /-->';

$context = new WP_Block_Template();
$context->content = $block_opener . $sibling_block . $block_closer;

$actual = apply_block_hooks_to_content( $context->content, $context, 'insert_hooked_blocks' );
$this->assertSame(
$block_opener . $sibling_block . '<!-- wp:tests/hooked-block-as-last-child /-->' . $block_closer,
$actual
);
}

public function test_apply_block_hooks_to_content_inserts_hooked_block_as_last_child_if_sibling_is_classic_block() {
$block_opener = '<!-- wp:tests/anchor-block-for-child-insertion -->';
$block_closer = '<!-- /wp:tests/anchor-block-for-child-insertion -->';
$sibling_block = '<h2>Hello World!</h2>';

$context = new WP_Block_Template();
$context->content = $block_opener . $sibling_block . $block_closer;

$actual = apply_block_hooks_to_content( $context->content, $context, 'insert_hooked_blocks' );
$this->assertSame(
$block_opener . $sibling_block . '<!-- wp:tests/hooked-block-as-last-child /-->' . $block_closer,
$actual
);
}

/**
* @ticket 61074
*/
Expand Down
Loading