Skip to content

Navigation Block: Polish Block Hooks integration #59177

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

Draft
ockham wants to merge 1 commit into
base: trunk
Choose a base branch
from
Draft

Navigation Block: Polish Block Hooks integration #59177

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 3 additions & 5 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 @@ -1425,7 +1425,7 @@ function block_core_navigation_mock_parsed_block( $inner_blocks, $post ) {
*
* @param array $inner_blocks Parsed inner blocks of a Navigation block.
* @param WP_Post $post `wp_navigation` post object corresponding to the block.
* @return string Serialized inner blocks in mock Navigation block wrapper, with hooked blocks inserted, if any.
* @return string Serialized inner blocks with hooked blocks inserted, if any.
*/
function block_core_navigation_insert_hooked_blocks( $inner_blocks, $post ) {
$mock_navigation_block = block_core_navigation_mock_parsed_block( $inner_blocks, $post );
Expand All @@ -1438,7 +1438,8 @@ function block_core_navigation_insert_hooked_blocks( $inner_blocks, $post ) {
$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 );
$markup = traverse_and_serialize_block( $mock_navigation_block, $before_block_visitor, $after_block_visitor );
return block_core_navigation_remove_serialized_parent_block( $markup );
}

/**
Expand Down Expand Up @@ -1527,9 +1528,6 @@ function block_core_navigation_insert_hooked_blocks_into_rest_response( $respons
$parsed_blocks = parse_blocks( $response->data['content']['raw'] );
$content = block_core_navigation_insert_hooked_blocks( $parsed_blocks, $post );

// Remove mock Navigation block wrapper.
$content = block_core_navigation_remove_serialized_parent_block( $content );

$response->data['content']['raw'] = $content;
$response->data['content']['rendered'] = apply_filters( 'the_content', $content );

Expand Down