Only show chevrons for pages and posts in the navigation menu, as the…

…se are the only items that will have a submenu in the navigation site editor menu.
WordPress · May 1, 2023 · 5e0994a · 5e0994a
1 parent 39b24dc
commit 5e0994a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/packages/block-editor/src/components/off-canvas-editor/block-select-button.js b/packages/block-editor/src/components/off-canvas-editor/block-select-button.js
@@ -70,6 +70,10 @@ function ListViewBlockSelectButton(
 		  )
 		: __( 'Edit' );
 
+	const hasChevron = [ 'core/navigation-submenu', 'post', 'page' ].includes(
+		blockInformation.name
+	);
+
 	return (
 		<>
 			<Button
@@ -119,11 +123,13 @@ function ListViewBlockSelectButton(
 							<Icon icon={ lock } />
 						</span>
 					) }
-					<Icon
-						icon={ chevronRightSmall }
-						className="block-editor-list-view-block-select-button__drilldown-indicator"
-						size={ 24 }
-					/>
+					{ hasChevron && (
+						<Icon
+							icon={ chevronRightSmall }
+							className="block-editor-list-view-block-select-button__drilldown-indicator"
+							size={ 24 }
+						/>
+					) }
 				</HStack>
 			</Button>
 		</>

diff --git a/packages/block-editor/src/components/use-block-display-information/index.js b/packages/block-editor/src/components/use-block-display-information/index.js
@@ -57,12 +57,14 @@ export default function useBlockDisplayInformation( clientId ) {
 			const match = getActiveBlockVariation( blockName, attributes );
 			const isSynced =
 				isReusableBlock( blockType ) || isTemplatePart( blockType );
+
 			const blockTypeInfo = {
 				isSynced,
 				title: blockType.title,
 				icon: blockType.icon,
 				description: blockType.description,
 				anchor: attributes?.anchor,
+				name: blockType.name,
 			};
 			if ( ! match ) return blockTypeInfo;
 
@@ -72,6 +74,7 @@ export default function useBlockDisplayInformation( clientId ) {
 				icon: match.icon || blockType.icon,
 				description: match.description || blockType.description,
 				anchor: attributes?.anchor,
+				name: match.name || blockType.name,
 			};
 		},
 		[ clientId ]