Block Tools: Don't render inserter in Zoom Out Dropzone when text is visible

docs/reference-guides/data/data-core-block-editor.md

@@ -1227,6 +1227,18 @@ _Returns_
 
 -   `?boolean`: Whether the template is valid or not.
 
+### showZoomOutModeInserter
+
+Returns whether the zoom out mode inserter is enabled or not.
+
+_Parameters_
+
+-   _state_ `Object`: Global application state.
+
+_Returns_
+
+-   `boolean`: Whether the drop pattern is enabled or not.
+
 ### wasBlockJustInserted
 
 Tells if the block with the passed clientId was just inserted.
@@ -1721,6 +1733,18 @@ _Parameters_
 
 -   _isNavigationMode_ `boolean`: Enable/Disable navigation mode.
 
+### setShowZoomOutModeInserter
+
+Action that shows the zoom out mode inserter.
+
+_Parameters_
+
+-   _showZoomOutModeInserter_ `boolean`: show the zoom out mode inserter.
+
+_Returns_
+
+-   `Object`: Action object.
+
 ### setTemplateValidity
 
 Action that resets the template validity.

packages/block-editor/src/components/block-list/zoom-out-separator.js

@@ -11,8 +11,8 @@ import {
 	__unstableAnimatePresence as AnimatePresence,
 } from '@wordpress/components';
 import { useReducedMotion } from '@wordpress/compose';
