Avoid showing Edit buttons on template part and synced pattern block …

…toolbars when in Write Mode
WordPress · Dec 24, 2024 · d1d7d62 · d1d7d62
1 parent a9ebf69
commit d1d7d62
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/packages/block-library/src/block/edit.js b/packages/block-library/src/block/edit.js
@@ -111,19 +111,24 @@ function ReusableBlockControl( {
 	handleEditOriginal,
 	resetContent,
 } ) {
-	const canUserEdit = useSelect(
-		( select ) =>
-			!! select( coreStore ).canUser( 'update', {
-				kind: 'postType',
-				name: 'wp_block',
-				id: recordId,
-			} ),
+	const { canUserEdit, isNavigationMode } = useSelect(
+		( select ) => {
+			const { canUser } = select( coreStore );
+			return {
+				canUserEdit: !! canUser( 'update', {
+					kind: 'postType',
+					name: 'wp_block',
+					id: recordId,
+				} ),
+				isNavigationMode: select( blockEditorStore ).isNavigationMode(),
+			};
+		},
 		[ recordId ]
 	);
 
 	return (
 		<>
-			{ canUserEdit && !! handleEditOriginal && (
+			{ canUserEdit && ! isNavigationMode && !! handleEditOriginal && (
 				<BlockControls>
 					<ToolbarGroup>
 						<ToolbarButton onClick={ handleEditOriginal }>

diff --git a/packages/block-library/src/template-part/edit/index.js b/packages/block-library/src/template-part/edit/index.js
@@ -126,11 +126,16 @@ export default function TemplatePartEdit( {
 		onNavigateToEntityRecord,
 		title,
 		canUserEdit,
+		isNavigationMode,
 	} = useSelect(
 		( select ) => {
 			const { getEditedEntityRecord, hasFinishedResolution } =
 				select( coreStore );
-			const { getBlockCount, getSettings } = select( blockEditorStore );
+			const {
+				getBlockCount,
+				getSettings,
+				isNavigationMode: _isNavigationMode,
+			} = select( blockEditorStore );
 
 			const getEntityArgs = [
 				'postType',
@@ -168,6 +173,7 @@ export default function TemplatePartEdit( {
 					getSettings().onNavigateToEntityRecord,
 				title: entityRecord?.title,
 				canUserEdit: !! _canUserEdit,
+				isNavigationMode: _isNavigationMode(),
 			};
 		},
 		[ templatePartId, attributes.area, clientId ]
@@ -236,6 +242,7 @@ export default function TemplatePartEdit( {
 		<>
 			<RecursionProvider uniqueId={ templatePartId }>
 				{ isEntityAvailable &&
+					! isNavigationMode &&
 					onNavigateToEntityRecord &&
 					canUserEdit && (
 						<BlockControls group="other">