@wordpress/block-editor 15.4.1-next.f56bd8138.0 → 15.5.1-next.47f435fc9.0

package/src/store/reducer.js

@@ -1873,6 +1873,45 @@ export function highlightedBlock( state, action ) {
 	return state;
 }
 
+/**
+ * Reducer returning current spotlighted block.
+ *
+ * @param {string|null} state  Current clientId or null.
+ * @param {Object}      action Dispatched action.
+ *
+ * @return {string|null} Updated state.
+ */
+export function hasBlockSpotlight( state, action ) {
+	switch ( action.type ) {
+		case 'TOGGLE_BLOCK_SPOTLIGHT':
+			const { clientId, hasBlockSpotlight: _hasBlockSpotlight } = action;
+
+			if ( _hasBlockSpotlight ) {
+				return clientId;
+			} else if ( state === clientId ) {
+				return null;
+			}
+			return state;
+		case 'SELECT_BLOCK':
+			if ( action.clientId !== state ) {
+				return null;
+			}
+			return state;
+		case 'SELECTION_CHANGE':
+			if (
+				action.start?.clientId !== state ||
+				action.end?.clientId !== state
+			) {
+				return null;
+			}
+			return state;
+		case 'CLEAR_SELECTED_BLOCK':
+			return null;
+	}
+
+	return state;
+}
+
 /**
  * Reducer returning current expanded block in the list view.
  *
@@ -2125,6 +2164,7 @@ const combinedReducers = combineReducers( {
 	openedBlockSettingsMenu,
 	registeredInserterMediaCategories,
 	zoomLevel,
+	hasBlockSpotlight,
 } );
 
 /**
@@ -2230,18 +2270,13 @@ function hasBindings( block ) {
  * Computes and returns derived block editing modes for a given block tree.
  *
  * This function calculates the editing modes for each block in the tree, taking into account
- * various factors such as zoom level, navigation mode, sections, and synced patterns.
+ * various factors such as zoom level, sections, and synced patterns.
  *
- * @param {Object}  state        The current state object.
- * @param {boolean} isNavMode    Whether the navigation mode is active.
- * @param {string}  treeClientId The client ID of the root block for the tree. Defaults to an empty string.
+ * @param {Object} state        The current state object.
+ * @param {string} treeClientId The client ID of the root block for the tree. Defaults to an empty string.
  * @return {Map} A Map containing the derived block editing modes, keyed by block client ID.
  */
