Only try to expand nested branch items where there are parent ids

WordPress · Jan 7, 2022 · 4fb80fe · 4fb80fe
1 parent 3e337c3
commit 4fb80fe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/packages/block-editor/src/components/list-view/index.js b/packages/block-editor/src/components/list-view/index.js
@@ -184,7 +184,11 @@ function ListView(
 	// for example, in the Block Editor,
 	// try to expand the block list tree.
 	useEffect( () => {
-		if ( ! hasFocus ) {
+		if (
+			! hasFocus &&
+			Array.isArray( selectedBlockParentClientIds ) &&
+			selectedBlockParentClientIds.length
+		) {
 			setExpandedState( {
 				type: 'expand',
 				clientIds: selectedBlockParentClientIds,

diff --git a/packages/block-editor/src/components/list-view/use-list-view-client-ids.js b/packages/block-editor/src/components/list-view/use-list-view-client-ids.js
@@ -16,7 +16,6 @@ export default function useListViewClientIds( blocks ) {
 				getDraggedBlockClientIds,
 				getSelectedBlockClientIds,
 				__unstableGetClientIdsTree,
-				getSelectedBlockClientIds,
 				getBlockParents,
 			} = select( blockEditorStore );
 			const selectedBlockClientIds = getSelectedBlockClientIds();