From 3f09ea7208bbb897c21c9c191c5f051f6683c025 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Thu, 14 Aug 2025 17:13:41 +0100
Subject: [PATCH 1/2] Hide 'Add block' control when Navigation Link block is in
 contentOnly mode

- Import useBlockEditingMode hook from @wordpress/block-editor
- Check if block is in contentOnly mode using useBlockEditingMode()
- Conditionally render LinkUITools only when not in contentOnly mode
- Improves UX by hiding non-content UI when appropriate
---
 packages/block-library/src/navigation-link/link-ui.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/block-library/src/navigation-link/link-ui.js b/packages/block-library/src/navigation-link/link-ui.js
index 47a8cb99ffdb24..31bf6cbcebda51 100644
--- a/packages/block-library/src/navigation-link/link-ui.js
+++ b/packages/block-library/src/navigation-link/link-ui.js
@@ -13,6 +13,7 @@ import {
 	LinkControl,
 	store as blockEditorStore,
 	privateApis as blockEditorPrivateApis,
+	useBlockEditingMode,
 } from '@wordpress/block-editor';
 import {
 	createInterpolateElement,
@@ -157,6 +158,10 @@ function UnforwardedLinkUI( props, ref ) {
 		name: postType,
 	} );
 
+	// Check if we're in contentOnly mode
+	const blockEditingMode = useBlockEditingMode();
+	const isContentOnlyMode = blockEditingMode === 'contentOnly';
+
 	async function handleCreate( pageTitle ) {
 		const page = await saveEntityRecord( 'postType', postType, {
 			title: pageTitle,
@@ -261,7 +266,8 @@ function UnforwardedLinkUI( props, ref ) {
 						onRemove={ props.onRemove }
 						onCancel={ props.onCancel }
 						renderControlBottom={ () =>
-							! link?.url?.length && (
+							! link?.url?.length &&
+							! isContentOnlyMode && (
 								<LinkUITools
 									focusAddBlockButton={ focusAddBlockButton }
 									setAddingBlock={ () => {

From a6776a031c34ae74cfa2f52cecb05f86acc8e883 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Mon, 1 Sep 2025 10:27:52 +0100
Subject: [PATCH 2/2] Adjust editing mode check

---
 packages/block-library/src/navigation-link/link-ui.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/block-library/src/navigation-link/link-ui.js b/packages/block-library/src/navigation-link/link-ui.js
index 31bf6cbcebda51..f5f3e6ae5b3cf8 100644
--- a/packages/block-library/src/navigation-link/link-ui.js
+++ b/packages/block-library/src/navigation-link/link-ui.js
@@ -160,7 +160,7 @@ function UnforwardedLinkUI( props, ref ) {
 
 	// Check if we're in contentOnly mode
 	const blockEditingMode = useBlockEditingMode();
-	const isContentOnlyMode = blockEditingMode === 'contentOnly';
+	const isDefaultBlockEditingMode = blockEditingMode === 'default';
 
 	async function handleCreate( pageTitle ) {
 		const page = await saveEntityRecord( 'postType', postType, {
@@ -267,7 +267,7 @@ function UnforwardedLinkUI( props, ref ) {
 						onCancel={ props.onCancel }
 						renderControlBottom={ () =>
 							! link?.url?.length &&
-							! isContentOnlyMode && (
+							isDefaultBlockEditingMode && (
 								<LinkUITools
 									focusAddBlockButton={ focusAddBlockButton }
 									setAddingBlock={ () => {