@excalidraw/element 0.18.0-de715913e → 0.18.0-f29e9df

package/dist/dev/index.js

@@ -13495,7 +13495,7 @@ var EphemeralIncrement = class extends StoreIncrement {
     this.change = change;
   }
 };
-var StoreDelta = class {
+var StoreDelta = class _StoreDelta {
   constructor(id, elements, appState) {
     this.id = id;
     this.elements = elements;
@@ -13541,12 +13541,15 @@ var StoreDelta = class {
     return new this(id, elements, appState);
   }
   /**
-   * Squash the passed delta into the current instance.
+   * Squash the passed deltas into the aggregated delta instance.
    */
-  squash(delta) {
-    this.elements.squash(delta.elements);
-    this.appState.squash(delta.appState);
-    return this;
+  static squash(...deltas) {
+    const aggregatedDelta = _StoreDelta.empty();
+    for (const delta of deltas) {
+      aggregatedDelta.elements.squash(delta.elements);
+      aggregatedDelta.appState.squash(delta.appState);
+    }
+    return aggregatedDelta;
   }
   /**
    * Inverse store delta, creates new instance of `StoreDelta`.
@@ -13583,6 +13586,9 @@ var StoreDelta = class {
       }
     );
   }
+  static empty() {
+    return _StoreDelta.create(ElementsDelta.empty(), AppStateDelta.empty());
+  }
   isEmpty() {
     return this.elements.isEmpty() && this.appState.isEmpty();
   }
@@ -14651,18 +14657,18 @@ var Delta = class _Delta {
   /**
    * Merges two deltas into a new one.
    */
-  static merge(delta1, delta2, delta3) {
+  static merge(delta1, delta2, delta3 = _Delta.empty()) {
     return _Delta.create(
-      { ...delta1.deleted, ...delta2.deleted, ...delta3?.deleted ?? {} },
-      { ...delta1.inserted, ...delta2.inserted, ...delta3?.inserted ?? {} }
+      { ...delta1.deleted, ...delta2.deleted, ...delta3.deleted },
+      { ...delta1.inserted, ...delta2.inserted, ...delta3.inserted }
     );
   }
   /**
    * Merges deleted and inserted object partials.
    */
-  static mergeObjects(prev, added, removed) {
+  static mergeObjects(prev, added, removed = {}) {
     const cloned = { ...prev };
-    for (const key of Object.keys(removed ?? {})) {
+    for (const key of Object.keys(removed)) {
       delete cloned[key];
     }
     return { ...cloned, ...added };
@@ -14906,6 +14912,9 @@ var AppStateDelta = class _AppStateDelta {
     return new _AppStateDelta(inversedDelta);
   }
   squash(delta) {
+    if (delta.isEmpty()) {
+      return this;
+    }
     const mergedDeletedSelectedElementIds = Delta.mergeObjects(
       this.delta.deleted.selectedElementIds ?? {},
       delta.delta.deleted.selectedElementIds ?? {}
@@ -14914,36 +14923,54 @@ var AppStateDelta = class _AppStateDelta {
       this.delta.inserted.selectedElementIds ?? {},
       delta.delta.inserted.selectedElementIds ?? {}
     );
+    const mergedDeletedSelectedGroupIds = Delta.mergeObjects(
+      this.delta.deleted.selectedGroupIds ?? {},
+      delta.delta.deleted.selectedGroupIds ?? {}
+    );
     const mergedInsertedSelectedGroupIds = Delta.mergeObjects(
       this.delta.inserted.selectedGroupIds ?? {},
       delta.delta.inserted.selectedGroupIds ?? {}
     );
-    const mergedDeletedSelectedGroupIds = Delta.mergeObjects(
-      this.delta.deleted.selectedGroupIds ?? {},
-      delta.delta.deleted.selectedGroupIds ?? {}
+    const mergedDeletedLockedMultiSelections = Delta.mergeObjects(
+      this.delta.deleted.lockedMultiSelections ?? {},
+      delta.delta.deleted.lockedMultiSelections ?? {}
     );
-    const mergedDelta = Delta.create(
-      {
-        selectedElementIds: mergedDeletedSelectedElementIds,
-        selectedGroupIds: mergedDeletedSelectedGroupIds
-      },
-      {
-        selectedElementIds: mergedInsertedSelectedElementIds,
-        selectedGroupIds: mergedInsertedSelectedGroupIds
-      }
+    const mergedInsertedLockedMultiSelections = Delta.mergeObjects(
+      this.delta.inserted.lockedMultiSelections ?? {},
+      delta.delta.inserted.lockedMultiSelections ?? {}
+    );
+    const mergedInserted = {};
+    const mergedDeleted = {};
+    if (Object.keys(mergedDeletedSelectedElementIds).length || Object.keys(mergedInsertedSelectedElementIds).length) {
+      mergedDeleted.selectedElementIds = mergedDeletedSelectedElementIds;
+      mergedInserted.selectedElementIds = mergedInsertedSelectedElementIds;
+    }
+    if (Object.keys(mergedDeletedSelectedGroupIds).length || Object.keys(mergedInsertedSelectedGroupIds).length) {
+      mergedDeleted.selectedGroupIds = mergedDeletedSelectedGroupIds;
+      mergedInserted.selectedGroupIds = mergedInsertedSelectedGroupIds;
+    }
+    if (Object.keys(mergedDeletedLockedMultiSelections).length || Object.keys(mergedInsertedLockedMultiSelections).length) {
+      mergedDeleted.lockedMultiSelections = mergedDeletedLockedMultiSelections;
+      mergedInserted.lockedMultiSelections = mergedInsertedLockedMultiSelections;
+    }
+    this.delta = Delta.merge(
+      this.delta,
+      delta.delta,
+      Delta.create(mergedDeleted, mergedInserted)
     );
-    this.delta = Delta.merge(this.delta, delta.delta, mergedDelta);
     return this;
   }
   applyTo(appState, nextElements) {
     try {
       const {
         selectedElementIds: deletedSelectedElementIds = {},
-        selectedGroupIds: deletedSelectedGroupIds = {}
+        selectedGroupIds: deletedSelectedGroupIds = {},
+        lockedMultiSelections: deletedLockedMultiSelections = {}
       } = this.delta.deleted;
       const {
         selectedElementIds: insertedSelectedElementIds = {},
         selectedGroupIds: insertedSelectedGroupIds = {},
+        lockedMultiSelections: insertedLockedMultiSelections = {},
         selectedLinearElement: insertedSelectedLinearElement,
         ...directlyApplicablePartial
       } = this.delta.inserted;
@@ -14957,6 +14984,11 @@ var AppStateDelta = class _AppStateDelta {
         insertedSelectedGroupIds,
         deletedSelectedGroupIds
       );
+      const mergedLockedMultiSelections = Delta.mergeObjects(
+        appState.lockedMultiSelections,
+        insertedLockedMultiSelections,
+        deletedLockedMultiSelections
+      );
       const selectedLinearElement = insertedSelectedLinearElement && nextElements.has(insertedSelectedLinearElement.elementId) ? new LinearElementEditor(
         nextElements.get(
           insertedSelectedLinearElement.elementId
@@ -14969,6 +15001,7 @@ var AppStateDelta = class _AppStateDelta {
         ...directlyApplicablePartial,
         selectedElementIds: mergedSelectedElementIds,
         selectedGroupIds: mergedSelectedGroupIds,
+        lockedMultiSelections: mergedLockedMultiSelections,
         selectedLinearElement: typeof insertedSelectedLinearElement !== "undefined" ? selectedLinearElement : appState.selectedLinearElement
       };
       const constainsVisibleChanges = this.filterInvisibleChanges(
@@ -15172,12 +15205,6 @@ var AppStateDelta = class _AppStateDelta {
         "lockedMultiSelections",
         (prevValue) => prevValue ?? {}
       );
-      Delta.diffObjects(
-        deleted,
-        inserted,
-        "activeLockedId",
-        (prevValue) => prevValue ?? null
-      );
     } catch (e) {
       console.error(`Couldn't postprocess appstate change deltas.`);
       if (isTestEnv8() || isDevEnv7()) {
@@ -15256,13 +15283,17 @@ var ElementsDelta = class _ElementsDelta {
   static satisfiesCommmonInvariants = ({
     deleted,
     inserted
-  }) => !!(deleted.version && inserted.version && // versions are required integers
-  Number.isInteger(deleted.version) && Number.isInteger(inserted.version) && // versions should be positive, zero included
+  }) => !!// versions are required integers
+  (Number.isInteger(deleted.version) && Number.isInteger(inserted.version) && // versions should be positive, zero included
   deleted.version >= 0 && inserted.version >= 0 && // versions should never be the same
   deleted.version !== inserted.version);
+  static satisfiesUniqueInvariants = (elementsDelta, id) => {
+    const { added, removed, updated } = elementsDelta;
+    return [added[id], removed[id], updated[id]].filter(Boolean).length === 1;
+  };
   static validate(elementsDelta, type, satifiesSpecialInvariants) {
     for (const [id, delta] of Object.entries(elementsDelta[type])) {
-      if (!this.satisfiesCommmonInvariants(delta) || !satifiesSpecialInvariants(delta)) {
+      if (!this.satisfiesCommmonInvariants(delta) || !this.satisfiesUniqueInvariants(elementsDelta, id) || !satifiesSpecialInvariants(delta)) {
         console.error(
           `Broken invariant for "${type}" delta, element "${id}", delta:`,
           delta
@@ -15302,6 +15333,8 @@ var ElementsDelta = class _ElementsDelta {
         );
         if (!prevElement.isDeleted) {
           removed[prevElement.id] = delta;
+        } else {
+          updated[prevElement.id] = delta;
         }
       }
     }
@@ -15323,6 +15356,8 @@ var ElementsDelta = class _ElementsDelta {
         );
         if (!nextElement.isDeleted) {
           added[nextElement.id] = delta;
+        } else {
+          updated[nextElement.id] = delta;
         }
         continue;
       }
@@ -15344,13 +15379,7 @@ var ElementsDelta = class _ElementsDelta {
           }
           continue;
         }
-        const strippedDeleted = _ElementsDelta.stripVersionProps(delta.deleted);
-        const strippedInserted = _ElementsDelta.stripVersionProps(
-          delta.inserted
-        );
-        if (Delta.isInnerDifferent(strippedDeleted, strippedInserted, true)) {
-          updated[nextElement.id] = delta;
-        }
+        updated[nextElement.id] = delta;
       }
     }
     return _ElementsDelta.create(added, removed, updated);
@@ -15426,13 +15455,7 @@ var ElementsDelta = class _ElementsDelta {
         } else {
           latestDelta = delta;
         }
-        const strippedDeleted = _ElementsDelta.stripVersionProps(
-          latestDelta.deleted
-        );
-        const strippedInserted = _ElementsDelta.stripVersionProps(
-          latestDelta.inserted
-        );
-        if (Delta.isInnerDifferent(strippedDeleted, strippedInserted)) {
+        if (Delta.isInnerDifferent(latestDelta.deleted, latestDelta.inserted)) {
           modifiedDeltas[id] = latestDelta;
         }
       }
@@ -15503,8 +15526,11 @@ var ElementsDelta = class _ElementsDelta {
     }
   }
   squash(delta) {
+    if (delta.isEmpty()) {
+      return this;
+    }
     const { added, removed, updated } = delta;
-    function mergeBoundElements(prevDelta, nextDelta) {
+    const mergeBoundElements = (prevDelta, nextDelta) => {
       const mergedDeletedBoundElements = Delta.mergeArrays(
         prevDelta.deleted.boundElements ?? [],
         nextDelta.deleted.boundElements ?? [],
@@ -15517,6 +15543,9 @@ var ElementsDelta = class _ElementsDelta {
         void 0,
         (x) => x.id
       ) ?? [];
+      if (!mergedDeletedBoundElements.length && !mergedInsertedBoundElements.length) {
+        return;
+      }
       return Delta.create(
         {
           boundElements: mergedDeletedBoundElements
@@ -15525,34 +15554,50 @@ var ElementsDelta = class _ElementsDelta {
           boundElements: mergedInsertedBoundElements
         }
       );
-    }
+    };
     for (const [id, nextDelta] of Object.entries(added)) {
-      const prevDelta = this.added[id];
+      const prevDelta = this.added[id] ?? this.removed[id] ?? this.updated[id];
       if (!prevDelta) {
         this.added[id] = nextDelta;
       } else {
         const mergedDelta = mergeBoundElements(prevDelta, nextDelta);
+        delete this.removed[id];
+        delete this.updated[id];
         this.added[id] = Delta.merge(prevDelta, nextDelta, mergedDelta);
       }
     }
     for (const [id, nextDelta] of Object.entries(removed)) {
-      const prevDelta = this.removed[id];
+      const prevDelta = this.added[id] ?? this.removed[id] ?? this.updated[id];
       if (!prevDelta) {
         this.removed[id] = nextDelta;
       } else {
         const mergedDelta = mergeBoundElements(prevDelta, nextDelta);
+        delete this.added[id];
+        delete this.updated[id];
         this.removed[id] = Delta.merge(prevDelta, nextDelta, mergedDelta);
       }
     }
     for (const [id, nextDelta] of Object.entries(updated)) {
-      const prevDelta = this.updated[id];
+      const prevDelta = this.added[id] ?? this.removed[id] ?? this.updated[id];
       if (!prevDelta) {
         this.updated[id] = nextDelta;
       } else {
         const mergedDelta = mergeBoundElements(prevDelta, nextDelta);
-        this.updated[id] = Delta.merge(prevDelta, nextDelta, mergedDelta);
+        const updatedDelta = Delta.merge(prevDelta, nextDelta, mergedDelta);
+        if (prevDelta === this.added[id]) {
+          this.added[id] = updatedDelta;
+        } else if (prevDelta === this.removed[id]) {
+          this.removed[id] = updatedDelta;
+        } else {
+          this.updated[id] = updatedDelta;
+        }
       }
     }
+    if (isTestEnv8() || isDevEnv7()) {
+      _ElementsDelta.validate(this, "added", _ElementsDelta.satisfiesAddition);
+      _ElementsDelta.validate(this, "removed", _ElementsDelta.satisfiesRemoval);
+      _ElementsDelta.validate(this, "updated", _ElementsDelta.satisfiesUpdate);
+    }
     return this;
   }
   static createApplier = (prevElements, nextElements, snapshot, flags, options) => (deltas) => {
@@ -15851,10 +15896,6 @@ var ElementsDelta = class _ElementsDelta {
     const { id, updated, ...strippedPartial } = partial;
     return strippedPartial;
   }
-  static stripVersionProps(partial) {
-    const { version, versionNonce, ...strippedPartial } = partial;
-    return strippedPartial;
-  }
 };
 
 // src/distribute.ts