Use in Navigation block

packages/block-library/src/navigation/index.php

@@ -241,11 +241,12 @@
 			// it encounters whitespace. This code strips it.
 			$blocks = block_core_navigation_filter_out_empty_blocks( $parsed_blocks );
 
-			// Run Block Hooks algorithm to inject hooked blocks.
-			$markup         = block_core_navigation_insert_hooked_blocks( $blocks, $navigation_post );
-			$root_nav_block = parse_blocks( $markup )[0];
-
-			$blocks = isset( $root_nav_block['innerBlocks'] ) ? $root_nav_block['innerBlocks'] : $blocks;
+			// Re-serialize, and run Block Hooks algorithm to inject hooked blocks.
+			// TODO: See if we can move the gutenberg_apply_block_hooks_to_post_content() call
+			// before the parse_blocks() call further above, to avoid the extra serialization/parsing.
+			$markup = serialize_blocks( $blocks );
+			$markup = gutenberg_apply_block_hooks_to_post_content( $markup, $navigation_post );
+			$blocks = parse_blocks( $markup );
 
 			// TODO - this uses the full navigation block attributes for the
 			// context which could be refined.
@@ -1077,12 +1078,11 @@
 
 		// Run Block Hooks algorithm to inject hooked blocks.
 		// We have to run it here because we need the post ID of the Navigation block to track ignored hooked blocks.
-		$markup = block_core_navigation_insert_hooked_blocks( $fallback_blocks, $navigation_post );
-		$blocks = parse_blocks( $markup );
-
-		if ( isset( $blocks[0]['innerBlocks'] ) ) {
-			$fallback_blocks = $blocks[0]['innerBlocks'];
-		}
+		// TODO: See if we can move the gutenberg_apply_block_hooks_to_post_content() call
+		// before the parse_blocks() call further above, to avoid the extra serialization/parsing.
+		$markup          = serialize_blocks( $fallback_blocks );
+		$markup          = gutenberg_apply_block_hooks_to_post_content( $markup, $navigation_post );
+		$fallback_blocks = parse_blocks( $markup );
 	}
 
 	/**