Skip to content
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

Block Hooks API: Refactor Navigation to account for get_hooked_blocks_by_anchor_block #62658

Open
wants to merge 3 commits into
base: trunk
Choose a base branch
from
+22 −8
Open

Block Hooks API: Refactor Navigation to account for get_hooked_blocks_by_anchor_block #62658

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
385d07b
Check for get_hooked_blocks_by_anchor_block before using it
tjcafferkey Jun 18, 2024
2179a81
Coding standards
tjcafferkey Jun 19, 2024
e829238
Update for deprecated function param
tjcafferkey Jun 26, 2024
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
Next Next commit
Check for get_hooked_blocks_by_anchor_block before using it
  • Loading branch information
@tjcafferkey
tjcafferkey committed Jun 18, 2024
commit 385d07beeb17c8d8959cafbea32360b4ba6189ca
30 changes: 22 additions & 8 deletions packages/block-library/src/navigation/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1512,13 +1512,20 @@
*/
function block_core_navigation_insert_hooked_blocks( $inner_blocks, $post ) {
$mock_navigation_block = block_core_navigation_mock_parsed_block( $inner_blocks, $post );
$hooked_blocks = get_hooked_blocks();
$before_block_visitor = null;
$after_block_visitor = null;

if ( ! empty( $hooked_blocks ) || has_filter( 'hooked_block_types' ) ) {
$before_block_visitor = make_before_block_visitor( $hooked_blocks, $post, 'insert_hooked_blocks' );
$after_block_visitor = make_after_block_visitor( $hooked_blocks, $post, 'insert_hooked_blocks' );
if ( function_exists('get_hooked_blocks_by_anchor_block') ) {
if ( maybe_has_hooked_blocks() ) {
$before_block_visitor = make_before_block_visitor( $post, 'insert_hooked_blocks' );

Check failure on line 1520 in packages/block-library/src/navigation/index.php

View workflow job for this annotation

GitHub Actions / PHP coding standards 

Expected 1 spaces after opening parenthesis; 0 found

Check failure on line 1520 in packages/block-library/src/navigation/index.php

View workflow job for this annotation

GitHub Actions / PHP coding standards 

Expected 1 spaces before closing parenthesis; 0 found
$after_block_visitor = make_after_block_visitor( $post, 'insert_hooked_blocks' );
}
} else {
$hooked_blocks = get_hooked_blocks();
if ( ! empty( $hooked_blocks ) || has_filter( 'hooked_block_types' ) ) {
$before_block_visitor = make_before_block_visitor( $hooked_blocks, $post, 'insert_hooked_blocks' );

Check warning on line 1526 in packages/block-library/src/navigation/index.php

View workflow job for this annotation

GitHub Actions / PHP coding standards 

Equals sign not aligned correctly; expected 1 space but found 9 spaces
$after_block_visitor = make_after_block_visitor( $hooked_blocks, $post, 'insert_hooked_blocks' );
}
}

return traverse_and_serialize_block( $mock_navigation_block, $before_block_visitor, $after_block_visitor );
Expand All @@ -1539,13 +1546,20 @@
*/
function block_core_navigation_set_ignored_hooked_blocks_metadata( $inner_blocks, $post ) {
$mock_navigation_block = block_core_navigation_mock_parsed_block( $inner_blocks, $post );
$hooked_blocks = get_hooked_blocks();
$before_block_visitor = null;
$after_block_visitor = null;

if ( ! empty( $hooked_blocks ) || has_filter( 'hooked_block_types' ) ) {
$before_block_visitor = make_before_block_visitor( $hooked_blocks, $post, 'set_ignored_hooked_blocks_metadata' );
$after_block_visitor = make_after_block_visitor( $hooked_blocks, $post, 'set_ignored_hooked_blocks_metadata' );
if ( function_exists('get_hooked_blocks_by_anchor_block') ) {
if ( maybe_has_hooked_blocks() ) {
$before_block_visitor = make_before_block_visitor( $post, 'set_ignored_hooked_blocks_metadata' );

Check failure on line 1554 in packages/block-library/src/navigation/index.php

View workflow job for this annotation

GitHub Actions / PHP coding standards 

Expected 1 spaces after opening parenthesis; 0 found

Check failure on line 1554 in packages/block-library/src/navigation/index.php

View workflow job for this annotation

GitHub Actions / PHP coding standards 

Expected 1 spaces before closing parenthesis; 0 found
$after_block_visitor = make_after_block_visitor( $post, 'set_ignored_hooked_blocks_metadata' );
}
} else {
$hooked_blocks = get_hooked_blocks();
if ( ! empty( $hooked_blocks ) || has_filter( 'hooked_block_types' ) ) {
$before_block_visitor = make_before_block_visitor( $hooked_blocks, $post, 'set_ignored_hooked_blocks_metadata' );

Check warning on line 1560 in packages/block-library/src/navigation/index.php

View workflow job for this annotation

GitHub Actions / PHP coding standards 

Equals sign not aligned correctly; expected 1 space but found 9 spaces
$after_block_visitor = make_after_block_visitor( $hooked_blocks, $post, 'set_ignored_hooked_blocks_metadata' );
}
}

return traverse_and_serialize_block( $mock_navigation_block, $before_block_visitor, $after_block_visitor );
Expand Down
Loading