-import { useSelect } from '@wordpress/data';
-import { useState } from '@wordpress/element';
+import { useDispatch, useSelect } from '@wordpress/data';
+import { useState, useEffect } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 
 /**
@@ -21,6 +21,80 @@ import { __ } from '@wordpress/i18n';
 import { store as blockEditorStore } from '../../store';
 import { unlock } from '../../lock-unlock';
 
+const useRenderDropZone = ( {
+	position,
+	insertionPoint,
+	blockInsertionPointVisible,
+	blockInsertionPoint,
+	clientId,
+	sectionClientIds,
+	selectedBlockIds,
+} ) => {
+	const [ isVisible, setIsVisible ] = useState( false );
+	const { setShowZoomOutModeInserter } = useDispatch( blockEditorStore );
+
+	useEffect( () => {
+		const hasTopInsertionPoint =
+			insertionPoint?.index === 0 &&
+			clientId === sectionClientIds[ insertionPoint.index ];
+		const hasBottomInsertionPoint =
+			insertionPoint &&
+			insertionPoint.hasOwnProperty( 'index' ) &&
+			clientId === sectionClientIds[ insertionPoint.index - 1 ];
+
+		let visibility = false;
+		let selectedBlockId = null;
+
+		if ( position === 'top' ) {
+			visibility =
+				hasTopInsertionPoint ||
+				( blockInsertionPointVisible &&
+					blockInsertionPoint.index === 0 &&
+					clientId ===
+						sectionClientIds[ blockInsertionPoint.index ] );
+			selectedBlockId =
+				sectionClientIds[
+					hasTopInsertionPoint
+						? insertionPoint.index
+						: blockInsertionPoint.index
+				];
+		}
+
+		if ( position === 'bottom' ) {
+			visibility =
+				hasBottomInsertionPoint ||
+				( blockInsertionPointVisible &&
+					clientId ===
+						sectionClientIds[ blockInsertionPoint.index - 1 ] );
+			selectedBlockId =
+				sectionClientIds[
+					hasBottomInsertionPoint
+						? insertionPoint.index - 1
+						: blockInsertionPoint.index - 1
+				];
+		}
+
+		if ( visibility ) {
+			setShowZoomOutModeInserter(
+				! selectedBlockIds.includes( selectedBlockId )
+			);
+		}
+
+		setIsVisible( visibility );
+	}, [
+		position,
+		insertionPoint,
+		blockInsertionPointVisible,
+		blockInsertionPoint,
+		clientId,
+		sectionClientIds,
+		selectedBlockIds,
+		setShowZoomOutModeInserter,
+	] );
+
+	return isVisible;
+};
+
 export function ZoomOutSeparator( {
 	clientId,
 	rootClientId = '',
@@ -33,11 +107,13 @@ export function ZoomOutSeparator( {
 		insertionPoint,
 		blockInsertionPointVisible,
 		blockInsertionPoint,
+		selectedBlockIds,
 	} = useSelect( ( select ) => {
 		const {
 			getInsertionPoint,
 			getBlockOrder,
 			getSectionRootClientId,
+			getSelectedBlockClientIds,
 			isBlockInsertionPointVisible,
 			getBlockInsertionPoint,
 		} = unlock( select( blockEditorStore ) );
@@ -51,50 +127,33 @@ export function ZoomOutSeparator( {
 			insertionPoint: getInsertionPoint(),
 			blockInsertionPoint: getBlockInsertionPoint(),
 			blockInsertionPointVisible: isBlockInsertionPointVisible(),
+			selectedBlockIds: getSelectedBlockClientIds(),
 		};
 	}, [] );
 
-	const isReducedMotion = useReducedMotion();
-
-	if ( ! clientId ) {
-		return;
-	}
-
-	let isVisible = false;
+	const isVisible = useRenderDropZone( {
+		position,
+		insertionPoint,
+		blockInsertionPointVisible,
+		blockInsertionPoint,
+		clientId,
+		sectionClientIds,
+		selectedBlockIds,
+	} );
 
 	const isSectionBlock =
 		rootClientId === sectionRootClientId &&
 		sectionClientIds &&
 		sectionClientIds.includes( clientId );
 
-	if ( ! isSectionBlock ) {
-		return null;
-	}
+	const isReducedMotion = useReducedMotion();
 
-	const hasTopInsertionPoint =
-		insertionPoint?.index === 0 &&
-		clientId === sectionClientIds[ insertionPoint.index ];
-	const hasBottomInsertionPoint =
-		insertionPoint &&
-		insertionPoint.hasOwnProperty( 'index' ) &&
-		clientId === sectionClientIds[ insertionPoint.index - 1 ];
-	// We want to show the zoom out separator in either of these conditions:
-	// 1. If the inserter has an insertion index set
-	// 2. We are dragging a pattern over an insertion point
-	if ( position === 'top' ) {
-		isVisible =
-			hasTopInsertionPoint ||
-			( blockInsertionPointVisible &&
-				blockInsertionPoint.index === 0 &&
-				clientId === sectionClientIds[ blockInsertionPoint.index ] );
+	if ( ! clientId ) {
+		return;
 	}
 
-	if ( position === 'bottom' ) {
-		isVisible =
-			hasBottomInsertionPoint ||
-			( blockInsertionPointVisible &&
-				clientId ===
-					sectionClientIds[ blockInsertionPoint.index - 1 ] );
+	if ( ! isSectionBlock ) {
+		return null;
 	}
 
 	return (

packages/block-editor/src/components/block-tools/index.js

@@ -33,6 +33,7 @@ function selector( select ) {
 		isTyping,
 		isDragging,
 		isZoomOut,
+		showZoomOutModeInserter,
 	} = unlock( select( blockEditorStore ) );
 
 	const clientId =
@@ -44,6 +45,7 @@ function selector( select ) {
 		isTyping: isTyping(),
 		isZoomOutMode: isZoomOut(),
 		isDragging: isDragging(),
+		showZoomOutModeInserter: showZoomOutModeInserter(),
 	};
 }
 
@@ -61,8 +63,14 @@ export default function BlockTools( {
 	__unstableContentRef,
 	...props
 } ) {
-	const { clientId, hasFixedToolbar, isTyping, isZoomOutMode, isDragging } =
-		useSelect( selector, [] );
+	const {
+		clientId,
+		hasFixedToolbar,
+		isTyping,
+		isZoomOutMode,
+		isDragging,
+		showZoomOutModeInserter,
+	} = useSelect( selector, [] );
 
 	const isMatch = useShortcutEventMatch();
 	const {
@@ -193,6 +201,7 @@ export default function BlockTools( {
 			}
 		}
 	}
+
 	const blockToolbarRef = usePopoverScroll( __unstableContentRef );
 	const blockToolbarAfterRef = usePopoverScroll( __unstableContentRef );
 
@@ -234,7 +243,7 @@ export default function BlockTools( {
 					name="__unstable-block-tools-after"
 					ref={ blockToolbarAfterRef }
 				/>
-				{ isZoomOutMode && ! isDragging && (
+				{ isZoomOutMode && ! isDragging && showZoomOutModeInserter && (
 					<ZoomOutModeInserters
 						__unstableContentRef={ __unstableContentRef }
 					/>

packages/block-editor/src/store/actions.js

@@ -656,6 +656,20 @@ export function setTemplateValidity( isValid ) {
 	};
 }
 
+/**
+ * Action that shows the zoom out mode inserter.
+ *
+ * @param {boolean} showZoomOutModeInserter show the zoom out mode inserter.
+ *
+ * @return {Object} Action object.
+ */
+export function setShowZoomOutModeInserter( showZoomOutModeInserter ) {
+	return {
+		type: 'SET_ZOOM_OUT_MODE_INSERTER',
+		showZoomOutModeInserter,
+	};
+}
+
 /**
  * Action that synchronizes the template with the list of blocks.
  *

packages/block-editor/src/store/defaults.js

@@ -170,6 +170,8 @@ export const SETTINGS_DEFAULTS = {
 
 	isPreviewMode: false,
 
+	showZoomOutModeInserter: true,
+
 	// These settings will be completely revamped in the future.
 	// The goal is to evolve this into an API which will instruct
 	// the block inspector to animate transitions between what it

packages/block-editor/src/store/reducer.js

@@ -1659,6 +1659,29 @@ export function template( state = { isValid: true }, action ) {
 	return state;
 }
 
+/**
+ * Reducer returning whether the zoom out mode inserter should be shown or not.
+ *
+ * @param {Object} state  Current state.
+ * @param {Object} action Dispatched action.
+ *
+ * @return {Object} Updated state.
+ */
+export function zoomOutModeInserter(
+	state = { showZoomOutModeInserter: true },
+	action
+) {
+	switch ( action.type ) {
+		case 'SET_ZOOM_OUT_MODE_INSERTER':
+			return {
+				...state,
+				showZoomOutModeInserter: action.showZoomOutModeInserter,
+			};
+	}
+
+	return state;
+}
+
 /**
  * Reducer returning the editor setting.
  *
@@ -2119,6 +2142,7 @@ const combinedReducers = combineReducers( {
 	insertionPoint,
 	insertionCue,
 	template,
+	zoomOutModeInserter,
 	settings,
 	preferences,
 	lastBlockAttributesChange,

packages/block-editor/src/store/selectors.js

@@ -1537,6 +1537,17 @@ export function isBlockInsertionPointVisible( state ) {
 	return state.insertionCue !== null;
 }
 
+/**
+ * Returns whether the zoom out mode inserter is enabled or not.
+ *
+ * @param {Object} state Global application state.
+ *
+ * @return {boolean} Whether the drop pattern is enabled or not.
+ */
+export function showZoomOutModeInserter( state ) {
+	return state.zoomOutModeInserter.showZoomOutModeInserter;
+}
+
 /**
  * Returns whether the blocks matches the template or not.
  *