@wordpress/block-editor 15.15.0 → 15.16.1-next.v.202604091042.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 {
@@ -260,27 +260,6 @@ var withBlockTree = (reducer) => (state = {}, action) => {
       );
       break;
     }
-    case "SAVE_REUSABLE_BLOCK_SUCCESS": {
-      const updatedBlockUids = [];
-      newState.attributes.forEach((attributes, clientId) => {
-        if (newState.byClientId.get(clientId).name === "core/block" && attributes.ref === action.updatedId) {
-          updatedBlockUids.push(clientId);
-        }
-      });
-      newState.tree = new Map(newState.tree);
-      updatedBlockUids.forEach((clientId) => {
-        newState.tree.set(clientId, {
-          ...newState.byClientId.get(clientId),
-          attributes: newState.attributes.get(clientId),
-          innerBlocks: newState.tree.get(clientId).innerBlocks
-        });
-      });
-      updateParentInnerBlocksInTree(
-        newState,
-        updatedBlockUids,
-        false
-      );
-    }
   }
   return newState;
 };
@@ -369,44 +348,35 @@ var withInnerBlocksRemoveCascade = (reducer) => (state, action) => {
 };
 var withBlockReset = (reducer) => (state, action) => {
   if (action.type === "RESET_BLOCKS") {
-    const preservedControlledInnerBlocks = state?.controlledInnerBlocks ?? {};
-    const newState = {
-      ...state,
-      byClientId: new Map(
-        getFlattenedBlocksWithoutAttributes(action.blocks)
-      ),
-      attributes: new Map(getFlattenedBlockAttributes(action.blocks)),
-      order: mapBlockOrder(action.blocks),
-      parents: new Map(mapBlockParents(action.blocks)),
-      controlledInnerBlocks: preservedControlledInnerBlocks
-    };
+    const newState = reducer(void 0, {
+      type: "INSERT_BLOCKS",
+      rootClientId: "",
+      blocks: action.blocks
+    });
+    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.add(clientId);
         const oldOrder = state.order.get(clientId);
         if (!oldOrder?.length) {
           continue;
         }
         newState.order.set(clientId, oldOrder);
         const preserveBlock = (blockId, parentId) => {
-          const blockData = state.byClientId?.get(blockId);
+          const blockData = state.byClientId.get(blockId);
           if (!blockData) {
             return;
           }
           newState.byClientId.set(blockId, blockData);
           newState.attributes.set(
             blockId,
-            state.attributes?.get(blockId)
+            state.attributes.get(blockId)
           );
           newState.parents.set(blockId, parentId);
-          const childOrder = state.order?.get(blockId) || [];
+          const childOrder = state.order.get(blockId) || [];
           newState.order.set(blockId, childOrder);
           childOrder.forEach(
             (childId) => preserveBlock(childId, blockId)
@@ -415,35 +385,37 @@ var withBlockReset = (reducer) => (state, action) => {
         oldOrder.forEach((id) => preserveBlock(id, clientId));
       }
     }
-    newState.tree = new Map(state?.tree);
-    updateBlockTreeForBlocks(newState, action.blocks);
-    for (const clientId of Object.keys(
-      preservedControlledInnerBlocks
-    )) {
-      if (!preservedControlledInnerBlocks[clientId]) {
-        continue;
-      }
-      if (!newState.byClientId.has(clientId)) {
-        continue;
-      }
+    for (const clientId of newState.controlledInnerBlocks) {
       const controlledOrder = newState.order.get(clientId);
       if (!controlledOrder?.length) {
         continue;
       }
       const innerBlocks = controlledOrder.map(
-        (id) => newState.tree.get(id)
+        (id) => state.tree.get(id)
       );
       const existingEntry = newState.tree.get(clientId);
       if (existingEntry) {
         existingEntry.innerBlocks = innerBlocks;
       }
       newState.tree.set("controlled||" + clientId, { innerBlocks });
+      const preserveTreeEntry = (blockId) => {
+        const treeEntry = state.tree.get(blockId);
+        if (!treeEntry) {
+          return;
+        }
+        newState.tree.set(blockId, treeEntry);
+        const childOrder = newState.order.get(blockId) || [];
+        childOrder.forEach(preserveTreeEntry);
+      };
+      controlledOrder.forEach(preserveTreeEntry);
+    }
+    const preservedBlockEditingModes = state?.blockEditingModes ?? /* @__PURE__ */ new Map();
+    for (const [clientId, mode] of preservedBlockEditingModes) {
+      if (!newState.tree.has(clientId)) {
+        continue;
+      }
+      newState.blockEditingModes.set(clientId, mode);
     }
-    newState.tree.set("", {
-      innerBlocks: action.blocks.map(
-        (subBlock) => newState.tree.get(subBlock.clientId)
-      )
-    });
     return newState;
   }
   return reducer(state, action);
@@ -453,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;
       }
     }
@@ -495,26 +467,6 @@ var withReplaceInnerBlocks = (reducer) => (state, action) => {
   }
   return stateAfterInsert;
 };
