@wordpress/block-editor 15.16.0 → 15.17.0

package/build-module/store/reducer.mjs

@@ -109,7 +109,7 @@ function updateParentInnerBlocksInTree(state, updatedClientIds, updateChildrenOf
   for (const clientId of updatedClientIds) {
     let current = updateChildrenOfUpdatedClientIds ? clientId : state.parents.get(clientId);
     do {
-      if (state.controlledInnerBlocks[current]) {
+      if (state.controlledInnerBlocks.has(current)) {
         controlledParents.add(current);
         break;
       } else {
@@ -353,18 +353,13 @@ var withBlockReset = (reducer) => (state, action) => {
       rootClientId: "",
       blocks: action.blocks
     });
-    const preservedControlledInnerBlocks = state?.controlledInnerBlocks ?? {};
+    const preservedControlledInnerBlocks = state?.controlledInnerBlocks ?? /* @__PURE__ */ new Set();
     if (state?.order) {
-      for (const clientId of Object.keys(
-        preservedControlledInnerBlocks
-      )) {
-        if (!preservedControlledInnerBlocks[clientId]) {
-          continue;
-        }
+      for (const clientId of preservedControlledInnerBlocks) {
         if (!newState.byClientId.has(clientId)) {
           continue;
         }
-        newState.controlledInnerBlocks[clientId] = true;
+        newState.controlledInnerBlocks.add(clientId);
         const oldOrder = state.order.get(clientId);
         if (!oldOrder?.length) {
           continue;
@@ -390,9 +385,7 @@ var withBlockReset = (reducer) => (state, action) => {
         oldOrder.forEach((id) => preserveBlock(id, clientId));
       }
     }
-    for (const clientId of Object.keys(
-      newState.controlledInnerBlocks
-    )) {
+    for (const clientId of newState.controlledInnerBlocks) {
       const controlledOrder = newState.order.get(clientId);
       if (!controlledOrder?.length) {
         continue;
@@ -432,12 +425,12 @@ var withReplaceInnerBlocks = (reducer) => (state, action) => {
     return reducer(state, action);
   }
   const nestedControllers = {};
-  if (Object.keys(state.controlledInnerBlocks).length) {
+  if (state.controlledInnerBlocks.size) {
     const stack = [...action.blocks];
     while (stack.length) {
       const { innerBlocks, ...block } = stack.shift();
       stack.push(...innerBlocks);
-      if (!!state.controlledInnerBlocks[block.clientId]) {
+      if (state.controlledInnerBlocks.has(block.clientId)) {
         nestedControllers[block.clientId] = true;
       }
     }
@@ -861,12 +854,20 @@ var blocks = pipe(
     }
     return state;
   },
-  controlledInnerBlocks(state = {}, { type, clientId, hasControlledInnerBlocks }) {
+  controlledInnerBlocks(state = /* @__PURE__ */ new Set(), { type, clientId, hasControlledInnerBlocks }) {
     if (type === "SET_HAS_CONTROLLED_INNER_BLOCKS") {
-      return {
-        ...state,
-        [clientId]: hasControlledInnerBlocks
-      };
+      if (hasControlledInnerBlocks) {
+        if (state.has(clientId)) {
+          return state;
+        }
+        return new Set(state).add(clientId);
+      }
+      if (!state.has(clientId)) {
+        return state;
+      }
+      const newState = new Set(state);
+      newState.delete(clientId);
+      return newState;
     }
     return state;
   },
@@ -1208,7 +1209,7 @@ function preferences(state = PREFERENCES_DEFAULTS, action) {
   }
   return state;
 }
-var blockListSettings = (state = {}, action) => {
+var blockListSettings = (state = /* @__PURE__ */ new Map(), action) => {
   switch (action.type) {
     case "REPLACE_BLOCKS": {
       const replacementIds = /* @__PURE__ */ new Set();
@@ -1218,40 +1219,38 @@ var blockListSettings = (state = {}, action) => {
         replacementIds.add(block.clientId);
         stack.push(...block.innerBlocks);
       }
-      return Object.fromEntries(
-        Object.entries(state).filter(
-          ([id]) => !action.clientIds.includes(id) || replacementIds.has(id)
-        )
-      );
+      const newState = new Map(state);
+      for (const clientId of action.clientIds) {
+        if (!replacementIds.has(clientId)) {
+          newState.delete(clientId);
+        }
+      }
+      return newState;
     }
     case "REMOVE_BLOCKS": {
-      return Object.fromEntries(
-        Object.entries(state).filter(
-          ([id]) => !action.clientIds.includes(id)
-        )
-      );
+      const newState = new Map(state);
+      for (const clientId of action.clientIds) {
+        newState.delete(clientId);
+      }
+      return newState;
     }
     case "UPDATE_BLOCK_LIST_SETTINGS": {
-      const updates = typeof action.clientId === "string" ? { [action.clientId]: action.settings } : action.clientId;
-      for (const clientId in updates) {
-        if (!updates[clientId]) {
-          if (!state[clientId]) {
-            delete updates[clientId];
-          }
-        } else if (fastDeepEqual(state[clientId], updates[clientId])) {
-          delete updates[clientId];
-        }
-      }
-      if (Object.keys(updates).length === 0) {
+      const updates = typeof action.clientId === "string" ? [[action.clientId, action.settings]] : Object.entries(action.clientId);
+      const relevantUpdates = updates.filter(
+        ([clientId, nextSettings]) => !nextSettings ? state.has(clientId) : !fastDeepEqual(state.get(clientId), nextSettings)
+      );
+      if (!relevantUpdates.length) {
         return state;
       }
-      const merged = { ...state, ...updates };
-      for (const clientId in updates) {
-        if (!updates[clientId]) {
-          delete merged[clientId];
+      const newState = new Map(state);
+      for (const [clientId, nextSettings] of relevantUpdates) {
+        if (!nextSettings) {
+          newState.delete(clientId);
+        } else {
+          newState.set(clientId, nextSettings);
         }
       }
-      return merged;
+      return newState;
     }
   }
   return state;
@@ -1523,7 +1522,7 @@ function getBlockTreeBlock(state, clientId) {
       ...rootBlock
     };
   }
-  if (!state.blocks.controlledInnerBlocks[clientId]) {
+  if (!state.blocks.controlledInnerBlocks.has(clientId)) {
     return state.blocks.tree.get(clientId);
   }
   const controlledTree = state.blocks.tree.get(`controlled||${clientId}`);
@@ -1571,7 +1570,7 @@ function getDerivedBlockEditingModesForTree(state, treeClientId = "") {
   );
   const templatePartClientIds = [];
   const syncedPatternClientIds = [];
-  Object.keys(state.blocks.controlledInnerBlocks).forEach((clientId) => {
+  state.blocks.controlledInnerBlocks.forEach((clientId) => {
     const block = state.blocks.byClientId?.get(clientId);
     if (block?.name === "core/template-part") {
       templatePartClientIds.push(clientId);
@@ -1580,10 +1579,10 @@ function getDerivedBlockEditingModesForTree(state, treeClientId = "") {
       syncedPatternClientIds.push(clientId);
     }
   });
-  const contentOnlyTemplateLockedClientIds = Object.keys(
+  const contentOnlyTemplateLockedClientIds = Array.from(
     state.blockListSettings
-  ).filter(
-    (clientId) => state.blockListSettings[clientId]?.templateLock === "contentOnly"
+  ).flatMap(
+    ([clientId, listSettings]) => listSettings?.templateLock === "contentOnly" ? [clientId] : []
   );
   const isIsolatedEditor = state.settings?.[isIsolatedEditorKey];
   const disableContentOnlyForUnsyncedPatterns = state.settings?.disableContentOnlyForUnsyncedPatterns;
@@ -1830,8 +1829,8 @@ function withDerivedBlockEditingModes(reducer) {
         const removedClientIds = [];
         const updates = typeof action.clientId === "string" ? { [action.clientId]: action.settings } : action.clientId;
         for (const clientId in updates) {
-          const isNewContentOnlyBlock = state.blockListSettings[clientId]?.templateLock !== "contentOnly" && nextState.blockListSettings[clientId]?.templateLock === "contentOnly";
-          const wasContentOnlyBlock = state.blockListSettings[clientId]?.templateLock === "contentOnly" && nextState.blockListSettings[clientId]?.templateLock !== "contentOnly";
+          const isNewContentOnlyBlock = state.blockListSettings.get(clientId)?.templateLock !== "contentOnly" && nextState.blockListSettings.get(clientId)?.templateLock === "contentOnly";
+          const wasContentOnlyBlock = state.blockListSettings.get(clientId)?.templateLock === "contentOnly" && nextState.blockListSettings.get(clientId)?.templateLock !== "contentOnly";
           if (isNewContentOnlyBlock) {
             addedBlocks.push(
               nextState.blocks.tree.get(clientId)