Ensure global inserter always targets root nav block

WordPress · Sep 9, 2021 · 4a35407 · 4a35407
1 parent 966781e
commit 4a35407
Showing 1 changed file with 18 additions and 7 deletions.
diff --git a/packages/edit-navigation/src/components/secondary-sidebar/inserter-sidebar.js b/packages/edit-navigation/src/components/secondary-sidebar/inserter-sidebar.js
@@ -23,13 +23,19 @@ function InserterSidebar() {
 
 	const { clientId: navBlockClientId } = useNavigationEditorRootBlock();
 
-	const { hasInserterItems } = useSelect( ( select ) => {
-		return {
-			hasInserterItems: select( blockEditorStore ).hasInserterItems(
-				navBlockClientId
-			),
-		};
-	}, [] );
+	const { hasInserterItems, selectedBlockClientId } = useSelect(
+		( select ) => {
+			return {
+				hasInserterItems: select( blockEditorStore ).hasInserterItems(
+					navBlockClientId
+				),
+				selectedBlockClientId: select(
+					blockEditorStore
+				).getSelectedBlock()?.clientId,
+			};
+		},
+		[]
+	);
 
 	const { setIsInserterOpened } = useDispatch( editNavigationStore );
 
@@ -51,6 +57,11 @@ function InserterSidebar() {
 				<Library
 					shouldFocusBlock={ isMobileViewport }
 					rootClientId={ navBlockClientId }
+					clientId={
+						navBlockClientId === selectedBlockClientId
+							? navBlockClientId
+							: undefined
+					}
 					showInserterHelpPanel={ SHOW_PREVIEWS }
 				/>
 			</div>