@excalidraw/element 0.18.0-de715913e → 0.18.0-f5d54ac5a

package/dist/dev/index.js

@@ -15260,9 +15260,13 @@ var ElementsDelta = class _ElementsDelta {
   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
@@ -15504,7 +15508,7 @@ var ElementsDelta = class _ElementsDelta {
   }
   squash(delta) {
     const { added, removed, updated } = delta;
-    function mergeBoundElements(prevDelta, nextDelta) {
+    const mergeBoundElements = (prevDelta, nextDelta) => {
       const mergedDeletedBoundElements = Delta.mergeArrays(
         prevDelta.deleted.boundElements ?? [],
         nextDelta.deleted.boundElements ?? [],
@@ -15525,34 +15529,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) => {