From 4d4288276d4bf4e1ccc4c8a57a7dc8c2162764e8 Mon Sep 17 00:00:00 2001
From: Andrei Draganescu <andrei.draganescu@automattic.com>
Date: Fri, 3 Feb 2023 15:39:24 +0200
Subject: [PATCH] try maing the inserter always visible

---
 .../components/header/header-toolbar/index.js | 67 ++++++++++++-------
 .../edit-post/src/components/header/index.js  | 40 ++++++-----
 2 files changed, 64 insertions(+), 43 deletions(-)

diff --git a/packages/edit-post/src/components/header/header-toolbar/index.js b/packages/edit-post/src/components/header/header-toolbar/index.js
index 55ffd265a96cfa..14c344b51a1f03 100644
--- a/packages/edit-post/src/components/header/header-toolbar/index.js
+++ b/packages/edit-post/src/components/header/header-toolbar/index.js
@@ -28,7 +28,12 @@ const preventDefault = ( event ) => {
 	event.preventDefault();
 };
 
-function HeaderToolbar() {
+function HeaderToolbar( {
+	showInserter = true,
+	showTools = true,
+	showListView = true,
+	showUndoRedo = true,
+} ) {
 	const inserterButton = useRef();
 	const { setIsInserterOpened, setIsListViewOpened } =
 		useDispatch( editPostStore );
@@ -116,22 +121,24 @@ function HeaderToolbar() {
 			aria-label={ toolbarAriaLabel }
 		>
 			<div className="edit-post-header-toolbar__left">
-				<ToolbarItem
-					ref={ inserterButton }
-					as={ Button }
-					className="edit-post-header-toolbar__inserter-toggle"
-					variant="primary"
-					isPressed={ isInserterOpened }
-					onMouseDown={ preventDefault }
-					onClick={ toggleInserter }
-					disabled={ ! isInserterEnabled }
-					icon={ plus }
-					label={ showIconLabels ? shortLabel : longLabel }
-					showTooltip={ ! showIconLabels }
-				/>
+				{ showInserter && (
+					<ToolbarItem
+						ref={ inserterButton }
+						as={ Button }
+						className="edit-post-header-toolbar__inserter-toggle"
+						variant="primary"
+						isPressed={ isInserterOpened }
+						onMouseDown={ preventDefault }
+						onClick={ toggleInserter }
+						disabled={ ! isInserterEnabled }
+						icon={ plus }
+						label={ showIconLabels ? shortLabel : longLabel }
+						showTooltip={ ! showIconLabels }
+					/>
+				) }
 				{ ( isWideViewport || ! showIconLabels ) && (
 					<>
-						{ isLargeViewport && (
+						{ showTools && isLargeViewport && (
 							<ToolbarItem
 								as={ ToolSelector }
 								showTooltip={ ! showIconLabels }
@@ -141,17 +148,25 @@ function HeaderToolbar() {
 								disabled={ isTextModeEnabled }
 							/>
 						) }
-						<ToolbarItem
-							as={ EditorHistoryUndo }
-							showTooltip={ ! showIconLabels }
-							variant={ showIconLabels ? 'tertiary' : undefined }
-						/>
-						<ToolbarItem
-							as={ EditorHistoryRedo }
-							showTooltip={ ! showIconLabels }
-							variant={ showIconLabels ? 'tertiary' : undefined }
-						/>
-						{ overflowItems }
+						{ showUndoRedo && (
+							<>
+								<ToolbarItem
+									as={ EditorHistoryUndo }
+									showTooltip={ ! showIconLabels }
+									variant={
+										showIconLabels ? 'tertiary' : undefined
+									}
+								/>
+								<ToolbarItem
+									as={ EditorHistoryRedo }
+									showTooltip={ ! showIconLabels }
+									variant={
+										showIconLabels ? 'tertiary' : undefined
+									}
+								/>
+							</>
+						) }
+						{ showListView && overflowItems }
 					</>
 				) }
 			</div>
diff --git a/packages/edit-post/src/components/header/index.js b/packages/edit-post/src/components/header/index.js
index 4acde8373aa748..aab32c0244355e 100644
--- a/packages/edit-post/src/components/header/index.js
+++ b/packages/edit-post/src/components/header/index.js
@@ -41,9 +41,9 @@ function Header( { setEntitiesSavedStatesCallback } ) {
 		const _selectedBlockClientIds = getSelectedBlockClientIds();
 		const parents =
 			_selectedBlockClientIds?.length === 1
-				? getBlockParents( _selectedBlockClientIds )
+				? getBlockParents( _selectedBlockClientIds[ 0 ] )
 				: [];
-		const _firstParentClientId = parents[ parents.length - 1 ];
+		const hasParent = parents.length > 0;
 		return {
 			hasSelectedBlocks: !! _selectedBlockClientIds.length,
 			hasActiveMetaboxes: select( editPostStore ).hasMetaBoxes(),
@@ -55,9 +55,9 @@ function Header( { setEntitiesSavedStatesCallback } ) {
 			isDistractionFreeMode:
 				select( editPostStore ).isFeatureActive( 'distractionFree' ),
 			hasFixedToolbar: settings.hasFixedToolbar,
-			firstParentClientId: _firstParentClientId,
+			firstParentClientId: hasParent,
 		};
-	}, [] );
+	} );
 
 	const isDistractionFree = isDistractionFreeMode && isLargeViewport;
 
@@ -88,19 +88,25 @@ function Header( { setEntitiesSavedStatesCallback } ) {
 			>
 				{ ! hasFixedToolbar && <HeaderToolbar /> }
 				{ ! hasSelectedBlocks && hasFixedToolbar && <HeaderToolbar /> }
-				{ hasFixedToolbar && (
-					<div
-						style={
-							firstParentClientId
-								? {
-										position: 'relative',
-										left: '70px',
-								  }
-								: {}
-						}
-					>
-						<BlockToolbar hideDragHandle={ hasFixedToolbar } />
-					</div>
+				{ hasSelectedBlocks && hasFixedToolbar && (
+					<>
+						<HeaderToolbar
+							showInserter={ true }
+							showTools={ false }
+							showListView={ false }
+							showUndoRedo={ false }
+						/>
+						<div
+							style={ {
+								display: 'flex',
+								width: '100%',
+								position: 'relative',
+								left: firstParentClientId ? '60px' : '0',
+							} }
+						>
+							<BlockToolbar hideDragHandle={ hasFixedToolbar } />
+						</div>
+					</>
 				) }
 				<TemplateTitle />
 			</motion.div>