-function getDerivedBlockEditingModesForTree(
-	state,
-	isNavMode = false,
-	treeClientId = ''
-) {
+function getDerivedBlockEditingModesForTree( state, treeClientId = '' ) {
 	const isZoomedOut =
 		state?.zoomLevel < 100 || state?.zoomLevel === 'auto-scaled';
 	const derivedBlockEditingModes = new Map();
@@ -2307,12 +2342,7 @@ function getDerivedBlockEditingModesForTree(
 			let ancestorBlockEditingMode;
 			let parent = state.blocks.parents.get( clientId );
 			while ( parent !== undefined ) {
-				// There's a chance we only just calculated this for the parent,
-				// if so we can return that value for a faster lookup.
-				if ( derivedBlockEditingModes.has( parent ) ) {
-					ancestorBlockEditingMode =
-						derivedBlockEditingModes.get( parent );
-				} else if ( state.blockEditingModes.has( parent ) ) {
+				if ( state.blockEditingModes.has( parent ) ) {
 					// Checking the explicit block editing mode will be slower,
 					// as the block editing mode is more likely to be set on a
 					// distant ancestor.
@@ -2332,7 +2362,7 @@ function getDerivedBlockEditingModesForTree(
 			}
 		}
 
-		if ( isZoomedOut || isNavMode ) {
+		if ( isZoomedOut ) {
 			// If the root block is the section root set its editing mode to contentOnly.
 			if ( clientId === sectionRootClientId ) {
 				derivedBlockEditingModes.set( clientId, 'contentOnly' );
@@ -2352,81 +2382,6 @@ function getDerivedBlockEditingModesForTree(
 
 			// If zoomed out, all blocks that aren't sections or the section root are
 			// disabled.
-			if ( isZoomedOut ) {
-				derivedBlockEditingModes.set( clientId, 'disabled' );
-				return;
-			}
-
-			const isInSection = !! findParentInClientIdsList(
-				state,
-				clientId,
-				sectionClientIds
-			);
-			if ( ! isInSection ) {
-				if ( clientId === '' ) {
-					derivedBlockEditingModes.set( clientId, 'disabled' );
-					return;
-				}
-
-				// Allow selection of template parts outside of sections.
-				if ( blockName === 'core/template-part' ) {
-					derivedBlockEditingModes.set( clientId, 'contentOnly' );
-					return;
-				}
-
-				const isInTemplatePart = !! findParentInClientIdsList(
-					state,
-					clientId,
-					templatePartClientIds
-				);
-				// Allow contentOnly blocks in template parts outside of sections
-				// to be editable. Only disable blocks that don't fit this criteria.
-				if ( ! isInTemplatePart && ! isContentBlock( blockName ) ) {
-					derivedBlockEditingModes.set( clientId, 'disabled' );
-					return;
-				}
-			}
-
-			// Handle synced pattern content so the inner blocks of a synced pattern are
-			// properly disabled.
-			if ( syncedPatternClientIds.length ) {
-				const parentPatternClientId = findParentInClientIdsList(
-					state,
-					clientId,
-					syncedPatternClientIds
-				);
-
-				if ( parentPatternClientId ) {
-					// This is a pattern nested in another pattern, it should be disabled.
-					if (
-						findParentInClientIdsList(
-							state,
-							parentPatternClientId,
-							syncedPatternClientIds
-						)
-					) {
-						derivedBlockEditingModes.set( clientId, 'disabled' );
-						return;
-					}
-
-					if ( hasBindings( block ) ) {
-						derivedBlockEditingModes.set( clientId, 'contentOnly' );
-						return;
-					}
-
-					// Synced pattern content without a binding isn't editable
-					// from the instance, the user has to edit the pattern source,
-					// so return 'disabled'.
-					derivedBlockEditingModes.set( clientId, 'disabled' );
-					return;
-				}
-			}
-
-			if ( blockName && isContentBlock( blockName ) ) {
-				derivedBlockEditingModes.set( clientId, 'contentOnly' );
-				return;
-			}
-
 			derivedBlockEditingModes.set( clientId, 'disabled' );
 			return;
 		}
@@ -2509,12 +2464,11 @@ function getDerivedBlockEditingModesForTree(
  *
  * It only returns a value when modifications are made to the block editing modes.
  *
- * @param {Object}  options                    The options for updating derived block editing modes.
- * @param {Object}  options.prevState          The previous state object.
- * @param {Object}  options.nextState          The next state object.
- * @param {Array}   [options.addedBlocks]      An array of blocks that were added.
- * @param {Array}   [options.removedClientIds] An array of client IDs of blocks that were removed.
- * @param {boolean} [options.isNavMode]        Whether the navigation mode is active.
+ * @param {Object} options                    The options for updating derived block editing modes.
+ * @param {Object} options.prevState          The previous state object.
+ * @param {Object} options.nextState          The next state object.
+ * @param {Array}  [options.addedBlocks]      An array of blocks that were added.
+ * @param {Array}  [options.removedClientIds] An array of client IDs of blocks that were removed.
  * @return {Map|undefined} The updated derived block editing modes, or undefined if no changes were made.
  */
 function getDerivedBlockEditingModesUpdates( {
@@ -2522,11 +2476,8 @@ function getDerivedBlockEditingModesUpdates( {
 	nextState,
 	addedBlocks,
 	removedClientIds,
-	isNavMode = false,
 } ) {
-	const prevDerivedBlockEditingModes = isNavMode
-		? prevState.derivedNavModeBlockEditingModes
-		: prevState.derivedBlockEditingModes;
+	const prevDerivedBlockEditingModes = prevState.derivedBlockEditingModes;
 	let nextDerivedBlockEditingModes;
 
 	// Perform removals before additions to handle cases like the `MOVE_BLOCKS_TO_POSITION` action.
@@ -2549,31 +2500,28 @@ function getDerivedBlockEditingModesUpdates( {
 	} );
 
 	addedBlocks?.forEach( ( addedBlock ) => {
-		traverseBlockTree( nextState, addedBlock.clientId, ( block ) => {
-			const updates = getDerivedBlockEditingModesForTree(
-				nextState,
-				isNavMode,
-				block.clientId
-			);
+		const updates = getDerivedBlockEditingModesForTree(
+			nextState,
+			addedBlock.clientId
+		);
 
-			if ( updates.size ) {
-				if ( ! nextDerivedBlockEditingModes ) {
-					nextDerivedBlockEditingModes = new Map( [
-						...( prevDerivedBlockEditingModes?.size
-							? prevDerivedBlockEditingModes
-							: [] ),
-						...updates,
-					] );
-				} else {
-					nextDerivedBlockEditingModes = new Map( [
-						...( nextDerivedBlockEditingModes?.size
-							? nextDerivedBlockEditingModes
-							: [] ),
-						...updates,
-					] );
-				}
+		if ( updates.size ) {
+			if ( ! nextDerivedBlockEditingModes ) {
+				nextDerivedBlockEditingModes = new Map( [
+					...( prevDerivedBlockEditingModes?.size
+						? prevDerivedBlockEditingModes
+						: [] ),
+					...updates,
+				] );
+			} else {
+				nextDerivedBlockEditingModes = new Map( [
+					...( nextDerivedBlockEditingModes?.size
+						? nextDerivedBlockEditingModes
+						: [] ),
+					...updates,
+				] );
 			}
-		} );
+		}
 	} );
 
 	return nextDerivedBlockEditingModes;
@@ -2608,28 +2556,14 @@ export function withDerivedBlockEditingModes( reducer ) {
 						prevState: state,
 						nextState,
 						removedClientIds: action.clientIds,
-						isNavMode: false,
-					} );
-				const nextDerivedNavModeBlockEditingModes =
-					getDerivedBlockEditingModesUpdates( {
-						prevState: state,
-						nextState,
-						removedClientIds: action.clientIds,
-						isNavMode: true,
 					} );
 
-				if (
-					nextDerivedBlockEditingModes ||
-					nextDerivedNavModeBlockEditingModes
-				) {
+				if ( nextDerivedBlockEditingModes ) {
 					return {
 						...nextState,
 						derivedBlockEditingModes:
 							nextDerivedBlockEditingModes ??
 							state.derivedBlockEditingModes,
-						derivedNavModeBlockEditingModes:
-							nextDerivedNavModeBlockEditingModes ??
-							state.derivedNavModeBlockEditingModes,
 					};
 				}
 				break;
@@ -2641,28 +2575,14 @@ export function withDerivedBlockEditingModes( reducer ) {
 						prevState: state,
 						nextState,
 						addedBlocks: action.blocks,
-						isNavMode: false,
-					} );
-				const nextDerivedNavModeBlockEditingModes =
-					getDerivedBlockEditingModesUpdates( {
-						prevState: state,
-						nextState,
-						addedBlocks: action.blocks,
-						isNavMode: true,
 					} );
 
-				if (
-					nextDerivedBlockEditingModes ||
-					nextDerivedNavModeBlockEditingModes
-				) {
+				if ( nextDerivedBlockEditingModes ) {
 					return {
 						...nextState,
 						derivedBlockEditingModes:
 							nextDerivedBlockEditingModes ??
 							state.derivedBlockEditingModes,
-						derivedNavModeBlockEditingModes:
-							nextDerivedNavModeBlockEditingModes ??
-							state.derivedNavModeBlockEditingModes,
 					};
 				}
 				break;
@@ -2719,29 +2639,14 @@ export function withDerivedBlockEditingModes( reducer ) {
 						nextState,
 						addedBlocks,
 						removedClientIds,
-						isNavMode: false,
-					} );
-				const nextDerivedNavModeBlockEditingModes =
-					getDerivedBlockEditingModesUpdates( {
-						prevState: state,
-						nextState,
-						addedBlocks,
-						removedClientIds,
-						isNavMode: true,
 					} );
 
-				if (
-					nextDerivedBlockEditingModes ||
-					nextDerivedNavModeBlockEditingModes
-				) {
+				if ( nextDerivedBlockEditingModes ) {
 					return {
 						...nextState,
 						derivedBlockEditingModes:
 							nextDerivedBlockEditingModes ??
 							state.derivedBlockEditingModes,
-						derivedNavModeBlockEditingModes:
-							nextDerivedNavModeBlockEditingModes ??
-							state.derivedNavModeBlockEditingModes,
 					};
 				}
 
@@ -2789,29 +2694,14 @@ export function withDerivedBlockEditingModes( reducer ) {
 						nextState,
 						addedBlocks,
 						removedClientIds,
-						isNavMode: false,
-					} );
-				const nextDerivedNavModeBlockEditingModes =
-					getDerivedBlockEditingModesUpdates( {
-						prevState: state,
-						nextState,
-						addedBlocks,
-						removedClientIds,
-						isNavMode: true,
 					} );
 
-				if (
-					nextDerivedBlockEditingModes ||
-					nextDerivedNavModeBlockEditingModes
-				) {
+				if ( nextDerivedBlockEditingModes ) {
 					return {
 						...nextState,
 						derivedBlockEditingModes:
 							nextDerivedBlockEditingModes ??
 							state.derivedBlockEditingModes,
-						derivedNavModeBlockEditingModes:
-							nextDerivedNavModeBlockEditingModes ??
-							state.derivedNavModeBlockEditingModes,
 					};
 				}
 				break;
@@ -2836,29 +2726,14 @@ export function withDerivedBlockEditingModes( reducer ) {
 						nextState,
 						removedClientIds: [ action.clientId ],
 						addedBlocks: [ updatedBlock ],
-						isNavMode: false,
-					} );
-				const nextDerivedNavModeBlockEditingModes =
-					getDerivedBlockEditingModesUpdates( {
-						prevState: state,
-						nextState,
-						removedClientIds: [ action.clientId ],
-						addedBlocks: [ updatedBlock ],
-						isNavMode: true,
 					} );
 
-				if (
-					nextDerivedBlockEditingModes ||
-					nextDerivedNavModeBlockEditingModes
-				) {
+				if ( nextDerivedBlockEditingModes ) {
 					return {
 						...nextState,
 						derivedBlockEditingModes:
 							nextDerivedBlockEditingModes ??
 							state.derivedBlockEditingModes,
-						derivedNavModeBlockEditingModes:
-							nextDerivedNavModeBlockEditingModes ??
-							state.derivedNavModeBlockEditingModes,
 					};
 				}
 				break;
@@ -2870,29 +2745,14 @@ export function withDerivedBlockEditingModes( reducer ) {
 						nextState,
 						addedBlocks: action.blocks,
 						removedClientIds: action.clientIds,
-						isNavMode: false,
-					} );
-				const nextDerivedNavModeBlockEditingModes =
-					getDerivedBlockEditingModesUpdates( {
-						prevState: state,
-						nextState,
-						addedBlocks: action.blocks,
-						removedClientIds: action.clientIds,
-						isNavMode: true,
 					} );
 
-				if (
-					nextDerivedBlockEditingModes ||
-					nextDerivedNavModeBlockEditingModes
-				) {
+				if ( nextDerivedBlockEditingModes ) {
 					return {
 						...nextState,
 						derivedBlockEditingModes:
 							nextDerivedBlockEditingModes ??
 							state.derivedBlockEditingModes,
-						derivedNavModeBlockEditingModes:
-							nextDerivedNavModeBlockEditingModes ??
-							state.derivedNavModeBlockEditingModes,
 					};
 				}
 				break;
@@ -2909,29 +2769,13 @@ export function withDerivedBlockEditingModes( reducer ) {
 						nextState,
 						addedBlocks: action.blocks,
 						removedClientIds,
-						isNavMode: false,
 					} );
-				const nextDerivedNavModeBlockEditingModes =
-					getDerivedBlockEditingModesUpdates( {
-						prevState: state,
-						nextState,
-						addedBlocks: action.blocks,
-						removedClientIds,
-						isNavMode: true,
-					} );
-
-				if (
-					nextDerivedBlockEditingModes ||
-					nextDerivedNavModeBlockEditingModes
-				) {
+				if ( nextDerivedBlockEditingModes ) {
 					return {
 						...nextState,
 						derivedBlockEditingModes:
 							nextDerivedBlockEditingModes ??
 							state.derivedBlockEditingModes,
-						derivedNavModeBlockEditingModes:
-							nextDerivedNavModeBlockEditingModes ??
-							state.derivedNavModeBlockEditingModes,
 					};
 				}
 				break;
@@ -2946,29 +2790,14 @@ export function withDerivedBlockEditingModes( reducer ) {
 						nextState,
 						addedBlocks,
 						removedClientIds: action.clientIds,
-						isNavMode: false,
-					} );
-				const nextDerivedNavModeBlockEditingModes =
-					getDerivedBlockEditingModesUpdates( {
-						prevState: state,
-						nextState,
-						addedBlocks,
-						removedClientIds: action.clientIds,
-						isNavMode: true,
 					} );
 
-				if (
-					nextDerivedBlockEditingModes ||
-					nextDerivedNavModeBlockEditingModes
-				) {
+				if ( nextDerivedBlockEditingModes ) {
 					return {
 						...nextState,
 						derivedBlockEditingModes:
 							nextDerivedBlockEditingModes ??
 							state.derivedBlockEditingModes,
-						derivedNavModeBlockEditingModes:
-							nextDerivedNavModeBlockEditingModes ??
-							state.derivedNavModeBlockEditingModes,
 					};
 				}
 				break;
@@ -2982,15 +2811,7 @@ export function withDerivedBlockEditingModes( reducer ) {
 					return {
 						...nextState,
 						derivedBlockEditingModes:
-							getDerivedBlockEditingModesForTree(
-								nextState,
-								false /* Nav mode off */
-							),
-						derivedNavModeBlockEditingModes:
-							getDerivedBlockEditingModesForTree(
-								nextState,
-								true /* Nav mode on */
-							),
+							getDerivedBlockEditingModesForTree( nextState ),
 					};
 				}
 				break;
@@ -3004,15 +2825,7 @@ export function withDerivedBlockEditingModes( reducer ) {
 				return {
 					...nextState,
 					derivedBlockEditingModes:
-						getDerivedBlockEditingModesForTree(
-							nextState,
-							false /* Nav mode off */
-						),
-					derivedNavModeBlockEditingModes:
-						getDerivedBlockEditingModesForTree(
-							nextState,
-							true /* Nav mode on */
-						),
+						getDerivedBlockEditingModesForTree( nextState ),
 				};
 			}
 		}
@@ -3021,8 +2834,6 @@ export function withDerivedBlockEditingModes( reducer ) {
 		// state need to be preserved.
 		nextState.derivedBlockEditingModes =
 			state?.derivedBlockEditingModes ?? new Map();
-		nextState.derivedNavModeBlockEditingModes =
-			state?.derivedNavModeBlockEditingModes ?? new Map();
 
 		return nextState;
 	};

package/src/store/selectors.js

@@ -17,7 +17,6 @@ import { symbol } from '@wordpress/icons';
 import { create, remove, toHTMLString } from '@wordpress/rich-text';
 import deprecated from '@wordpress/deprecated';
 import { createSelector, createRegistrySelector } from '@wordpress/data';
-import { store as preferencesStore } from '@wordpress/preferences';
 
 /**
  * Internal dependencies
@@ -1711,7 +1710,6 @@ const canInsertBlockTypeUnmemoized = (
 	// In write mode, check if this container allows insertion.
 	if (
 		blockEditingMode === 'contentOnly' &&
-		isNavigationMode( state ) &&
 		! isContainerInsertableToInWriteMode( state, blockName, rootClientId )
 	) {
 		return false;
@@ -1873,7 +1871,6 @@ export function canRemoveBlock( state, clientId ) {
 	// Check if the parent container allows insertion/removal in write mode
 	if (
 		blockEditingMode === 'contentOnly' &&
-		isNavigationMode( state ) &&
 		! isContainerInsertableToInWriteMode(
 			state,
 			getBlockName( state, rootClientId ),
@@ -2797,36 +2794,6 @@ export function __experimentalGetLastBlockAttributeChanges( state ) {
 	return state.lastBlockAttributesChange;
 }
 
-/**
- * Returns whether the navigation mode is enabled.
- *
- * @param {Object} state Editor state.
- *
- * @return {boolean} Is navigation mode enabled.
- */
-export function isNavigationMode( state ) {
-	return __unstableGetEditorMode( state ) === 'navigation';
-}
-
-/**
- * Returns the current editor mode.
- *
- * @param {Object} state Editor state.
- *
- * @return {string} the editor mode.
- */
-export const __unstableGetEditorMode = createRegistrySelector(
-	( select ) => ( state ) => {
-		if ( ! window?.__experimentalEditorWriteMode ) {
-			return 'edit';
-		}
-		return (
-			state.settings.editorTool ??
-			select( preferencesStore ).get( 'core', 'editorTool' )
-		);
-	}
-);
-
 /**
  * Returns whether block moving mode is enabled.
  *
@@ -3088,22 +3055,13 @@ export function getBlockEditingMode( state, clientId = '' ) {
 		clientId = '';
 	}
 
-	const isNavMode = isNavigationMode( state );
-
-	// If the editor is currently not in navigation mode, check if the clientId
-	// has an editing mode set in the regular derived map.
+	// Check if the clientId has an editing mode set in the regular derived map.
 	// There may be an editing mode set here for synced patterns or in zoomed out
 	// mode.
-	if ( ! isNavMode && state.derivedBlockEditingModes?.has( clientId ) ) {
+	if ( state.derivedBlockEditingModes?.has( clientId ) ) {
 		return state.derivedBlockEditingModes.get( clientId );
 	}
 
-	// If the editor *is* in navigation mode, the block editing mode states
-	// are stored in the derivedNavModeBlockEditingModes map.
-	if ( isNavMode && state.derivedNavModeBlockEditingModes?.has( clientId ) ) {
-		return state.derivedNavModeBlockEditingModes.get( clientId );
-	}
-
 	// In normal mode, consider that an explicitly set editing mode takes over.
 	if ( state.blockEditingModes.has( clientId ) ) {
 		return state.blockEditingModes.get( clientId );

package/src/store/test/private-selectors.js

@@ -11,7 +11,7 @@ import {
 	isDragging,
 	getBlockStyles,
 } from '../private-selectors';
-import { getBlockEditingMode, __unstableGetEditorMode } from '../selectors';
+import { getBlockEditingMode } from '../selectors';
 
 describe( 'private selectors', () => {
 	describe( 'isBlockInterfaceHidden', () => {
@@ -133,11 +133,6 @@ describe( 'private selectors', () => {
 				get,
 			} ) ),
 		};
-		__unstableGetEditorMode.registry = {
-			select: jest.fn( () => ( {
-				get,
-			} ) ),
-		};
 
 		it( 'should return false when top level block is not disabled', () => {
 			const state = {
@@ -327,9 +322,7 @@ describe( 'private selectors', () => {
 			},
 		};
 		getEnabledClientIdsTree.registry = {
-			select: jest.fn( () => ( {
-				__unstableGetEditorMode: () => 'edit',
-			} ) ),
+			select: jest.fn( () => ( {} ) ),
 		};
 
 		it( 'should return tree containing only clientId and innerBlocks', () => {