Enable movers only in nav block block navigator

WordPress · Oct 18, 2019 · f1d13f3 · f1d13f3
1 parent c545b22
commit f1d13f3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/packages/block-editor/src/components/block-navigation/list.js b/packages/block-editor/src/components/block-navigation/list.js
@@ -45,7 +45,10 @@ export default function BlockNavigationList( {
 	selectedBlockClientId,
 	selectBlock,
 	showNestedBlocks,
+	showMovers,
 } ) {
+	const hasMovers = showMovers && blocks.length > 1;
+
 	return (
 		/*
 		 * Disable reason: The `list` ARIA role is redundant but
@@ -70,14 +73,15 @@ export default function BlockNavigationList( {
 								{ getBlockDisplayName( blockType, block.attributes ) }
 								{ isSelected && <span className="screen-reader-text">{ __( '(selected block)' ) }</span> }
 							</Button>
-							{ blocks.length > 1 && ( <BlockMover clientIds={ [ block.clientId ] } /> ) }
+							{ hasMovers && ( <BlockMover clientIds={ [ block.clientId ] } /> ) }
 						</div>
 						{ showNestedBlocks && !! block.innerBlocks && !! block.innerBlocks.length && (
 							<BlockNavigationList
 								blocks={ block.innerBlocks }
 								selectedBlockClientId={ selectedBlockClientId }
 								selectBlock={ selectBlock }
 								showNestedBlocks
+								showMovers
 							/>
 						) }
 					</li>

diff --git a/packages/block-library/src/navigation-menu/use-block-navigator.js b/packages/block-library/src/navigation-menu/use-block-navigator.js
@@ -69,6 +69,7 @@ export default function useBlockNavigator( clientId ) {
 				selectedBlockClientId={ selectedBlockClientId }
 				selectBlock={ selectBlock }
 				showNestedBlocks
+				showMovers
 			/>
 		</Modal>
 	);