Fix inserter position

WordPress · Oct 23, 2024 · 16052f9 · 16052f9
1 parent b33cdf3
commit 16052f9
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/packages/block-editor/src/components/block-tools/zoom-out-mode-inserters.js b/packages/block-editor/src/components/block-tools/zoom-out-mode-inserters.js
@@ -15,24 +15,29 @@ import { unlock } from '../../lock-unlock';
 function ZoomOutModeInserters() {
 	const [ isReady, setIsReady ] = useState( false );
 	const {
-		hasSelection,
+		selectedSectionClientId,
 		blockOrder,
 		setInserterIsOpened,
 		sectionRootClientId,
-		selectedBlockClientId,
 	} = useSelect( ( select ) => {
 		const {
 			getSettings,
 			getBlockOrder,
-			getSelectionStart,
 			getSelectedBlockClientId,
 			getSectionRootClientId,
+			isSectionBlock,
+			getParentSectionBlock,
 		} = unlock( select( blockEditorStore ) );
 
 		const root = getSectionRootClientId();
+		const selectionBlockClientId = getSelectedBlockClientId();
+		const _selectedSectionClientId =
+			! selectionBlockClientId || isSectionBlock( selectionBlockClientId )
+				? selectionBlockClientId
+				: getParentSectionBlock( selectionBlockClientId );
 
 		return {
-			hasSelection: !! getSelectionStart().clientId,
+			selectedSectionClientId: _selectedSectionClientId,
 			blockOrder: getBlockOrder( root ),
 			sectionRootClientId: root,
 			setInserterIsOpened:
@@ -54,13 +59,13 @@ function ZoomOutModeInserters() {
 		};
 	}, [] );
 
-	if ( ! isReady || ! hasSelection ) {
+	if ( ! isReady || ! selectedSectionClientId ) {
 		return null;
 	}
 
-	const previousClientId = selectedBlockClientId;
+	const previousClientId = selectedSectionClientId;
 	const index = blockOrder.findIndex(
-		( clientId ) => selectedBlockClientId === clientId
+		( clientId ) => selectedSectionClientId === clientId
 	);
 	const nextClientId = blockOrder[ index + 1 ];