Add Navigation block toolbar buttons to Template Part editor

- Add 'Edit navigation' button when template part contains Navigation blocks
- Button selects the first Navigation block and opens inspector
- Remove contentOnly mode restriction - buttons work in all modes
- Prevent double-click navigation when editing Navigation blocks
- Add visual separation between toolbar button groups

Extracted from PR #71137 with contentOnly restrictions removed.

Author: getdave

packages/block-library/src/template-part/edit/index.js

@@ -132,7 +132,6 @@ export default function TemplatePartEdit( {
 		canUserEdit,
 		hasNavigationBlocks,
 		firstNavigationBlockId,
-		blockEditingMode,
 	} = useSelect(
 		( select ) => {
 			const { getEditedEntityRecord, hasFinishedResolution } =
@@ -187,10 +186,6 @@ export default function TemplatePartEdit( {
 				? navigationBlocksInTemplatePart[ 0 ]
 				: null;
 
-			// Get block editing mode for the current block
-			const _blockEditingMode =
-				select( blockEditorStore ).getBlockEditingMode( clientId );
-
 			return {
 				hasInnerBlocks: getBlockCount( clientId ) > 0,
 				isResolved: hasResolvedEntity,
@@ -205,7 +200,6 @@ export default function TemplatePartEdit( {
 				canUserEdit: !! _canUserEdit,
 				hasNavigationBlocks: _hasNavigationBlocks,
 				firstNavigationBlockId: _firstNavigationBlockId,
-				blockEditingMode: _blockEditingMode,
 			};
 		},
 		[ templatePartId, attributes.area, clientId ]
@@ -303,7 +297,7 @@ export default function TemplatePartEdit( {
 							</ToolbarButton>
 						</BlockControls>
 					) }
-				{ hasNavigationBlocks && blockEditingMode === 'contentOnly' && (
+				{ hasNavigationBlocks && (
 					<BlockControls group="other">
 						<ToolbarButton
 							label={ __( 'Edit navigation' ) }

packages/block-library/src/template-part/edit/inner-blocks.js

@@ -100,9 +100,35 @@ function EditableTemplatePartInnerBlocks( {
 	tagName: TagName,
 	blockProps,
 } ) {
-	const onNavigateToEntityRecord = useSelect(
-		( select ) =>
-			select( blockEditorStore ).getSettings().onNavigateToEntityRecord,
+	const { onNavigateToEntityRecord, isNavigationContext } = useSelect(
+		( select ) => {
+			const {
+				getSelectedBlockClientId,
+				getBlockName,
+				getBlockParentsByBlockName,
+			} = select( blockEditorStore );
+			const selectedBlockId = getSelectedBlockClientId();
+			const selectedBlockName =
+				selectedBlockId && getBlockName( selectedBlockId );
+
+			// Check if selected block is a Navigation block or a descendant of one
+			const navigationParents = getBlockParentsByBlockName(
+				selectedBlockId,
+				'core/navigation',
+				true
+			);
+			const isDescendantOfNavigation = navigationParents.length > 0;
+			const isNavigationBlock = selectedBlockName === 'core/navigation';
+			const isInNavigationContext =
+				isNavigationBlock || isDescendantOfNavigation;
+
+			return {
+				onNavigateToEntityRecord:
+					select( blockEditorStore ).getSettings()
+						.onNavigateToEntityRecord,
+				isNavigationContext: isInNavigationContext,
+			};
+		},
 		[]
 	);
 
@@ -123,13 +149,16 @@ function EditableTemplatePartInnerBlocks( {
 	const blockEditingMode = useBlockEditingMode();
 
 	const customProps =
-		blockEditingMode === 'contentOnly' && onNavigateToEntityRecord
+		blockEditingMode === 'contentOnly' &&
+		onNavigateToEntityRecord &&
+		! isNavigationContext
 			? {
-					onDoubleClick: () =>
+					onDoubleClick: () => {
 						onNavigateToEntityRecord( {
 							postId: id,
 							postType: 'wp_template_part',
-						} ),
+						} );
+					},
 			  }
 			: {};