From bbc8030e09d9703190951efe9acb7cf9090bef87 Mon Sep 17 00:00:00 2001
From: Andrei Draganescu <andrei.draganescu@automattic.com>
Date: Wed, 6 Nov 2024 20:14:44 +0200
Subject: [PATCH] remove behavior from design mode

---
 .../src/components/block-inspector/index.js      | 16 ++++++++++++++++
 packages/block-editor/src/store/selectors.js     |  8 ++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/packages/block-editor/src/components/block-inspector/index.js b/packages/block-editor/src/components/block-inspector/index.js
index dfc7fae4788319..e4eb91e1fc5a7d 100644
--- a/packages/block-editor/src/components/block-inspector/index.js
+++ b/packages/block-editor/src/components/block-inspector/index.js
@@ -262,6 +262,8 @@ const BlockInspectorSingleBlock = ( {
 				),
 			};
 		} );
+	const { __unstableGetEditorMode } = useSelect( blockEditorStore );
+	const editorMode = __unstableGetEditorMode();
 
 	return (
 		<div className="block-editor-block-inspector">
@@ -311,6 +313,20 @@ const BlockInspectorSingleBlock = ( {
 
 					{ ! isSectionBlock && (
 						<>
+							{ editorMode === 'navigation' &&
+								isSelectedContentClientIdControlling && (
+									<PanelBody title={ __( 'Content' ) }>
+										<PrivateListView
+											rootClientId={
+												selectedContentClientId
+											}
+											ignoreRenderingMode
+											isExpanded
+											description={ __( 'Inner blocks' ) }
+											showAppender={ false }
+										/>
+									</PanelBody>
+								) }
 							<InspectorControls.Slot />
 							<InspectorControls.Slot group="list" />
 							<InspectorControls.Slot
diff --git a/packages/block-editor/src/store/selectors.js b/packages/block-editor/src/store/selectors.js
index 82821706a74fb2..bfaf572f71ed99 100644
--- a/packages/block-editor/src/store/selectors.js
+++ b/packages/block-editor/src/store/selectors.js
@@ -3046,10 +3046,6 @@ export const getBlockEditingMode = createRegistrySelector(
 				clientId = '';
 			}
 
-			if ( areInnerBlocksControlled( state, clientId ) ) {
-				return 'contentOnly';
-			}
-
 			// In zoom-out mode, override the behavior set by
 			// __unstableSetBlockEditingMode to only allow editing the top-level
 			// sections.
@@ -3079,6 +3075,10 @@ export const getBlockEditingMode = createRegistrySelector(
 			if ( editorMode === 'navigation' ) {
 				const sectionRootClientId = getSectionRootClientId( state );
 
+				if ( areInnerBlocksControlled( state, clientId ) ) {
+					return 'contentOnly';
+				}
+
 				// The root section is "default mode"
 				if ( clientId === sectionRootClientId ) {
 					return 'default';