Block Hooks: Fix toggle with Navigation block

packages/block-editor/src/hooks/block-hooks.js

@@ -19,6 +19,10 @@ import { store as blockEditorStore } from '../store';
 
 const EMPTY_OBJECT = {};
 
+function isNavigationBlock( block ) {
+	return block.name === 'core/navigation';
+}
+
 function BlockHooksControlPure( { name, clientId } ) {
 	const blockTypes = useSelect(
 		( select ) => select( blocksStore ).getBlockTypes(),
@@ -33,14 +37,29 @@ function BlockHooksControlPure( { name, clientId } ) {
 		[ blockTypes, name ]
 	);
 
+	const getInnerBlocks = useSelect( ( select ) => {
+		const { getBlock, getBlocks } = select( blockEditorStore );
+
+		return ( cId ) => {
+			return {
+				controlledInnerBlocks: getBlocks( cId ),
+				uncontrolledInnerBlocks: getBlock( cId )?.innerBlocks,
+			};
+		};
+	} );
+
 	const { blockIndex, rootClientId, innerBlocksLength } = useSelect(
 		( select ) => {
 			const { getBlock, getBlockIndex, getBlockRootClientId } =
 				select( blockEditorStore );
+			const { uncontrolledInnerBlocks, controlledInnerBlocks } =
+				getInnerBlocks( clientId );
 
 			return {
 				blockIndex: getBlockIndex( clientId ),
-				innerBlocksLength: getBlock( clientId )?.innerBlocks?.length,
+				innerBlocksLength: isNavigationBlock( getBlock( clientId ) )
+					? controlledInnerBlocks?.length
+					: uncontrolledInnerBlocks?.length,
 				rootClientId: getBlockRootClientId( clientId ),
 			};
 		},
@@ -77,7 +96,15 @@ function BlockHooksControlPure( { name, clientId } ) {
 							// Any of the current block's child blocks (with the right block type) qualifies
 							// as a hooked first or last child block, as the block might've been automatically
 							// inserted and then moved around a bit by the user.
-							candidates = getBlock( clientId ).innerBlocks;
+							const {
+								uncontrolledInnerBlocks,
+								controlledInnerBlocks,
+							} = getInnerBlocks( clientId );
+							candidates = isNavigationBlock(
+								getBlock( clientId )
+							)
+								? controlledInnerBlocks
+								: uncontrolledInnerBlocks;
 							break;
 					}