Handle when the SET_HAS_CONTROLLED_INNER_BLOCKS block has been remove…

…d from the state
WordPress · Nov 21, 2024 · 773c76d · 773c76d
1 parent 63d0d2f
commit 773c76d
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/packages/block-editor/src/store/reducer.js b/packages/block-editor/src/store/reducer.js
@@ -2563,14 +2563,18 @@ export function withDerivedBlockEditingModes( reducer ) {
 				break;
 			}
 			case 'SET_HAS_CONTROLLED_INNER_BLOCKS': {
-				const newControlledBlock = nextState.blocks.tree.get(
+				const updatedBlock = nextState.blocks.tree.get(
 					action.clientId
 				);
+				// The block might have been removed.
+				if ( ! updatedBlock ) {
+					break;
+				}
 				const nextDerivedBlockEditingModes =
 					getDerivedBlockEditingModesUpdates( {
 						prevState: state,
 						nextState,
-						addedBlocks: [ newControlledBlock ],
+						addedBlocks: [ updatedBlock ],
 					} );
 
 				if ( nextDerivedBlockEditingModes ) {