@excalidraw/element 0.18.0-7b8a5f54c → 0.18.0-880dbb25e

package/dist/dev/index.js

@@ -14651,10 +14651,10 @@ var Delta = class _Delta {
   /**
    * Merges two deltas into a new one.
    */
-  static merge(delta1, delta2) {
+  static merge(delta1, delta2, delta3) {
     return _Delta.create(
-      { ...delta1.deleted, ...delta2.deleted },
-      { ...delta1.inserted, ...delta2.inserted }
+      { ...delta1.deleted, ...delta2.deleted, ...delta3?.deleted ?? {} },
+      { ...delta1.inserted, ...delta2.inserted, ...delta3?.inserted ?? {} }
     );
   }
   /**
@@ -14662,7 +14662,7 @@ var Delta = class _Delta {
    */
   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,7 +14906,33 @@ var AppStateDelta = class _AppStateDelta {
     return new _AppStateDelta(inversedDelta);
   }
   squash(delta) {
-    this.delta = Delta.merge(this.delta, delta.delta);
+    const mergedDeletedSelectedElementIds = Delta.mergeObjects(
+      this.delta.deleted.selectedElementIds ?? {},
+      delta.delta.deleted.selectedElementIds ?? {}
+    );
+    const mergedInsertedSelectedElementIds = Delta.mergeObjects(
+      this.delta.inserted.selectedElementIds ?? {},
+      delta.delta.inserted.selectedElementIds ?? {}
+    );
+    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 mergedDelta = Delta.create(
+      {
+        selectedElementIds: mergedDeletedSelectedElementIds,
+        selectedGroupIds: mergedDeletedSelectedGroupIds
+      },
+      {
+        selectedElementIds: mergedInsertedSelectedElementIds,
+        selectedGroupIds: mergedInsertedSelectedGroupIds
+      }
+    );
+    this.delta = Delta.merge(this.delta, delta.delta, mergedDelta);
     return this;
   }
   applyTo(appState, nextElements) {
@@ -15234,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
@@ -15478,30 +15508,71 @@ var ElementsDelta = class _ElementsDelta {
   }
   squash(delta) {
     const { added, removed, updated } = delta;
+    const mergeBoundElements = (prevDelta, nextDelta) => {
+      const mergedDeletedBoundElements = Delta.mergeArrays(
+        prevDelta.deleted.boundElements ?? [],
+        nextDelta.deleted.boundElements ?? [],
+        void 0,
+        (x) => x.id
+      ) ?? [];
+      const mergedInsertedBoundElements = Delta.mergeArrays(
+        prevDelta.inserted.boundElements ?? [],
+        nextDelta.inserted.boundElements ?? [],
+        void 0,
+        (x) => x.id
+      ) ?? [];
+      return Delta.create(
+        {
+          boundElements: mergedDeletedBoundElements
+        },
+        {
+          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 {
-        this.added[id] = Delta.merge(prevDelta, nextDelta);
+        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 {
-        this.removed[id] = Delta.merge(prevDelta, nextDelta);
+        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 {
-        this.updated[id] = Delta.merge(prevDelta, nextDelta);
+        const mergedDelta = mergeBoundElements(prevDelta, nextDelta);
+        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) => {
@@ -15618,6 +15689,7 @@ var ElementsDelta = class _ElementsDelta {
         return;
       }
       const prevElement = prevElements.get(element.id);
+      const nextVersion = applyDirection === "forward" ? nextElement.version + 1 : nextElement.version - 1;
       const elementUpdates = updates;
       let affectedElement;
       if (prevElement === nextElement) {
@@ -15625,15 +15697,15 @@ var ElementsDelta = class _ElementsDelta {
           nextElement,
           {
             ...elementUpdates,
-            version: applyDirection === "forward" ? nextElement.version + 1 : nextElement.version - 1
+            version: nextVersion
           },
           true
         );
       } else {
         affectedElement = mutateElement(nextElement, nextElements, {
           ...elementUpdates,
-          // don't modify the version further, as we've already updated it
-          version: nextElement.version
+          // don't modify the version further, if it's already different
+          version: prevElement?.version !== nextElement.version ? nextElement.version : nextVersion
         });
       }
       nextAffectedElements.set(affectedElement.id, affectedElement);