Only select block if there isn't any already

WordPress · May 11, 2023 · 0dc67e8 · 0dc67e8
1 parent 0142fc1
commit 0dc67e8
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/packages/block-editor/src/components/list-view/block.js b/packages/block-editor/src/components/list-view/block.js
@@ -77,6 +77,7 @@ function ListViewBlock( {
 		},
 		[ isContentLocked, clientId, isSelected ]
 	);
+	const { getSelectedBlockClientIds } = useSelect( blockEditorStore );
 
 	const canExpand = isContentLocked ? false : canEdit;
 	const isFirstSelectedBlock =
@@ -175,7 +176,11 @@ function ListViewBlock( {
 
 	const updateSelection = useCallback(
 		( newClientId ) => {
-			selectBlock( undefined, newClientId, null, null );
+			const selectedBlockClientIds = getSelectedBlockClientIds();
+			// Select the block to be focused if there isn't any block selected.
+			if ( ! selectedBlockClientIds.length ) {
+				selectBlock( undefined, newClientId, null, null );
+			}
 
 			const getFocusElement = () => {
 				const row = treeGridElementRef.current?.querySelector(