From 904f02af296744543867a07e547f83b64c644933 Mon Sep 17 00:00:00 2001
From: Daniel Richards <daniel.richards@automattic.com>
Date: Wed, 24 Apr 2024 14:27:10 +0800
Subject: [PATCH] Fix bugs

---
 .../src/components/block-card/index.js        | 85 +++++++++++--------
 .../src/components/block-inspector/index.js   |  1 -
 .../block-quick-navigation/index.js           |  2 +-
 3 files changed, 49 insertions(+), 39 deletions(-)

diff --git a/packages/block-editor/src/components/block-card/index.js b/packages/block-editor/src/components/block-card/index.js
index 46b0b908cd7a1..72103a6a3219b 100644
--- a/packages/block-editor/src/components/block-card/index.js
+++ b/packages/block-editor/src/components/block-card/index.js
@@ -21,6 +21,7 @@ import { useSelect, useDispatch } from '@wordpress/data';
 import BlockIcon from '../block-icon';
 import { store as blockEditorStore } from '../../store';
 import useBlockDisplayInformation from '../use-block-display-information';
+import { unlock } from '../../lock-unlock';
 
 function BlockCard( { title, icon, description, blockType, className } ) {
 	if ( blockType ) {
@@ -31,52 +32,62 @@ function BlockCard( { title, icon, description, blockType, className } ) {
 		( { title, icon, description } = blockType );
 	}
 
-	const parentClientId = useSelect( ( select ) => {
-		const {
-			getSelectedBlockClientId,
-			getBlockParentsByBlockName,
-			__unstableGetContentLockingParent,
-		} = select( blockEditorStore );
+	const { isParentNavigationBlock, parentClientId } = useSelect(
+		( select ) => {
+			const {
+				getSelectedBlockClientId,
+				getBlockParentsByBlockName,
+				getContentLockingParent,
+			} = unlock( select( blockEditorStore ) );
 
-		const _selectedBlockClientId = getSelectedBlockClientId();
-		let _parentClientId = getBlockParentsByBlockName(
-			_selectedBlockClientId,
-			'core/navigation',
-			true
-		)[ 0 ];
+			const _selectedBlockClientId = getSelectedBlockClientId();
 
-		if ( ! _parentClientId ) {
-			_parentClientId = __unstableGetContentLockingParent(
-				_selectedBlockClientId
-			);
-		}
+			let _parentClientId = getBlockParentsByBlockName(
+				_selectedBlockClientId,
+				'core/navigation',
+				true
+			)[ 0 ];
+			const _isParentNavigationBlock = !! _parentClientId;
 
-		return _parentClientId;
-	}, [] );
+			if ( ! _parentClientId ) {
+				_parentClientId = getContentLockingParent(
+					_selectedBlockClientId
+				);
+			}
+
+			return {
+				isParentNavigationBlock: _isParentNavigationBlock,
+				parentClientId: _parentClientId,
+			};
+		},
+		[]
+	);
 	const parentDisplayInfo = useBlockDisplayInformation( parentClientId );
 	const contentOnlyFills = useSlotFills( 'InspectorControlsContentOnly' );
 	const { selectBlock } = useDispatch( blockEditorStore );
+	const hasParentBackArrow =
+		isParentNavigationBlock ||
+		( parentClientId && !! contentOnlyFills?.length );
 
 	return (
 		<div className={ classnames( 'block-editor-block-card', className ) }>
-			{ !! contentOnlyFills?.length &&
-				parentClientId && ( // This is only used by the Navigation block for now. It's not ideal having Navigation block specific code here.
-					<Button
-						onClick={ () => selectBlock( parentClientId ) }
-						label={ sprintf(
-							// translators: %s: the block title of the parent.
-							__( 'Go to parent: %s' ),
-							parentDisplayInfo?.title
-						) }
-						style={
-							// TODO: This style override is also used in ToolsPanelHeader.
-							// It should be supported out-of-the-box by Button.
-							{ minWidth: 24, padding: 0 }
-						}
-						icon={ isRTL() ? chevronRight : chevronLeft }
-						size="small"
-					/>
-				) }
+			{ hasParentBackArrow && ( // This is only used by the Navigation block for now. It's not ideal having Navigation block specific code here.
+				<Button
+					onClick={ () => selectBlock( parentClientId ) }
+					label={ sprintf(
+						// translators: %s: the block title of the parent.
+						__( 'Go to parent: %s' ),
+						parentDisplayInfo?.title
+					) }
+					style={
+						// TODO: This style override is also used in ToolsPanelHeader.
+						// It should be supported out-of-the-box by Button.
+						{ minWidth: 24, padding: 0 }
+					}
+					icon={ isRTL() ? chevronRight : chevronLeft }
+					size="small"
+				/>
+			) }
 			<BlockIcon icon={ icon } showColors />
 			<div className="block-editor-block-card__content">
 				<h2 className="block-editor-block-card__title">{ title }</h2>
diff --git a/packages/block-editor/src/components/block-inspector/index.js b/packages/block-editor/src/components/block-inspector/index.js
index e49709bb51d10..90e62423b07c8 100644
--- a/packages/block-editor/src/components/block-inspector/index.js
+++ b/packages/block-editor/src/components/block-inspector/index.js
@@ -36,7 +36,6 @@ import useBlockInspectorAnimationSettings from './useBlockInspectorAnimationSett
 import BlockInfo from '../block-info-slot-fill';
 import BlockQuickNavigation from '../block-quick-navigation';
 import { useBorderPanelLabel } from '../../hooks/border';
-import { unlock } from '../../lock-unlock';
 
 function BlockInspectorContentLockedUI( {
 	clientId,
diff --git a/packages/block-editor/src/components/block-quick-navigation/index.js b/packages/block-editor/src/components/block-quick-navigation/index.js
index 8ed0d1840e583..7b8a64791dd7b 100644
--- a/packages/block-editor/src/components/block-quick-navigation/index.js
+++ b/packages/block-editor/src/components/block-quick-navigation/index.js
@@ -36,7 +36,7 @@ export default function BlockQuickNavigation( {
 				<BlockQuickNavigationItem
 					key={ clientId }
 					clientId={ clientId }
-					hasControls={ clientIdsWithControls.includes( clientId ) }
+					hasControls={ clientIdsWithControls?.includes( clientId ) }
 				/>
 			) ) }
 		</VStack>