Skip to content

Block Hooks: Make work with modified templates/parts/patterns #5523

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 9 commits into from
Closed

Block Hooks: Make work with modified templates/parts/patterns #5523

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d7e47ba
Add blockHooks global attribute to anchor blocks
ockham Oct 18, 2023
12a5251
Rearrange logic a bit
ockham Nov 7, 2023
f29ba55
Change argument order
ockham Nov 14, 2023
711c933
Relax test assertion a bit
ockham Nov 28, 2023
e1ffbdc
Get tests to pass
ockham Nov 28, 2023
3d56c9b
Fix test
ockham Nov 28, 2023
a9e3fbe
Relax tests
ockham Nov 28, 2023
29cea57
Add some assertions for ignoredHookedBlocks
ockham Nov 28, 2023
a6d9c0f
Add PHPDoc
ockham Nov 28, 2023
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
Prev Previous commit
Next Next commit
Change argument order
  • Loading branch information
@ockham
ockham committed Nov 28, 2023
commit f29ba5589886cf4059839f4f698e5e7f93007741
10 changes: 5 additions & 5 deletions src/wp-includes/blocks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,7 +757,7 @@ function get_hooked_blocks() {
return $hooked_blocks;
}

function insert_hooked_blocks( $relative_position, &$anchor_block, $hooked_blocks, $context ) {
function insert_hooked_blocks( &$anchor_block, $relative_position, $hooked_blocks, $context ) {
$anchor_block_type = $anchor_block['blockName'];
$hooked_block_types = isset( $hooked_blocks[ $anchor_block_type ][ $relative_position ] )
? $hooked_blocks[ $anchor_block_type ][ $relative_position ]
Expand Down Expand Up @@ -833,10 +833,10 @@ function make_before_block_visitor( $hooked_blocks, $context ) {

if ( $parent_block && ! $prev ) {
// Candidate for first-child insertion.
$markup .= insert_hooked_blocks( 'first_child', $parent_block, $hooked_blocks, $context );
$markup .= insert_hooked_blocks( $parent_block, 'first_child', $hooked_blocks, $context );
}

$markup .= insert_hooked_blocks( 'before', $block, $hooked_blocks, $context );
$markup .= insert_hooked_blocks( $block, 'before', $hooked_blocks, $context );

return $markup;
};
Expand Down Expand Up @@ -872,11 +872,11 @@ function make_after_block_visitor( $hooked_blocks, $context ) {
* @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 ( $hooked_blocks, $context ) {
$markup = insert_hooked_blocks( 'after', $block, $hooked_blocks, $context );
$markup = insert_hooked_blocks( $block, 'after', $hooked_blocks, $context );

if ( $parent_block && ! $next ) {
// Candidate for last-child insertion.
$markup .= insert_hooked_blocks( 'last_child', $parent_block, $hooked_blocks, $context );
$markup .= insert_hooked_blocks( $parent_block, 'last_child', $hooked_blocks, $context );
}

return $markup;
Expand Down