@wordpress/block-editor 15.16.0 → 15.17.0

package/src/store/selectors.js

@@ -1747,14 +1747,23 @@ const canInsertBlockTypeUnmemoized = (
 		return false;
 	}
 
-	// In content only mode, check if this container allows insertion.
-	// We need the `isParentSectionBlock` check because section blocks
-	// (synced patterns, contentOnly groups) have a `getBlockEditingMode`
-	// of 'default', not 'contentOnly' — the 'contentOnly' mode is only
-	// set on their *children*.
+	/*
+	 * In content only mode, check if this container allows insertion.
+	 * We need the `isParentSectionBlock` check because section blocks
+	 * (synced patterns, contentOnly groups) have a `getBlockEditingMode`
+	 * of 'default', not 'contentOnly' — the 'contentOnly' mode is only
+	 * set on their *children*.
+	 *
+	 * Also include `disabled` alongside `contentOnly`: structural inner blocks
+	 * (e.g. Column) inside a content-only section use `disabled` mode, and they
+	 * need the same default-block sibling rules so insertion stays aligned with
+	 * `canRemoveBlock`.
+	 */
 	if (
 		isWithinSection &&
-		( isParentSectionBlock || blockEditingMode === 'contentOnly' ) &&
+		( isParentSectionBlock ||
+			blockEditingMode === 'contentOnly' ||
+			blockEditingMode === 'disabled' ) &&
 		! isContainerInsertableToInContentOnlyMode(
 			state,
 			blockName,
@@ -1762,8 +1771,11 @@ const canInsertBlockTypeUnmemoized = (
 		)
 	) {
 		const defaultBlockName = getDefaultBlockName();
-		// Allow inserting the default block anywhere that another default block already exists
-		// when in contentOnly mode.
+		/*
+		 * Allow inserting the default block anywhere that another default block already exists
+		 * when in contentOnly mode. The same sibling rule applies when the parent is `disabled`
+		 * within a content-only section (see the condition above).
+		 */
 		if ( blockName === defaultBlockName ) {
 			const existingBlocks = getBlockOrder( state, rootClientId );
 			const hasDefaultBlock = existingBlocks.some(
@@ -1980,9 +1992,9 @@ export function canRemoveBlock( state, clientId ) {
 			if ( defaultBlocks.length > 1 ) {
 				return true;
 			}
-		} else {
 			return false;
 		}
+		return false;
 	}
 
 	return rootBlockEditingMode !== 'disabled';
@@ -2624,7 +2636,7 @@ export function getDirectInsertBlock( state, rootClientId = null ) {
 		return;
 	}
 	const { defaultBlock, directInsert } =
-		state.blockListSettings[ rootClientId ] ?? {};
+		state.blockListSettings.get( rootClientId ) ?? {};
 	if ( ! defaultBlock || ! directInsert ) {
 		return;
 	}
@@ -2857,7 +2869,7 @@ export const __experimentalGetPatternTransformItems = createRegistrySelector(
  * @return {?Object} Block settings of the block if set.
  */
 export function getBlockListSettings( state, clientId ) {
-	return state.blockListSettings[ clientId ];
+	return state.blockListSettings.get( clientId );
 }
 
 /**
@@ -2895,16 +2907,14 @@ export function isLastBlockChangePersistent( state ) {
  */
 export const __experimentalGetBlockListSettingsForBlocks = createSelector(
 	( state, clientIds = [] ) => {
-		return clientIds.reduce( ( blockListSettingsForBlocks, clientId ) => {
-			if ( ! state.blockListSettings[ clientId ] ) {
-				return blockListSettingsForBlocks;
+		const blockListSettingsForBlocks = {};
+		for ( const clientId of clientIds ) {
+			const settings = getBlockListSettings( state, clientId );
+			if ( settings ) {
+				blockListSettingsForBlocks[ clientId ] = settings;
 			}
-
-			return {
-				...blockListSettingsForBlocks,
-				[ clientId ]: state.blockListSettings[ clientId ],
-			};
-		}, {} );
+		}
+		return blockListSettingsForBlocks;
 	},
 	( state ) => [ state.blockListSettings ]
 );
@@ -3021,7 +3031,7 @@ export function isBlockHighlighted( state, clientId ) {
  * @return {boolean} True if the block has controlled inner blocks.
  */
 export function areInnerBlocksControlled( state, clientId ) {
-	return !! state.blocks.controlledInnerBlocks[ clientId ];
+	return state.blocks.controlledInnerBlocks.has( clientId );
 }
 
 /**

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

@@ -131,13 +131,13 @@ describe( 'private selectors', () => {
 						'9b9c5c3f-2e46-4f02-9e14-9fe9515b958f',
 					],
 				] ),
-				blockEditingModes: new Map( [] ),
+				blockEditingModes: new Map(),
 			},
-			blockListSettings: {
-				'ef45d5fd-5234-4fd5-ac4f-c3736c7f9337': {},
-				'9b9c5c3f-2e46-4f02-9e14-9fe9515b958f': {},
-			},
-			derivedBlockEditingModes: new Map( [] ),
+			blockListSettings: new Map( [
+				[ 'ef45d5fd-5234-4fd5-ac4f-c3736c7f9337', {} ],
+				[ '9b9c5c3f-2e46-4f02-9e14-9fe9515b958f', {} ],
+			] ),
+			derivedBlockEditingModes: new Map(),
 		};
 
 		const hasContentRoleAttribute = jest.fn( () => false );
@@ -154,9 +154,9 @@ describe( 'private selectors', () => {
 				...baseState,
 				blocks: {
 					...baseState.blocks,
-					blockEditingModes: new Map( [] ),
+					blockEditingModes: new Map(),
 				},
-				derivedBlockEditingModes: new Map( [] ),
+				derivedBlockEditingModes: new Map(),
 			};
 			expect(
 				isBlockSubtreeDisabled(
@@ -349,10 +349,10 @@ describe( 'private selectors', () => {
 					],
 				] ),
 			},
-			blockListSettings: {
-				'ef45d5fd-5234-4fd5-ac4f-c3736c7f9337': {},
-				'9b9c5c3f-2e46-4f02-9e14-9fe9515b958f': {},
-			},
+			blockListSettings: new Map( [
+				[ 'ef45d5fd-5234-4fd5-ac4f-c3736c7f9337', {} ],
+				[ '9b9c5c3f-2e46-4f02-9e14-9fe9515b958f', {} ],
+			] ),
 		};
 		getEnabledClientIdsTree.registry = {
 			select: jest.fn( () => ( {} ) ),
@@ -363,9 +363,9 @@ describe( 'private selectors', () => {
 				...baseState,
 				blocks: {
 					...baseState.blocks,
-					blockEditingModes: new Map( [] ),
+					blockEditingModes: new Map(),
 				},
-				derivedBlockEditingModes: new Map( [] ),
+				derivedBlockEditingModes: new Map(),
 			};
 			expect( getEnabledClientIdsTree( state ) ).toEqual( [
 				{
@@ -404,9 +404,9 @@ describe( 'private selectors', () => {
 				...baseState,
 				blocks: {
 					...baseState.blocks,
-					blockEditingModes: new Map( [] ),
+					blockEditingModes: new Map(),
 				},
-				derivedBlockEditingModes: new Map( [] ),
+				derivedBlockEditingModes: new Map(),
 			};
 			expect(
 				getEnabledClientIdsTree(
@@ -545,7 +545,7 @@ describe( 'private selectors', () => {
 					[ 'ef45d5fd-5234-4fd5-ac4f-c3736c7f9337', 'disabled' ],
 					[ '9b9c5c3f-2e46-4f02-9e14-9fe9515b958f', 'disabled' ],
 				] ),
-				blockListSettings: {},
+				blockListSettings: new Map(),
 			};
 			expect(
 				getEnabledBlockParents(
@@ -597,7 +597,7 @@ describe( 'private selectors', () => {
 				derivedBlockEditingModes: new Map( [
 					[ 'ef45d5fd-5234-4fd5-ac4f-c3736c7f9337', 'disabled' ],
 				] ),
-				blockListSettings: {},
+				blockListSettings: new Map(),
 			};
 			expect(
 				getEnabledBlockParents(
@@ -799,9 +799,9 @@ describe( 'private selectors', () => {
 				] ),
 			},
 			settings: {},
-			blockListSettings: {
-				'parent-block': templateLock ? { templateLock } : {},
-			},
+			blockListSettings: new Map( [
+				[ 'parent-block', templateLock ? { templateLock } : {} ],
+			] ),
 		} );
 
 		it( 'returns false when block has no lock and no templateLock', () => {
@@ -852,9 +852,9 @@ describe( 'private selectors', () => {
 				] ),
 			},
 			settings: {},
-			blockListSettings: {
-				'parent-block': templateLock ? { templateLock } : {},
-			},
+			blockListSettings: new Map( [
+				[ 'parent-block', templateLock ? { templateLock } : {} ],
+			] ),
 		} );
 
 		it( 'returns false when block has no lock and no templateLock', () => {
@@ -910,9 +910,9 @@ describe( 'private selectors', () => {
 				] ),
 			},
 			settings: {},
-			blockListSettings: {
-				'parent-block': templateLock ? { templateLock } : {},
-			},
+			blockListSettings: new Map( [
+				[ 'parent-block', templateLock ? { templateLock } : {} ],
+			] ),
 		} );
 
 		it( 'returns false when block is not locked in any way', () => {
@@ -1395,12 +1395,15 @@ describe( 'private selectors', () => {
 					attributes: new Map( [ [ clientId, attributes ] ] ),
 					parents: new Map( [ [ clientId, rootClientId ] ] ),
 				},
-				blockListSettings: {
-					[ clientId ]: templateLock ? { templateLock } : {},
-					'': rootTemplateLock
-						? { templateLock: rootTemplateLock }
-						: {},
-				},
+				blockListSettings: new Map( [
+					[ clientId, templateLock ? { templateLock } : {} ],
+					[
+						'',
+						rootTemplateLock
+							? { templateLock: rootTemplateLock }
+							: {},
+					],
+				] ),
 				settings:
 					disableContentOnlyForUnsyncedPatterns !== undefined
 						? { disableContentOnlyForUnsyncedPatterns }
@@ -1470,7 +1473,7 @@ describe( 'private selectors', () => {
 						[ 'inner-pattern', 'outer-pattern' ],
 					] ),
 				},
-				blockListSettings: {},
+				blockListSettings: new Map(),
 				settings: {},
 				editedContentOnlySection: undefined,
 			};
@@ -1509,7 +1512,7 @@ describe( 'private selectors', () => {
 						[ 'block-1', 'outer-pattern' ],
 					] ),
 				},
-				blockListSettings: {},
+				blockListSettings: new Map(),
 				settings: {},
 				editedContentOnlySection: 'outer-pattern',
 			};
@@ -1535,7 +1538,7 @@ describe( 'private selectors', () => {
 						[ 'pattern-b', '' ],
 					] ),
 				},
-				blockListSettings: {},
+				blockListSettings: new Map(),
 				settings: {},
 				editedContentOnlySection: 'pattern-a',
 			};
@@ -1554,7 +1557,7 @@ describe( 'private selectors', () => {
 					attributes: new Map( [ [ 'block-1', {} ] ] ),
 					parents: new Map( [ [ 'block-1', '' ] ] ),
 				},
-				blockListSettings: {},
+				blockListSettings: new Map(),
 				settings: {},
 				editedContentOnlySection: undefined,
 			};
@@ -1580,7 +1583,7 @@ describe( 'private selectors', () => {
 						[ 'inner-block', 'pattern-block' ],
 					] ),
 				},
-				blockListSettings: {},
+				blockListSettings: new Map(),
 				settings: {},
 				editedContentOnlySection: undefined,
 			};
@@ -1608,7 +1611,7 @@ describe( 'private selectors', () => {
 						[ 'inner-block', 'pattern-block' ],
 					] ),
 				},
-				blockListSettings: {},
+				blockListSettings: new Map(),
 				settings: {},
 				editedContentOnlySection: 'pattern-block',
 			};
@@ -1645,7 +1648,7 @@ describe( 'private selectors', () => {
 						[ 'deep-block', 'nested-pattern' ],
 					] ),
 				},
-				blockListSettings: {},
+				blockListSettings: new Map(),
 				settings: {},
 				editedContentOnlySection: 'outer-pattern',
 			};
@@ -1676,7 +1679,7 @@ describe( 'private selectors', () => {
 						[ 'pattern-b', '' ],
 					] ),
 				},
-				blockListSettings: {},
+				blockListSettings: new Map(),
 				settings: {},
 				editedContentOnlySection: 'pattern-b',
 			};