Limit back to Nav block and always skip to Nav block (#46037)

WordPress · Nov 25, 2022 · 362a6c4 · 362a6c4
1 parent d40cc5c
commit 362a6c4
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/packages/block-editor/src/components/block-card/index.js b/packages/block-editor/src/components/block-card/index.js
@@ -30,15 +30,16 @@ function BlockCard( { title, icon, description, blockType, className } ) {
 	const isOffCanvasNavigationEditorEnabled =
 		window?.__experimentalEnableOffCanvasNavigationEditor === true;
 
-	const { parentBlockClientId } = useSelect( ( select ) => {
-		const { getSelectedBlockClientId, getBlockParents } =
+	const { parentNavBlockClientId } = useSelect( ( select ) => {
+		const { getSelectedBlockClientId, getBlockParentsByBlockName } =
 			select( blockEditorStore );
 
 		const _selectedBlockClientId = getSelectedBlockClientId();
 
 		return {
-			parentBlockClientId: getBlockParents(
+			parentNavBlockClientId: getBlockParentsByBlockName(
 				_selectedBlockClientId,
+				'core/navigation',
 				true
 			)[ 0 ],
 		};
@@ -48,10 +49,10 @@ function BlockCard( { title, icon, description, blockType, className } ) {
 
 	return (
 		<div className={ classnames( 'block-editor-block-card', className ) }>
-			{ isOffCanvasNavigationEditorEnabled && parentBlockClientId && (
+			{ isOffCanvasNavigationEditorEnabled && parentNavBlockClientId && (
 				<Button
-					onClick={ () => selectBlock( parentBlockClientId ) }
-					label={ __( 'Navigate to parent block' ) }
+					onClick={ () => selectBlock( parentNavBlockClientId ) }
+					label={ __( 'Go to parent Navigation block' ) }
 					style={
 						// TODO: This style override is also used in ToolsPanelHeader.
 						// It should be supported out-of-the-box by Button.