microboard-temp 0.13.42 → 0.13.43

package/dist/cjs/browser.js

@@ -4177,18 +4177,23 @@ function createEventsList(commandFactory) {
         return item;
       if (typeof item === "string")
         return [item];
-      return Object.keys(item);
+      if (item && typeof item === "object")
+        return Object.keys(item);
     }
-    if ("itemsMap" in op)
+    if ("itemsMap" in op && op.itemsMap)
       return Object.keys(op.itemsMap);
     if ("items" in op) {
       const items = op.items;
-      if (Array.isArray(items))
-        return items.map((i) => typeof i === "string" ? i : i.id);
-      return Object.keys(items);
+      if (Array.isArray(items)) {
+        return items.map((i) => typeof i === "string" ? i : i.id).filter(Boolean);
+      }
+      if (items && typeof items === "object" && items !== null)
+        return Object.keys(items);
+    }
+    if ("itemsOps" in op) {
+      const itemsOps = op.itemsOps;
+      return itemsOps.map((io) => io.item);
     }
-    if ("itemsOps" in op)
-      return op.itemsOps.map((io) => io.item);
     return [];
   }
   return {
@@ -5882,16 +5887,17 @@ var init_transformEvents = __esm(() => {
 function expandEvents(events) {
   return events.flatMap((event) => {
     if ("operations" in event.body) {
-      return event.body.operations.map((operation) => ({
+      const { operations, lastKnownOrder, ...bodyWithoutOps } = event.body;
+      return operations.map((operation) => ({
         order: event.order,
         body: {
-          eventId: operation.actualId || event.body.eventId,
-          userId: event.body.userId,
-          boardId: event.body.boardId,
+          eventId: operation.actualId || bodyWithoutOps.eventId,
+          userId: bodyWithoutOps.userId,
+          boardId: bodyWithoutOps.boardId,
           operation
         },
-        userId: event.body.userId,
-        lastKnownOrder: "lastKnownOrder" in event ? event.lastKnownOrder : event.body.lastKnownOrder
+        userId: bodyWithoutOps.userId,
+        lastKnownOrder
       }));
     } else {
       return [event];
@@ -6003,13 +6009,15 @@ var init_insertEventsFromOtherConnectionsIntoList = __esm(() => {
 function deserializeAndApplyToList(events, list, board) {
   list.clear();
   for (const event of events) {
-    const body = event.body;
-    if (body.operations && Array.isArray(body.operations)) {
-      for (const op of body.operations) {
+    if ("operations" in event.body) {
+      const { operations, lastKnownOrder, ...bodyWithoutOps } = event.body;
+      for (const op of operations) {
         const singleEvent = {
-          ...event,
+          order: event.order,
+          lastKnownOrder,
+          userId: bodyWithoutOps.userId,
           body: {
-            ...event.body,
+            ...bodyWithoutOps,
             operation: op
           }
         };
@@ -11595,7 +11603,7 @@ class RTreeIndex {
       this.tree.remove(item);
     }
   }
-  list() {
+  listAll() {
     const containers = this.tree.all();
     const items = [];
     for (const container of containers) {
@@ -11603,7 +11611,7 @@ class RTreeIndex {
     }
     return items;
   }
-  getEnclosed(rect) {
+  listEnclosedBy(rect) {
     return this.tree.search({
       minX: rect.left,
       minY: rect.top,
@@ -11611,7 +11619,7 @@ class RTreeIndex {
       maxY: rect.bottom
     }).filter((container) => container.item.isEnclosedBy(rect)).map((container) => container.item);
   }
-  getEnclosedOrCrossedBy(rect) {
+  listEnclosedOrCrossedBy(rect) {
     return this.tree.search({
       minX: rect.left,
       minY: rect.top,
@@ -11619,7 +11627,7 @@ class RTreeIndex {
       maxY: rect.bottom
     }).filter((container) => container.item.isEnclosedOrCrossedBy(rect)).map((container) => container.item);
   }
-  getUnderPoint(point, tolerance = 5) {
+  listUnderPoint(point, tolerance = 5) {
     return this.tree.search({
       minX: point.x,
       minY: point.y,
@@ -11627,7 +11635,7 @@ class RTreeIndex {
       maxY: point.y
     }).filter((container) => container.item.isUnderPoint(point, tolerance)).map((container) => container.item);
   }
-  getRectsEnclosedOrCrossedBy(rect) {
+  listRectsEnclosedOrCrossedBy(rect) {
     return this.tree.search({
       minX: rect.left,
       minY: rect.top,
@@ -11643,9 +11651,27 @@ class RTreeIndex {
       maxY: rect.bottom
     });
   }
-  getNearestTo(point, maxItems, filter, maxDistance) {
+  listNearestTo(point, maxItems, filter, maxDistance) {
     return knn(this.tree, point.x, point.y, maxItems, (container) => filter(container.item), maxDistance).map((container) => container.item);
   }
+  getById(id) {
+    return this.listAll().find((item) => item.getId() === id);
+  }
+  findById(id) {
+    return this.getById(id);
+  }
+  getByZIndex(index) {
+    return this.listAll()[index];
+  }
+  getLastZIndex() {
+    return this.listAll().length - 1;
+  }
+  copy() {
+    return this.listAll().map((item) => ({
+      ...item.serialize(),
+      id: item.getId()
+    }));
+  }
   batchInsert(batch) {
     for (const one of batch) {
       this.insert(one);
@@ -11717,35 +11743,31 @@ class LayeredIndex {
   isT(item) {
     return true;
   }
-  findById(id) {
-    const container = this.map.get(id);
-    return container ? container.item : undefined;
-  }
-  getEnclosed(rect) {
+  listEnclosedBy(rect) {
     let items = [];
     for (const layer of this.layers.array) {
-      items = items.concat(layer.getEnclosed(rect));
+      items = items.concat(layer.listEnclosedBy(rect));
     }
     return items;
   }
-  getEnclosedOrCrossedBy(rect) {
+  listEnclosedOrCrossedBy(rect) {
     let items = [];
     for (const layer of this.layers.array) {
-      items = items.concat(layer.getEnclosedOrCrossedBy(rect));
+      items = items.concat(layer.listEnclosedOrCrossedBy(rect));
     }
     return items;
   }
-  getUnderPoint(point, tolerance = 5) {
+  listUnderPoint(point, tolerance = 5) {
     let items = [];
     for (const layer of this.layers.array) {
-      const layerItems = layer.getUnderPoint(point, tolerance);
+      const layerItems = layer.listUnderPoint(point, tolerance);
       if (layerItems.length > 0) {
         items = items.concat(layerItems);
       }
     }
     return items;
   }
-  getRectsEnclosedOrCrossedBy(rect) {
+  listRectsEnclosedOrCrossedBy(rect) {
     const items = [];
     const minMax = {
       minX: rect.left,
@@ -11769,10 +11791,10 @@ class LayeredIndex {
     }
     return false;
   }
-  getNearestTo(point, maxItems, filter, maxDistance) {
+  listNearestTo(point, maxItems, filter, maxDistance) {
     let items = [];
     for (const layer of this.layers.array) {
-      items = items.concat(layer.getNearestTo(point, maxItems, filter, maxDistance));
+      items = items.concat(layer.listNearestTo(point, maxItems, filter, maxDistance));
     }
     return items;
   }
@@ -11806,7 +11828,7 @@ class LayeredIndex {
     }
     const bounds = container.item.getMbrWithChildren();
     this.remove(container.item);
-    const inBounds = this.getRectsEnclosedOrCrossedBy(bounds);
+    const inBounds = this.listRectsEnclosedOrCrossedBy(bounds);
     const containersInBounds = this.getContainersFromItems(inBounds);
     const containersAbove = [];
     const containerZIndex = this.getZIndex(container.item);
@@ -11834,7 +11856,7 @@ class LayeredIndex {
     }
     const bounds = container.item.getMbrWithChildren();
     this.remove(container.item);
-    const inBounds = this.getRectsEnclosedOrCrossedBy(bounds);
+    const inBounds = this.listRectsEnclosedOrCrossedBy(bounds);
     const containersInBounds = this.getContainersFromItems(inBounds);
     const containersBelow = [];
     const containerZIndex = this.getZIndex(container.item);
@@ -11859,7 +11881,7 @@ class LayeredIndex {
   insert(item) {
     const toInsert = new Container(item.getId(), item, 0, this.getZIndex(item));
     const bounds = item.getMbrWithChildren();
-    const inBounds = this.getRectsEnclosedOrCrossedBy(bounds);
+    const inBounds = this.listRectsEnclosedOrCrossedBy(bounds);
     if (inBounds.length === 0) {
       return this.insertContainer(toInsert);
     }
@@ -11956,13 +11978,32 @@ class LayeredIndex {
       return;
     }
   }
-  list() {
+  listAll() {
     const items = [];
     for (const record of this.map) {
       items.push(record[1].item);
     }
     return items;
   }
+  getById(id) {
+    const container = this.map.get(id);
+    return container ? container.item : undefined;
+  }
+  findById(id) {
+    return this.getById(id);
+  }
+  getByZIndex(index) {
+    return this.listAll()[index];
+  }
+  getLastZIndex() {
+    return this.listAll().length - 1;
+  }
+  copy() {
+    return this.listAll().map((item) => ({
+      ...item.serialize(),
+      id: item.getId()
+    }));
+  }
   batchInsert(items) {
     for (const item of items) {
       this.insert(item);
@@ -11979,11 +12020,6 @@ var init_LayeredIndex = __esm(() => {
   init_RTreeIndex();
 });
 
-// src/Items/BaseItem/index.ts
-var init_BaseItem = __esm(() => {
-  init_BaseItem2();
-});
-
 // src/SpatialIndex/SpacialIndex.ts
 function worldBoundsToLocal(container, left, top, right, bottom) {
   const inv = container.getNestingMatrix().getInverse();
@@ -12002,6 +12038,13 @@ function worldBoundsToLocal(container, left, top, right, bottom) {
     bottom: Math.max(corners[0].y, corners[1].y, corners[2].y, corners[3].y)
   };
 }
+function coerceMbr(left, top, right, bottom) {
+  if (left instanceof Mbr)
+    return left;
+  if (typeof left === "object" && left !== null)
+    return new Mbr(left.left, left.top, left.right, left.bottom);
+  return new Mbr(left, top, right, bottom);
+}
 
 class SpatialIndex {
   subject = new Subject;
@@ -12050,7 +12093,7 @@ class SpatialIndex {
   remove(item, preserveChildren = false) {
     const baseItem = item;
     if (!preserveChildren && baseItem.index) {
-      baseItem.removeChildItems(baseItem.index.list());
+      baseItem.removeChildItems(baseItem.index.listAll());
     }
     this.itemsArray.splice(this.itemsArray.indexOf(item), 1);
     this.itemsIndex.remove(item);
@@ -12093,14 +12136,14 @@ class SpatialIndex {
     return items.flatMap((item) => {
       const baseItem = item;
       if (baseItem.index) {
-        return [item, ...baseItem.index.list()];
+        return [item, ...baseItem.index.listAll()];
       }
       return item;
     });
   }
   getItemChildren(item) {
     if ("index" in item && item.index) {
-      return item.index.list();
+      return item.index.listAll();
     }
     return [];
   }
@@ -12251,14 +12294,14 @@ class SpatialIndex {
   findById(id) {
     return this.getById(id);
   }
-  getEnclosed(left, top, right, bottom) {
-    const mbr = new Mbr(left, top, right, bottom);
-    const items = this.itemsIndex.getEnclosed(mbr);
+  listEnclosedBy(left, top, right, bottom) {
+    const mbr = coerceMbr(left, top, right, bottom);
+    const items = this.itemsIndex.listEnclosedBy(mbr);
     const children = [];
     const clearItems = items.filter((item) => {
       if ("index" in item && item.index) {
-        const local = worldBoundsToLocal(item, left, top, right, bottom);
-        children.push(...item.index.getEnclosed(local.left, local.top, local.right, local.bottom));
+        const local = worldBoundsToLocal(item, mbr.left, mbr.top, mbr.right, mbr.bottom);
+        children.push(...item.index.listEnclosedBy(local.left, local.top, local.right, local.bottom));
         if (!item.getMbr().isEnclosedBy(mbr)) {
           return false;
         }
@@ -12267,14 +12310,14 @@ class SpatialIndex {
     });
     return [...clearItems, ...children];
   }
-  getEnclosedOrCrossed(left, top, right, bottom) {
-    const mbr = new Mbr(left, top, right, bottom);
-    const items = this.itemsIndex.getEnclosedOrCrossedBy(mbr);
+  listEnclosedOrCrossedBy(left, top, right, bottom) {
+    const mbr = coerceMbr(left, top, right, bottom);
+    const items = this.itemsIndex.listEnclosedOrCrossedBy(mbr);
     const children = [];
     const clearItems = items.filter((item) => {
       if ("index" in item && item.index) {
-        const local = worldBoundsToLocal(item, left, top, right, bottom);
-        children.push(...item.index.getEnclosedOrCrossed(local.left, local.top, local.right, local.bottom));
+        const local = worldBoundsToLocal(item, mbr.left, mbr.top, mbr.right, mbr.bottom);
+        children.push(...item.index.listEnclosedOrCrossedBy(local.left, local.top, local.right, local.bottom));
         if (!item.getMbr().isEnclosedOrCrossedBy(mbr)) {
           return false;
         }
@@ -12283,14 +12326,17 @@ class SpatialIndex {
     });
     return [...clearItems, ...children];
   }
-  getUnderPoint(point, tolerance = 5) {
-    const items = this.itemsIndex.getUnderPoint(point, tolerance);
+  listRectsEnclosedOrCrossedBy(left, top, right, bottom) {
+    return this.listEnclosedOrCrossedBy(left, top, right, bottom).map((item) => item.getMbr());
+  }
+  listUnderPoint(point, tolerance = 5) {
+    const items = this.itemsIndex.listUnderPoint(point, tolerance);
     const children = [];
     const clearItems = items.filter((item) => {
       if ("index" in item && item.index) {
         const localPt = new Point(point.x, point.y);
         item.getNestingMatrix().getInverse().apply(localPt);
-        children.push(...item.index.getUnderPoint(localPt, tolerance));
+        children.push(...item.index.listUnderPoint(localPt, tolerance));
         if (!item.getMbr().isUnderPoint(point)) {
           return false;
         }
@@ -12302,24 +12348,8 @@ class SpatialIndex {
     });
     return [...clearItems, ...children];
   }
-  getRectsEnclosedOrCrossed(left, top, right, bottom) {
-    const mbr = new Mbr(left, top, right, bottom);
-    const items = this.itemsIndex.getRectsEnclosedOrCrossedBy(mbr);
-    const children = [];
-    const clearItems = items.filter((item) => {
-      if ("index" in item && item.index) {
-        const local = worldBoundsToLocal(item, left, top, right, bottom);
-        children.push(...item.index.getEnclosedOrCrossed(local.left, local.top, local.right, local.bottom));
-        if (!item.getMbr().isEnclosedOrCrossedBy(mbr)) {
-          return false;
-        }
-      }
-      return true;
-    });
-    return [...clearItems, ...children];
-  }
-  getItemsEnclosedOrCrossed(left, top, right, bottom) {
-    return this.getRectsEnclosedOrCrossed(left, top, right, bottom);
+  listNearestTo(point, maxItems, filter, maxDistance) {
+    return this.itemsIndex.listNearestTo(point, maxItems, filter, maxDistance);
   }
   getComments() {
     return this.itemsArray.filter((item) => item.itemType === "Comment");
@@ -12337,7 +12367,7 @@ class SpatialIndex {
     const inRange = itemsWithDistance.filter((x) => x.distance <= maxDistance);
     return inRange.sort((a, b) => a.distance - b.distance).slice(0, maxItems).map((x) => x.item);
   }
-  list() {
+  listAll() {
     return this.getItemsWithIncludedChildren(this.itemsArray).concat();
   }
   getZIndex(item) {
@@ -12375,10 +12405,19 @@ class Items {
     this.index.change(item);
   }
   listAll() {
-    return this.index.list();
+    return this.index.listAll();
+  }
+  listUnderPoint(point, tolerance = 5) {
+    return this.index.listUnderPoint(point, tolerance);
+  }
+  listEnclosedBy(left, top, right, bottom) {
+    return this.index.listEnclosedBy(left, top, right, bottom);
+  }
+  listEnclosedOrCrossedBy(left, top, right, bottom) {
+    return this.index.listEnclosedOrCrossedBy(left, top, right, bottom);
   }
   listGroupItems() {
-    return this.index.list().filter((item) => ("index" in item) && item.index);
+    return this.index.listAll().filter((item) => ("index" in item) && item.index);
   }
   getById(id) {
     return this.index.getById(id);
@@ -12387,16 +12426,16 @@ class Items {
     return this.index.findById(id);
   }
   getEnclosed(left, top, right, bottom) {
-    return this.index.getEnclosed(left, top, right, bottom);
+    return this.index.listEnclosedBy(left, top, right, bottom);
   }
   getEnclosedOrCrossed(left, top, right, bottom) {
-    return this.index.getEnclosedOrCrossed(left, top, right, bottom);
+    return this.index.listEnclosedOrCrossedBy(left, top, right, bottom);
   }
   getGroupItemsEnclosedOrCrossed(left, top, right, bottom) {
-    return this.index.getEnclosedOrCrossed(left, top, right, bottom).filter((item) => item instanceof BaseItem && item.index);
+    return this.index.listEnclosedOrCrossedBy(left, top, right, bottom).filter((item) => ("index" in item) && item.index);
   }
   getUnderPoint(point, tolerance = 5) {
-    return this.index.getUnderPoint(point, tolerance);
+    return this.index.listUnderPoint(point, tolerance);
   }
   getMbr() {
     return this.index.getMbr();
@@ -12419,25 +12458,25 @@ class Items {
   }
   getInView() {
     const { left, top, right, bottom } = this.view.getMbr();
-    return this.index.getRectsEnclosedOrCrossed(left, top, right, bottom);
+    return this.index.listEnclosedOrCrossedBy(left, top, right, bottom);
   }
   getItemsInView() {
     const { left, top, right, bottom } = this.view.getMbr();
-    return this.index.getItemsEnclosedOrCrossed(left, top, right, bottom);
+    return this.index.listEnclosedOrCrossedBy(left, top, right, bottom);
   }
   getGroupItemsInView() {
     const { left, top, right, bottom } = this.view.getMbr();
     return this.getGroupItemsEnclosedOrCrossed(left, top, right, bottom);
   }
   getComments() {
-    return this.index.getComments();
+    return this.listAll().filter((item) => item.itemType === "Comment");
   }
   getUnderPointer(size = 0) {
     const { x, y } = this.pointer.point;
     const unmodifiedSize = size;
     size = 16;
-    const tolerated = this.index.getEnclosedOrCrossed(x - size, y - size, x + size, y + size);
-    let enclosed = tolerated.some((item) => item.itemType === "Connector") ? tolerated : this.index.getEnclosedOrCrossed(x, y, x, y);
+    const tolerated = this.index.listEnclosedOrCrossedBy(x - size, y - size, x + size, y + size);
+    let enclosed = tolerated.some((item) => item.itemType === "Connector") ? tolerated : this.index.listEnclosedOrCrossedBy(x, y, x, y);
     const underPointer = this.getUnderPoint(new Point(x, y), size);
     if (enclosed.length === 0) {
       enclosed = underPointer;
@@ -12465,7 +12504,7 @@ class Items {
     return [];
   }
   getNearPointer(maxDistance = 100, maxItems = 10, filter = () => true) {
-    return this.index.getNearestTo(this.pointer.point, maxItems, filter, maxDistance);
+    return this.index.listNearestTo(this.pointer.point, maxItems, filter, maxDistance);
   }
   getZIndex(item) {
     return this.index.getZIndex(item);
@@ -12607,7 +12646,6 @@ var init_SpacialIndex = __esm(() => {
   init_Point();
   init_Settings();
   init_LayeredIndex();
-  init_BaseItem();
 });
 
 // src/SpatialIndex/SimpleSpatialIndex.ts
@@ -12643,9 +12681,12 @@ class SimpleSpatialIndex {
   };
   remove(item, preserveChildren = false) {
     if (!preserveChildren && "index" in item && item.index) {
-      item.removeChildItems(item.index.list());
+      item.removeChildItems(item.index.listAll());
+    }
+    const index = this.itemsArray.indexOf(item);
+    if (index !== -1) {
+      this.itemsArray.splice(index, 1);
     }
-    this.itemsArray.splice(this.itemsArray.indexOf(item), 1);
     this.Mbr = new Mbr;
     this.itemsArray.forEach((item2) => this.Mbr.combine([item2.getMbr()]));
     this.subject.publish(this.items);
@@ -12728,16 +12769,13 @@ class SimpleSpatialIndex {
     this.subject.publish(this.items);
   }
   getById(id) {
-    const item = this.itemsArray.find((item2) => item2.getId() === id);
-    if (item) {
-      return item;
-    }
+    return this.itemsArray.find((item) => item.getId() === id);
   }
   findById(id) {
     return this.getById(id);
   }
-  getEnclosed(left, top, right, bottom) {
-    const mbr = new Mbr(left, top, right, bottom);
+  listEnclosedBy(left, top, right, bottom) {
+    const mbr = coerceMbr(left, top, right, bottom);
     const items = [];
     this.itemsArray.forEach((item) => {
       if (item.isEnclosedBy(mbr)) {
@@ -12746,8 +12784,8 @@ class SimpleSpatialIndex {
     });
     return items;
   }
-  getEnclosedOrCrossed(left, top, right, bottom) {
-    const mbr = new Mbr(left, top, right, bottom);
+  listEnclosedOrCrossedBy(left, top, right, bottom) {
+    const mbr = coerceMbr(left, top, right, bottom);
     const items = [];
     this.itemsArray.forEach((item) => {
       if (item.isEnclosedOrCrossedBy(mbr)) {
@@ -12756,19 +12794,30 @@ class SimpleSpatialIndex {
     });
     return items;
   }
-  getUnderPoint(point, tolerace = 5) {
+  listUnderPoint(point, tolerance = 5) {
     const items = [];
     this.itemsArray.forEach((item) => {
-      if (item.isUnderPoint(point, tolerace)) {
+      if (item.isUnderPoint(point, tolerance)) {
         items.push(item);
       }
     });
     return items;
   }
+  listRectsEnclosedOrCrossedBy(left, top, right, bottom) {
+    return this.listEnclosedOrCrossedBy(left, top, right, bottom).map((item) => item.getMbr());
+  }
+  listNearestTo(point, maxItems, filter, maxDistance) {
+    const itemsWithDistance = this.itemsArray.filter(filter).map((item) => ({
+      item,
+      distance: item.getMbr().getDistanceToPoint(point)
+    }));
+    const inRange = itemsWithDistance.filter((x) => x.distance <= maxDistance);
+    return inRange.sort((a, b) => a.distance - b.distance).slice(0, maxItems).map((x) => x.item);
+  }
   getMbr() {
     return this.Mbr;
   }
-  list() {
+  listAll() {
     return this.itemsArray.concat();
   }
   getZIndex(item) {
@@ -12840,7 +12889,7 @@ function toLocalTransformOp(op, containerMatrix, itemId) {
   }
 }
 var BaseItem;
-var init_BaseItem2 = __esm(() => {
+var init_BaseItem = __esm(() => {
   init_Mbr();
   init_LinkTo();
   init_Transformation();
@@ -13284,7 +13333,7 @@ var init_Comment = __esm(() => {
   init_Line2();
   init_esm_browser();
   init_LinkTo();
-  init_BaseItem2();
+  init_BaseItem();
   Comment = class Comment extends BaseItem {
     anchor;
     events;
@@ -25075,7 +25124,7 @@ var init_RichText = __esm(() => {
   init_getSelectionStyles();
   init_setEditorFocus();
   init_getAllTextNodesInSelection();
-  init_BaseItem2();
+  init_BaseItem();
   RichText = class RichText extends BaseItem {
     container;
     transformation;
@@ -26041,7 +26090,7 @@ var init_AINode = __esm(() => {
   init_Matrix();
   init_Transformation();
   init_Settings();
-  init_BaseItem2();
+  init_BaseItem();
   AINode = class AINode extends BaseItem {
     itemType = "AINode";
     parent = "Board";
@@ -26388,7 +26437,7 @@ var init_Audio = __esm(() => {
   init_Point();
   init_Line();
   init_Settings();
-  init_BaseItem2();
+  init_BaseItem();
   AudioItem = class AudioItem extends BaseItem {
     events;
     extension;
@@ -41385,6 +41434,11 @@ var init_ShapeData = __esm(() => {
   ];
 });
 
+// src/Items/BaseItem/index.ts
+var init_BaseItem2 = __esm(() => {
+  init_BaseItem();
+});
+
 // src/Items/Mbr/updateRects.ts
 function updateRects(board, ref, mbr, verticalOffset, horizontalOffset, fit = "contextPanel") {
   const { selection, camera } = board;
@@ -41655,7 +41709,7 @@ var init_ControlPoint = __esm(() => {
   init_Transformation2();
   init_RichText2();
   init_AINode2();
-  init_BaseItem();
+  init_BaseItem2();
   BoardPoint = class BoardPoint extends Point {
     pointType = "Board";
     serialize() {
@@ -42555,7 +42609,7 @@ var init_Connector = __esm(() => {
   init_LinkTo();
   init_HTMLRender();
   init_Settings();
-  init_BaseItem2();
+  init_BaseItem();
   init_Color();
   init_ConnectorTypes();
   CONNECTOR_ANCHOR_COLOR = {
@@ -43536,7 +43590,7 @@ var init_Sticker = __esm(() => {
   init_SessionStorage();
   init_HTMLRender();
   init_Settings();
-  init_BaseItem2();
+  init_BaseItem();
   init_Color();
   stickerColors = {
     Purple: "rgb(233, 208, 255)",
@@ -44669,7 +44723,7 @@ async function exportBoardSnapshot({
   context.ctx.setTransform(upscaleFactor, 0, 0, upscaleFactor, 0, 0);
   context.matrix.applyToContext(context.ctx);
   const { left, top, right, bottom } = selection;
-  const inView = board.items.index.getRectsEnclosedOrCrossed(left, top, right, bottom);
+  const inView = board.items.index.listEnclosedOrCrossedBy(left, top, right, bottom);
   for (const item of inView) {
     item.render(context);
   }
@@ -44789,7 +44843,7 @@ var init_Frame = __esm(() => {
   init_FrameData();
   init_Settings();
   init_getResizeMatrix();
-  init_BaseItem();
+  init_BaseItem2();
   init_Color();
   defaultFrameData = new DefaultFrameData;
   Frame = class Frame extends BaseItem {
@@ -44908,7 +44962,7 @@ var init_Frame = __esm(() => {
       return this.id;
     }
     getChildrenIds() {
-      return this.index?.list().map((item) => item.getId()) || [];
+      return this.index?.listAll().map((item) => item.getId()) || [];
     }
     updateMbr() {
       const rect = this.path.getMbr().copy();
@@ -45344,7 +45398,7 @@ var init_Video = __esm(() => {
   init_Path2();
   init_Transformation2();
   init_Settings();
-  init_BaseItem2();
+  init_BaseItem();
   init_MediaHelpers();
   videoIcon = conf.documentFactory.createElement("img");
   videoIcon.src = VIDEO_ICON_SRC;
@@ -45987,7 +46041,7 @@ var init_Drawing = __esm(() => {
   init_DrawingCommand();
   init_LinkTo();
   init_Settings();
-  init_BaseItem2();
+  init_BaseItem();
   init_Color();
   Drawing = class Drawing extends BaseItem {
     points;
@@ -46407,7 +46461,7 @@ var init_Group = __esm(() => {
   init_Point();
   init_Transformation();
   init_LinkTo();
-  init_BaseItem2();
+  init_BaseItem();
   Group = class Group extends BaseItem {
     events;
     linkTo;
@@ -46467,7 +46521,7 @@ var init_Group = __esm(() => {
       return this;
     }
     getMbr() {
-      const children = this.index.list();
+      const children = this.index.listAll();
       if (children.length === 0) {
         return new Mbr(this.left, this.top, this.right, this.bottom);
       }
@@ -46507,10 +46561,10 @@ var init_Group = __esm(() => {
       this.getMbr();
     }
     getChildrenIds() {
-      return this.index.list().map((item) => item.getId());
+      return this.index.listAll().map((item) => item.getId());
     }
     getChildren() {
-      return this.index.list();
+      return this.index.listAll();
     }
     getLinkTo() {
       return this.linkTo.link;
@@ -46558,7 +46612,7 @@ var init_Group = __esm(() => {
       const ctx = context.ctx;
       ctx.save();
       this.transformation.applyToContext(ctx);
-      for (const child of this.index.list()) {
+      for (const child of this.index.listAll()) {
         child.render(context);
       }
       ctx.restore();
@@ -46666,7 +46720,7 @@ function createDrawing(id, data, board) {
   if (!isDrawingData(data)) {
     throw new Error("Invalid data for Drawing");
   }
-  const drawing = new Drawing(board, [], board.events).setId(id).deserialize({ ...data, id });
+  const drawing = new Drawing(board, [], board.events).setId(id).setId(id).deserialize({ ...data, id });
   return drawing;
 }
 function createFrame(id, data, board) {
@@ -46687,7 +46741,7 @@ function createGroup(id, data, board) {
   if (!isGroupData(data)) {
     throw new Error("Invalid data for Group");
   }
-  const group = new Group(board, board.events, data.children, id).setId(id).deserialize({ ...data, id });
+  const group = new Group(board, board.events, data.childIds, id).setId(id).deserialize({ ...data, id });
   return group;
 }
 function isStickerData(data) {
@@ -49225,7 +49279,7 @@ function getQuickAddButtons(selection, board) {
     }
     const newMbr = new Mbr(newItemData.transformation?.translateX, newItemData.transformation?.translateY, (newItemData.transformation?.translateX || 0) + newWidth, (newItemData.transformation?.translateY || 0) + newHeight);
     let step = 1;
-    while (board.index.getItemsEnclosedOrCrossed(newMbr.left, newMbr.top, newMbr.right, newMbr.bottom).filter((item) => item.itemType !== "Connector").length > 0) {
+    while (board.index.listEnclosedOrCrossedBy(newMbr.left, newMbr.top, newMbr.right, newMbr.bottom).filter((item) => item.itemType !== "Connector").length > 0) {
       const xDirection = step % 2 === 0 ? -1 : 1;
       const yDirection = newItemData.itemType === "AINode" ? -1 : xDirection;
       newMbr.transform(new Matrix(iterAdjustment[index2].x * xDirection * step, iterAdjustment[index2].y * yDirection * (newItemData.itemType === "AINode" ? 1 : step)));
@@ -49467,7 +49521,7 @@ function getQuickAddButtons(selection, board) {
 var offsets;
 var init_QuickAddButtons2 = __esm(() => {
   init_Items();
-  init_BaseItem2();
+  init_BaseItem();
   init_SessionStorage();
   init_QuickAddButtons();
   init_quickAddHelpers();
@@ -49900,7 +49954,7 @@ class AlignmentHelper {
 var RELATIVE_ALIGNMENT_COLOR = "#4778F5";
 var init_RelativeAlignment = __esm(() => {
   init_Items();
-  init_BaseItem();
+  init_BaseItem2();
 });
 
 // src/Tools/RelativeAlignment/index.ts
@@ -51501,7 +51555,7 @@ var init_AddStar = __esm(() => {
 // src/Items/Examples/Star/Star.ts
 var defaultStarData, starPath, Star2;
 var init_Star2 = __esm(() => {
-  init_BaseItem2();
+  init_BaseItem();
   init_Point();
   init_Path();
   init_Line();
@@ -51683,7 +51737,7 @@ var init_AddCounter = __esm(() => {
 // src/Items/Examples/Counter/Counter.ts
 var defaultCounterData, COUNTER_DIMENSIONS, Counter;
 var init_Counter = __esm(() => {
-  init_BaseItem2();
+  init_BaseItem();
   init_Point();
   init_Path();
   init_Line();
@@ -51802,7 +51856,7 @@ var init_HotkeyRegistry = __esm(() => {
 // src/Items/Examples/CardGame/Card/Card.ts
 var defaultCardData, Card;
 var init_Card = __esm(() => {
-  init_BaseItem2();
+  init_BaseItem();
   init_Path();
   init_RegisterItem();
   init_Settings();
@@ -52052,7 +52106,7 @@ function createDeck(event, board) {
   if (single && single.itemType === "Deck") {
     return;
   }
-  const cardsOrDecks = board.selection.items.list();
+  const cardsOrDecks = board.selection.items.listAll();
   const onlyCards = board.selection.items.isAllItemsType("Card");
   if (onlyCards) {
     const deck = new Deck(board, "");
@@ -52068,12 +52122,12 @@ function createDeck(event, board) {
       if (item.itemType === "Card") {
         cards.push(item);
       } else if (item.itemType === "Deck") {
+        const deck = item;
         if (mainDeck) {
-          cards.push(...mainDeck.getDeck());
-          board.remove(mainDeck);
-          mainDeck = item;
+          cards.push(...deck.getDeck());
+          board.remove(deck);
         } else {
-          mainDeck = item;
+          mainDeck = deck;
         }
       }
     });
@@ -52086,9 +52140,10 @@ function createDeck(event, board) {
 }
 var defaultDeckData, Deck;
 var init_Deck = __esm(() => {
-  init_BaseItem2();
+  init_BaseItem();
   init_RegisterItem();
   init_Card();
+  init_DrawingContext();
   init_Settings();
   init_Path2();
   init_HotkeyRegistry();
@@ -52107,9 +52162,9 @@ var init_Deck = __esm(() => {
     drawingContext = null;
     constructor(board, id = "") {
       super(board, id, defaultDeckData, true);
-      this.index.getUnderPoint = () => [];
-      this.index.getEnclosed = () => [];
-      this.index.getEnclosedOrCrossed = () => [];
+      this.index.listUnderPoint = () => [];
+      this.index.listEnclosedBy = () => [];
+      this.index.listEnclosedOrCrossedBy = () => [];
       this.transformation.subject.subscribe(() => {
         this.updateMbr();
         this.subject.publish(this);
@@ -52131,7 +52186,7 @@ var init_Deck = __esm(() => {
           const canAddItem = !this.index?.getById(childId) && foundItem instanceof Card && (typeof this.isPerpendicular === "undefined" || this.isPerpendicular === foundItem.getIsRotatedPerpendicular()) && (!firstCardDimensions || firstCardDimensions.width === foundItem.getDimensions().width && firstCardDimensions.height === foundItem.getDimensions().height);
           if (canAddItem) {
             this.isPerpendicular = foundItem.getIsRotatedPerpendicular();
-            foundItem.transformation.setLocal(this.left + (this.index?.list().length || 0) * (this.isPerpendicular ? 0 : conf.DECK_HORIZONTAL_OFFSET), this.top + (this.index?.list().length || 0) * (this.isPerpendicular ? conf.DECK_VERTICAL_OFFSET : 0));
+            foundItem.transformation.setLocal(this.left + (this.index?.listAll().length || 0) * (this.isPerpendicular ? 0 : conf.DECK_HORIZONTAL_OFFSET), this.top + (this.index?.listAll().length || 0) * (this.isPerpendicular ? conf.DECK_VERTICAL_OFFSET : 0));
             if (firstCard) {
               const { scaleX, scaleY } = foundItem.transformation.getMatrixData();
               const { scaleX: targetScaleX, scaleY: targetScaleY } = firstCard.transformation.getMatrixData();
@@ -52171,31 +52226,33 @@ var init_Deck = __esm(() => {
       this.subject.publish(this);
     }
     getDeck() {
-      return this.index?.list() || [];
+      return this.index?.listAll() || [];
     }
     getTopCard() {
-      const card = this.index?.list()[this.index?.list().length - 1];
+      const cards = this.index?.listAll() || [];
+      const card = cards[cards.length - 1];
       if (card) {
         this.removeChildItems(card);
         return card;
       }
     }
     getCards(count) {
-      const cards = this.index?.list().reverse().slice(0, count);
-      if (cards) {
+      const cards = (this.index?.listAll() || []).reverse().slice(0, count);
+      if (cards.length > 0) {
         this.removeChildItems(cards);
         return cards;
       }
     }
     getBottomCard() {
-      const card = this.index?.list()[0];
+      const card = this.index?.listAll()[0];
       if (card) {
         this.removeChildItems(card);
         return card;
       }
     }
     getRandomCard() {
-      const card = this.index?.list()[Math.floor(Math.random() * this.index?.list().length)];
+      const cards = this.index?.listAll() || [];
+      const card = cards[Math.floor(Math.random() * cards.length)];
       if (card) {
         this.removeChildItems(card);
         return card;
@@ -52205,20 +52262,20 @@ var init_Deck = __esm(() => {
       if (!this.index) {
         return;
       }
-      const shuffled = [...this.index.list()];
+      const shuffled = [...this.index.listAll()];
       for (let i = shuffled.length - 1;i > 0; i--) {
         const j = Math.floor(Math.random() * (i + 1));
         [shuffled[i], shuffled[j]] = [shuffled[j], shuffled[i]];
       }
       this.emitAnimation();
-      this.removeChildItems(this.index.list());
+      this.removeChildItems(this.index.listAll());
       this.addChildItems(shuffled);
     }
     flipDeck() {
-      if (!this.index || !this.index.list().length) {
+      if (!this.index || !this.index.listAll().length) {
         return;
       }
-      const cards = this.index.list();
+      const cards = this.index.listAll();
       cards[0].toggleIsOpen(cards);
       const reversed = [...cards].reverse();
       this.removeChildItems(cards);
@@ -52239,7 +52296,7 @@ var init_Deck = __esm(() => {
     }
     updateMbr() {
       const { translateX, translateY } = this.transformation.getMatrixData();
-      const items = this.index.list();
+      const items = this.index.listAll();
       const itemsMbr = items[0]?.getMbr().combine(items.slice(1).map((item) => item.getMbr()));
       this.left = translateX;
       this.top = translateY;
@@ -52307,7 +52364,7 @@ var init_Deck = __esm(() => {
     }
     renderHTML(documentFactory) {
       const div = super.renderHTML(documentFactory);
-      const cards = this.index?.list();
+      const cards = this.index?.listAll();
       const topCard = cards[cards.length - 1];
       if (!topCard) {
         return div;
@@ -52316,7 +52373,7 @@ var init_Deck = __esm(() => {
       const transform = `translate(${translateX}px, ${translateY}px) scale(1, 1)`;
       const topCardElement = topCard.renderHTML(documentFactory);
       div.appendChild(topCardElement);
-      const offset = ((this.index?.list().length || 0) - 1) * 2;
+      const offset = ((this.index?.listAll().length || 0) - 1) * 2;
       topCardElement.style.transform = `translate(${offset}px, ${0}px) scale(1, 1)`;
       div.id = this.getId();
       div.style.width = `${this.getWidth()}px`;
@@ -52329,7 +52386,7 @@ var init_Deck = __esm(() => {
       return div;
     }
     updateCache(context) {
-      const cards = this.index?.list();
+      const cards = this.index?.listAll();
       const topCard = cards[cards.length - 1];
       const topCardImage = topCard?.getImage();
       const width2 = this.getWidth();
@@ -52343,7 +52400,7 @@ var init_Deck = __esm(() => {
       const tempCtx = tempCanvas.getContext("2d");
       if (!tempCtx)
         return;
-      const tempContext = { ...context, ctx: tempCtx };
+      const tempContext = new DrawingContext(context.camera, tempCtx, context.cursorCtx, context.matrix);
       cards.forEach((_, index2) => {
         topCard.render(tempContext, this.isPerpendicular ? 0 : index2 * conf.DECK_HORIZONTAL_OFFSET, this.isPerpendicular ? index2 * conf.DECK_VERTICAL_OFFSET : 0);
       });
@@ -52352,7 +52409,7 @@ var init_Deck = __esm(() => {
       this.updateMbr();
     }
     getFirstCard() {
-      return this.index?.list()[0];
+      return this.index?.listAll()[0];
     }
   };
   registerItem({
@@ -52486,7 +52543,7 @@ var init_AddDice = __esm(() => {
 // src/Items/Examples/CardGame/Dice/Dice.ts
 var TIMEOUT = 2000, defaultDiceData, Dice;
 var init_Dice = __esm(() => {
-  init_BaseItem2();
+  init_BaseItem();
   init_Items();
   init_RoundedRectangle();
   init_Items();
@@ -52887,7 +52944,7 @@ var init_AddScreen = __esm(() => {
 // src/Items/Examples/CardGame/Screen/Screen.ts
 var screenPath, defaultScreenData, Screen;
 var init_Screen = __esm(() => {
-  init_BaseItem2();
+  init_BaseItem();
   init_RegisterItem();
   init_Path2();
   init_Line2();
@@ -53034,9 +53091,9 @@ var init_Screen = __esm(() => {
     applyOwnerId(ownerId) {
       this.ownerId = ownerId;
       if (!this.ownerId) {
-        this.index.getUnderPoint = () => [];
-        this.index.getEnclosed = () => [];
-        this.index.getEnclosedOrCrossed = () => [];
+        this.index.listUnderPoint = () => [];
+        this.index.listEnclosedBy = () => [];
+        this.index.listEnclosedOrCrossedBy = () => [];
       }
     }
     transformPath() {
@@ -53059,16 +53116,17 @@ var init_Screen = __esm(() => {
         this.applyBackgroundUrl(this.backgroundUrl);
       }
       if (!this.ownerId) {
-        this.index.getUnderPoint = () => [];
-        this.index.getEnclosed = () => [];
-        this.index.getEnclosedOrCrossed = () => [];
+        this.index.listUnderPoint = () => [];
+        this.index.listEnclosedBy = () => [];
+        this.index.listEnclosedOrCrossedBy = () => [];
       }
       this.transformPath();
       this.subject.publish(this);
       return this;
     }
     getRandomItem() {
-      const item = this.index?.list()[Math.floor(Math.random() * this.index?.list().length)];
+      const items = this.index?.listAll() || [];
+      const item = items[Math.floor(Math.random() * items.length)];
       if (item) {
         this.removeChildItems(item);
         return item;
@@ -53117,7 +53175,7 @@ var init_Screen2 = __esm(() => {
 
 // src/Items/index.ts
 var init_Items = __esm(() => {
-  init_BaseItem();
+  init_BaseItem2();
   init_Point2();
   init_Line2();
   init_Curve2();
@@ -53992,7 +54050,7 @@ var init_Shape = __esm(() => {
   init_Connector2();
   init_ControlPoint();
   init_Settings();
-  init_BaseItem2();
+  init_BaseItem();
   init_Color();
   defaultShapeData = new DefaultShapeData;
   Shapes = { ...BasicShapes, ...BPMN };
@@ -54518,7 +54576,7 @@ var init_Placeholder2 = __esm(() => {
   init_Transformation();
   init_PlaceholderCommand();
   init_getResizeMatrix();
-  init_BaseItem2();
+  init_BaseItem();
   Placeholder2 = class Placeholder2 extends BaseItem {
     events;
     miroData;
@@ -54827,7 +54885,7 @@ var init_Image = __esm(() => {
   init_Placeholder2();
   init_LinkTo();
   init_Settings();
-  init_BaseItem2();
+  init_BaseItem();
   init_MediaHelpers();
   ImageItem = class ImageItem extends BaseItem {
     events;
@@ -55390,10 +55448,20 @@ function handleBoardEventMessage(message, board) {
   if (isEventFromCurrentUser) {
     return;
   }
-  log.insertEventsFromOtherConnections({
-    ...event,
-    userId: Number(message.userId)
-  });
+  if ("operations" in event.body) {
+    log.insertEventsFromOtherConnections({
+      ...event,
+      body: {
+        ...event.body,
+        userId: Number(message.userId)
+      }
+    });
+  } else {
+    log.insertEventsFromOtherConnections({
+      ...event,
+      userId: Number(message.userId)
+    });
+  }
   const last = log.getLastConfirmed();
   if (last) {
     board.events.subject.publish(last);
@@ -55411,7 +55479,7 @@ function handleBoardSubscriptionCompletedMsg(msg, board) {
     handleHTMLSnapshotApplication(msg.JSONSnapshot, board);
     log.list.clearConfirmedRecords();
   }
-  handleBoardEventListApplication(msg.eventsSinceLastSnapshot, board);
+  handleBoardEventListApplication(expandEvents(msg.eventsSinceLastSnapshot), board);
   board.setInterfaceType(msg.mode);
   board.subject.publish();
   onBoardLoad(board);
@@ -57763,7 +57831,7 @@ init_Settings();
 init_QuickAddButtons3();
 
 // src/Selection/SelectionItems.ts
-init_BaseItem();
+init_BaseItem2();
 
 class SelectionItems {
   items = new Map;
@@ -57790,6 +57858,9 @@ class SelectionItems {
   list() {
     return Array.from(this.items.values());
   }
+  listAll() {
+    return this.list();
+  }
   isEmpty() {
     return this.items.size === 0;
   }
@@ -58085,7 +58156,7 @@ init_RichText();
 init_AINode();
 init_Sticker();
 init_Frame();
-init_BaseItem();
+init_BaseItem2();
 function handleMultipleItemsResize({
   board,
   resize,
@@ -58468,7 +58539,7 @@ init_Image();
 init_SessionStorage();
 init_Point();
 init_Items();
-init_BaseItem();
+init_BaseItem2();
 function transformItems({
   board,
   selection,
@@ -61253,8 +61324,9 @@ class Board {
       const data = Array.from(items.children).map((el) => this.parseHTML(el));
       for (const parsedData of data) {
         if ("childrenMap" in parsedData) {
-          const addedFrame = this.add(this.createItem(this.getNewItemId(), parsedData.data));
-          const addedChildren = Object.values(parsedData.childrenMap).map((childData) => {
+          const frameData = parsedData;
+          const addedFrame = this.add(this.createItem(this.getNewItemId(), frameData.data));
+          const addedChildren = Object.values(frameData.childrenMap).map((childData) => {
             const created = this.createItem(this.getNewItemId(), childData);
             const added = this.add(created);
             idsMap[childData.id] = added.getId();
@@ -61267,17 +61339,18 @@ class Board {
             return added;
           });
           addedFrame.addChildItems(addedChildren);
-          parsedData.data.children = addedChildren.map((item) => item.getId());
-          idsMap[parsedData.data.id] = addedFrame.getId();
+          frameData.data.children = addedChildren.map((item) => item.getId());
+          idsMap[frameData.data.id] = addedFrame.getId();
         } else {
-          const added = this.add(this.createItem(this.getNewItemId(), parsedData));
+          const itemData = parsedData;
+          const added = this.add(this.createItem(this.getNewItemId(), itemData));
           if (added.itemType === "Connector") {
             addedConnectors.push({
               item: added,
-              data: parsedData
+              data: itemData
             });
           }
-          idsMap[parsedData.id] = added.getId();
+          idsMap[itemData.id] = added.getId();
         }
       }
       addedConnectors.forEach((connector) => {
@@ -61321,12 +61394,13 @@ class Board {
       this.index.insert(item);
       return item;
     };
-    for (const itemData of items) {
-      if ("childrenMap" in itemData) {
-        Object.values(itemData.childrenMap).map((childData) => addItem(childData));
-        addItem(itemData.data);
+    for (const rawItemData of items) {
+      if ("childrenMap" in rawItemData) {
+        const frameData = rawItemData;
+        Object.values(frameData.childrenMap).map((childData) => addItem(childData));
+        addItem(frameData.data);
       } else {
-        addItem(itemData);
+        addItem(rawItemData);
       }
     }
     for (const key in createdConnectors) {
@@ -61759,8 +61833,9 @@ class Board {
           itemData.transformation.translateX = translateX + width2 * 10 + 10;
         }
       }
-      if ("children" in itemData && itemData.children?.length) {
-        itemData.children = itemData.children.map((childId) => newItemIdMap[childId]);
+      const itemDataWithChildren = itemData;
+      if ("children" in itemDataWithChildren && itemDataWithChildren.children?.length) {
+        itemDataWithChildren.children = itemDataWithChildren.children.map((childId) => newItemIdMap[childId]);
       }
       newMap[newItemId] = itemData;
     }
@@ -61943,7 +62018,7 @@ function initI18N(i18nInstance) {
 // src/index.ts
 init_MediaHelpers();
 init_CreateCommand();
-init_BaseItem2();
+init_BaseItem();
 init_Events();
 BaseItem.createCommand = createCommand;
 Events.createCommand = createCommand;