@wordpress/block-editor 15.3.1-next.6f42e1382.0 → 15.3.1-next.a730c9c8c.0

package/build/store/reducer.js

@@ -2058,7 +2058,7 @@ function getDerivedBlockEditingModesForTree(state, isNavMode = false, treeClient
   // Use array.from for better back compat. Older versions of the iterator returned
   // from `keys()` didn't have the `filter` method.
   const unsyncedPatternClientIds = !!window?.__experimentalContentOnlyPatternInsertion ? Array.from(state.blocks.attributes.keys()).filter(clientId => state.blocks.attributes.get(clientId)?.metadata?.patternName) : [];
-  const contentOnlyParents = [...contentOnlyTemplateLockedClientIds, ...unsyncedPatternClientIds];
+  const contentOnlyParents = [...contentOnlyTemplateLockedClientIds, ...unsyncedPatternClientIds, ...(window?.__experimentalContentOnlyPatternInsertion ? templatePartClientIds : [])];
   traverseBlockTree(state, treeClientId, block => {
     const {
       clientId,
@@ -2348,6 +2348,60 @@ function withDerivedBlockEditingModes(reducer) {
           }
           break;
         }
+      case 'UPDATE_BLOCK_ATTRIBUTES':
+        {
+          // Handle unsynced patterns which indicate their contentOnly-ness via
+          // the `attributes.metadata.patternName` property.
+          // Check when this is added or removed and update blockEditingModes.
+          const addedBlocks = [];
+          const removedClientIds = [];
+          for (const clientId of action?.clientIds) {
+            const attributes = action.options?.uniqueByBlock ? action.attributes[clientId] : action.attributes;
+            if (!attributes) {
+              break;
+            }
+            if (
+            // patternName is switching from falsy to truthy, indicating
+            // this block is becoming an unsynced pattern.
+            attributes.metadata?.patternName && !state.blocks.attributes.get(clientId)?.metadata?.patternName) {
+              addedBlocks.push(nextState.blocks.tree.get(clientId));
+            } else if (
+            // patternName is switching from truthy to falsy, this block is becoming
+            // a regular block but was an unsynced pattern.
+            // Check that `metadata` is part of the included attributes, as
+            // `updateBlockAttributes` merges attributes, if it isn't present
+            // the previous `metadata` would be retained.
+            attributes.metadata && !attributes.metadata?.patternName && state.blocks.attributes.get(clientId)?.metadata?.patternName) {
+              // Include it in 'removedClientIds'.
+              removedClientIds.push(clientId);
+            }
+          }
+          if (!addedBlocks?.length && !removedClientIds?.length) {
+            break;
+          }
+          const nextDerivedBlockEditingModes = getDerivedBlockEditingModesUpdates({
+            prevState: state,
+            nextState,
+            addedBlocks,
+            removedClientIds,
+            isNavMode: false
+          });
+          const nextDerivedNavModeBlockEditingModes = getDerivedBlockEditingModesUpdates({
+            prevState: state,
+            nextState,
+            addedBlocks,
+            removedClientIds,
+            isNavMode: true
+          });
+          if (nextDerivedBlockEditingModes || nextDerivedNavModeBlockEditingModes) {
+            return {
+              ...nextState,
+              derivedBlockEditingModes: nextDerivedBlockEditingModes !== null && nextDerivedBlockEditingModes !== void 0 ? nextDerivedBlockEditingModes : state.derivedBlockEditingModes,
+              derivedNavModeBlockEditingModes: nextDerivedNavModeBlockEditingModes !== null && nextDerivedNavModeBlockEditingModes !== void 0 ? nextDerivedNavModeBlockEditingModes : state.derivedNavModeBlockEditingModes
+            };
+          }
+          break;
+        }
       case 'UPDATE_BLOCK_LIST_SETTINGS':
         {
           // Handle the addition and removal of contentOnly template locked blocks.