-var withSaveReusableBlock = (reducer) => (state, action) => {
-  if (state && action.type === "SAVE_REUSABLE_BLOCK_SUCCESS") {
-    const { id, updatedId } = action;
-    if (id === updatedId) {
-      return state;
-    }
-    state = { ...state };
-    state.attributes = new Map(state.attributes);
-    state.attributes.forEach((attributes, clientId) => {
-      const { name } = state.byClientId.get(clientId);
-      if (name === "core/block" && attributes.ref === id) {
-        state.attributes.set(clientId, {
-          ...attributes,
-          ref: updatedId
-        });
-      }
-    });
-  }
-  return reducer(state, action);
-};
 var withResetControlledBlocks = (reducer) => (state, action) => {
   if (action.type === "SET_HAS_CONTROLLED_INNER_BLOCKS") {
     const innerBlockOrder = state.order.get(action.clientId);
@@ -532,8 +484,6 @@ var withResetControlledBlocks = (reducer) => (state, action) => {
 };
 var blocks = pipe(
   combineReducers,
-  withSaveReusableBlock,
-  // Needs to be before withBlockCache.
   withBlockTree,
   // Needs to be before withInnerBlocksRemoveCascade.
   withInnerBlocksRemoveCascade,
@@ -904,12 +854,38 @@ 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;
+  },
+  blockEditingModes(state = /* @__PURE__ */ new Map(), action) {
+    switch (action.type) {
+      case "SET_BLOCK_EDITING_MODE":
+        if (state.get(action.clientId) === action.mode) {
+          return state;
+        }
+        return new Map(state).set(action.clientId, action.mode);
+      case "UNSET_BLOCK_EDITING_MODE": {
+        if (!state.has(action.clientId)) {
+          return state;
+        }
+        const newState = new Map(state);
+        newState.delete(action.clientId);
+        return newState;
+      }
     }
     return state;
   }
@@ -1233,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();
@@ -1243,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;
@@ -1373,26 +1347,21 @@ function editedContentOnlySection(state, action) {
   if (action.type === "EDIT_CONTENT_ONLY_SECTION") {
     return action.clientId;
   }
-  return state;
-}
-function blockEditingModes(state = /* @__PURE__ */ new Map(), action) {
+  if (!state) {
+    return state;
+  }
   switch (action.type) {
-    case "SET_BLOCK_EDITING_MODE":
-      if (state.get(action.clientId) === action.mode) {
-        return state;
+    case "REMOVE_BLOCKS":
+    case "REPLACE_BLOCKS":
+      if (action.clientIds.includes(state)) {
+        return void 0;
       }
-      return new Map(state).set(action.clientId, action.mode);
-    case "UNSET_BLOCK_EDITING_MODE": {
-      if (!state.has(action.clientId)) {
-        return state;
+      break;
+    case "RESET_BLOCKS":
+      if (!getFlattenedClientIds(action.blocks)[state]) {
+        return void 0;
       }
-      const newState = new Map(state);
-      newState.delete(action.clientId);
-      return newState;
-    }
-    case "RESET_BLOCKS": {
-      return state.has("") ? (/* @__PURE__ */ new Map()).set("", state.get("")) : state;
-    }
+      break;
   }
   return state;
 }
@@ -1531,7 +1500,6 @@ var combinedReducers = combineReducers({
   editedContentOnlySection,
   blockVisibility,
   viewportModalClientIds,
-  blockEditingModes,
   styleOverrides,
   removalPromptData,
   blockRemovalRules,
@@ -1554,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}`);
@@ -1597,12 +1565,12 @@ function getDerivedBlockEditingModesForTree(state, treeClientId = "") {
   const derivedBlockEditingModes = /* @__PURE__ */ new Map();
   const sectionRootClientId = state.settings?.[sectionRootClientIdKey];
   const sectionClientIds = state.blocks.order.get(sectionRootClientId);
-  const hasDisabledBlocks = Array.from(state.blockEditingModes).some(
+  const hasDisabledBlocks = Array.from(state.blocks.blockEditingModes).some(
     ([, mode]) => mode === "disabled"
   );
   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);
@@ -1611,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;
@@ -1640,15 +1608,15 @@ function getDerivedBlockEditingModesForTree(state, treeClientId = "") {
         return;
       }
     }
-    if (state.blockEditingModes.has(clientId)) {
+    if (state.blocks.blockEditingModes.has(clientId)) {
       return;
     }
     if (hasDisabledBlocks) {
       let ancestorBlockEditingMode;
       let parent = state.blocks.parents.get(clientId);
       while (parent !== void 0) {
-        if (state.blockEditingModes.has(parent)) {
-          ancestorBlockEditingMode = state.blockEditingModes.get(parent);
+        if (state.blocks.blockEditingModes.has(parent)) {
+          ancestorBlockEditingMode = state.blocks.blockEditingModes.get(parent);
         }
         if (ancestorBlockEditingMode) {
           break;
@@ -1861,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)
@@ -2023,7 +1991,6 @@ var reducer_default = pipe(
   withAutomaticChangeReset
 )(combinedReducers);
 export {
-  blockEditingModes,
   blockListSettings,
   blockVisibility,
   blocks,