microboard-temp 0.13.43 → 0.13.45

package/dist/esm/node.js

@@ -4135,277 +4135,6 @@ var init_Color = __esm(() => {
   init_resolveColor();
 });
 
-// src/Events/SyncLog.ts
-function createSyncLog() {
-  const log = [];
-  const subject = new Subject;
-  log.push = function(...msgs) {
-    let newLength = log.length;
-    for (const msg of msgs) {
-      const lastItem = log[log.length - 1];
-      if (lastItem && lastItem.msg === msg.msg) {
-        lastItem.records = lastItem.records.concat(msg.records);
-      } else {
-        newLength = Array.prototype.push.call(log, msg);
-      }
-    }
-    subject.publish(log);
-    return newLength;
-  };
-  return {
-    log,
-    subject
-  };
-}
-var init_SyncLog = () => {};
-
-// src/Events/Log/createEventsList.ts
-function createEventsList(commandFactory) {
-  const confirmedRecords = [];
-  const recordsToSend = [];
-  const newRecords = [];
-  const justConfirmed = [];
-  const { log: syncLog, subject: syncLogSubject } = createSyncLog();
-  let snapshotLastIndex = 0;
-  function revert(records) {
-    for (let i = records.length - 1;i >= 0; i--) {
-      records[i].command.revert();
-    }
-  }
-  function getOpItems(op) {
-    if ("item" in op) {
-      const item = op.item;
-      if (Array.isArray(item))
-        return item;
-      if (typeof item === "string")
-        return [item];
-      if (item && typeof item === "object")
-        return Object.keys(item);
-    }
-    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).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);
-    }
-    return [];
-  }
-  return {
-    commandFactory,
-    addConfirmedRecords(records) {
-      confirmedRecords.push(...records);
-      syncLog.push({ msg: "confirmed", records });
-    },
-    addNewRecords(records) {
-      newRecords.push(...records);
-      syncLog.push({ msg: "addedNew", records });
-    },
-    confirmSentRecords(events) {
-      for (const event of events) {
-        const index = recordsToSend.findIndex((r) => r.event.body.eventId === event.body.eventId);
-        if (index !== -1) {
-          const [record] = recordsToSend.splice(index, 1);
-          confirmedRecords.push(record);
-          syncLog.push({ msg: "confirmed", records: [record] });
-        }
-      }
-    },
-    getConfirmedRecords() {
-      return confirmedRecords;
-    },
-    getRecordsToSend() {
-      return recordsToSend;
-    },
-    getNewRecords() {
-      return newRecords;
-    },
-    getAllRecords() {
-      return [...confirmedRecords, ...recordsToSend, ...newRecords];
-    },
-    prepareRecordsToSend() {
-      const records = [...newRecords];
-      recordsToSend.push(...records);
-      newRecords.length = 0;
-      syncLog.push({ msg: "toSend", records });
-      return records;
-    },
-    forwardIterable() {
-      return function* () {
-        yield* confirmedRecords;
-        yield* recordsToSend;
-        yield* newRecords;
-      }();
-    },
-    backwardIterable() {
-      return function* () {
-        for (let i = newRecords.length - 1;i >= 0; i--)
-          yield newRecords[i];
-        for (let i = recordsToSend.length - 1;i >= 0; i--)
-          yield recordsToSend[i];
-        for (let i = confirmedRecords.length - 1;i >= 0; i--)
-          yield confirmedRecords[i];
-      }();
-    },
-    revertUnconfirmed(predicate) {
-      const toRevert = [...recordsToSend, ...newRecords].filter(predicate || (() => true));
-      revert(toRevert);
-      syncLog.push({ msg: "revertUnconfirmed", records: toRevert });
-    },
-    applyUnconfirmed(predicate) {
-      const unconfirmed = [...recordsToSend, ...newRecords].filter(predicate || (() => true));
-      for (const record of unconfirmed) {
-        record.command.apply();
-      }
-      syncLog.push({ msg: "applyUnconfirmed", records: unconfirmed });
-    },
-    justConfirmed,
-    getSyncLog() {
-      return syncLog;
-    },
-    syncLogSubject,
-    clear() {
-      confirmedRecords.length = 0;
-      recordsToSend.length = 0;
-      newRecords.length = 0;
-      syncLog.length = 0;
-      syncLogSubject.publish(syncLog);
-    },
-    clearConfirmedRecords() {
-      confirmedRecords.length = 0;
-      syncLog.length = 0;
-      syncLogSubject.publish(syncLog);
-    },
-    removeUnconfirmedEventsByItems(itemIds) {
-      const itemIdSet = new Set(itemIds);
-      const filter = (record) => {
-        const opItems = getOpItems(record.event.body.operation);
-        return !opItems.some((id) => itemIdSet.has(id));
-      };
-      const filteredNewRecords = newRecords.filter(filter);
-      newRecords.length = 0;
-      newRecords.push(...filteredNewRecords);
-      const filteredRecordsToSend = recordsToSend.filter(filter);
-      recordsToSend.length = 0;
-      recordsToSend.push(...filteredRecordsToSend);
-      syncLog.length = 0;
-      syncLog.push({ msg: "confirmed", records: confirmedRecords });
-      syncLog.push({ msg: "toSend", records: recordsToSend });
-      syncLog.push({ msg: "addedNew", records: newRecords });
-      syncLogSubject.publish(syncLog);
-    },
-    isAllEventsConfirmed() {
-      return recordsToSend.length === 0 && newRecords.length === 0;
-    },
-    setSnapshotLastIndex(index) {
-      snapshotLastIndex = index;
-    },
-    getSnapshotLastIndex() {
-      return snapshotLastIndex;
-    }
-  };
-}
-var init_createEventsList = __esm(() => {
-  init_SyncLog();
-});
-
-// src/Events/Log/getRecordByIdFromList.ts
-function getRecordByIdFromList(id, list) {
-  for (const record of list.forwardIterable()) {
-    if (record.event.body.eventId === id) {
-      return record;
-    }
-  }
-  return;
-}
-
-// src/Events/Log/shouldSkipEvent.ts
-function shouldSkipEvent(record, userId) {
-  const { operation } = record.event.body;
-  return record.event.body.userId !== userId || operation.method === "updateVideoData" || operation.class === "Audio" && operation.method === "setUrl";
-}
-
-// src/Events/Log/getRedoRecordFromList.ts
-function getRedoRecordFromList(userId, list) {
-  let counter = 0;
-  for (const record of list.backwardIterable()) {
-    if (shouldSkipEvent(record, userId)) {
-      continue;
-    }
-    if (record.event.body.operation.method !== "undo" && record.event.body.operation.method !== "redo") {
-      return null;
-    }
-    const { method } = record.event.body.operation;
-    if (method === "redo") {
-      counter++;
-    } else if (method === "undo") {
-      if (counter > 0) {
-        counter--;
-      } else if (counter === 0) {
-        return record;
-      }
-    }
-  }
-  return null;
-}
-var init_getRedoRecordFromList = () => {};
-
-// src/Events/Log/getUndoRecordFromList.ts
-function getUndoRecordFromList(userId, list) {
-  let counter = 0;
-  const isAllEventsConfirmed = list.isAllEventsConfirmed();
-  if (!isAllEventsConfirmed) {
-    return null;
-  }
-  for (const record of list.getConfirmedRecords().slice().reverse()) {
-    if (shouldSkipEvent(record, userId)) {
-      continue;
-    }
-    if (record.event.body.operation.method === "undo") {
-      counter++;
-    } else if (counter === 0) {
-      return record;
-    } else {
-      counter--;
-    }
-  }
-  return null;
-}
-var init_getUndoRecordFromList = () => {};
-
-// src/Events/Log/getUnpublishedEventFromList.ts
-function getUnpublishedEventFromList(list) {
-  const recordsToSend = list.prepareRecordsToSend();
-  if (recordsToSend.length === 0) {
-    return null;
-  }
-  const operations = getOperationsFromEventRecords(recordsToSend);
-  return combineOperationsIntoPack(recordsToSend[0].event, operations);
-}
-function getOperationsFromEventRecords(records) {
-  return records.map((record) => ({
-    ...record.event.body.operation,
-    actualId: record.event.body.eventId
-  }));
-}
-function combineOperationsIntoPack(baseEvent, operations) {
-  const { operation, ...bodyWithoutOperation } = baseEvent.body;
-  return {
-    ...baseEvent,
-    body: {
-      ...bodyWithoutOperation,
-      operations
-    }
-  };
-}
-
 // src/Events/EventsOperations.ts
 function isTransformation(op) {
   return op.class === "Transformation";
@@ -4732,41 +4461,69 @@ function mergeBoardOperations(opA, opB) {
 }
 var init_Merge = () => {};
 
-// src/Events/mergeEvents.ts
-function mergeEvents(events) {
-  if (events.length < 2) {
-    return events;
+// src/Events/mergeRecords.ts
+function mergeRecords(records) {
+  if (records.length < 2) {
+    return records;
   }
-  const mergedEvents = [];
+  const mergedRecords = [];
   let previous = null;
-  for (const event of events) {
+  for (const record of records) {
     if (!previous) {
-      previous = event;
+      previous = record;
       continue;
     }
-    const mergedOperation = mergeOperations(previous.body.operation, event.body.operation);
-    if (!mergedOperation) {
-      mergedEvents.push(previous);
-      previous = event;
+    const mergedEventOperation = mergeOperations(previous.event.body.operation, record.event.body.operation);
+    if (!mergedEventOperation) {
+      mergedRecords.push(previous);
+      previous = record;
     } else {
+      const mergedCommand = record.command.merge ? previous.command.merge(mergedEventOperation) : previous.command;
       previous = {
-        ...event,
-        body: {
-          ...event.body,
-          operation: mergedOperation
-        }
+        event: {
+          ...record.event,
+          body: {
+            ...record.event.body,
+            operation: mergedEventOperation
+          }
+        },
+        command: mergedCommand
       };
     }
   }
   if (previous) {
-    mergedEvents.push(previous);
+    mergedRecords.push(previous);
   }
-  return mergedEvents;
+  return mergedRecords;
 }
-var init_mergeEvents = __esm(() => {
+var init_mergeRecords = __esm(() => {
   init_Merge();
 });
 
+// src/Events/SyncLog.ts
+function createSyncLog() {
+  const log = [];
+  const subject = new Subject;
+  log.push = function(...msgs) {
+    let newLength = log.length;
+    for (const msg of msgs) {
+      const lastItem = log[log.length - 1];
+      if (lastItem && lastItem.msg === msg.msg) {
+        lastItem.records = lastItem.records.concat(msg.records);
+      } else {
+        newLength = Array.prototype.push.call(log, msg);
+      }
+    }
+    subject.publish(log);
+    return newLength;
+  };
+  return {
+    log,
+    subject
+  };
+}
+var init_SyncLog = () => {};
+
 // src/Events/Transform/removeText_removeText.ts
 import { Path as Path2 } from "slate";
 function removeText_removeText(confirmed, toTransform) {
@@ -5850,6 +5607,346 @@ var init_transformEvents = __esm(() => {
   init_Transform2();
 });
 
+// src/Events/Log/createEventsList.ts
+function createEventsList(commandFactory) {
+  const confirmedRecords = [];
+  const recordsToSend = [];
+  const newRecords = [];
+  const justConfirmed = [];
+  const { log: syncLog, subject: syncLogSubject } = createSyncLog();
+  let snapshotLastIndex = 0;
+  function revert(records) {
+    for (let i = records.length - 1;i >= 0; i--) {
+      records[i].command.revert();
+    }
+  }
+  function apply(records) {
+    for (const record of records) {
+      record.command = commandFactory(record.event.body.operation);
+      record.command.apply();
+    }
+  }
+  function mergeAndPushConfirmedRecords(records) {
+    const lastConfirmedRecord = confirmedRecords.pop();
+    const recordsToMerge = lastConfirmedRecord ? [lastConfirmedRecord, ...records] : records;
+    const mergedRecords = mergeRecords(recordsToMerge);
+    confirmedRecords.push(...mergedRecords);
+  }
+  return {
+    commandFactory,
+    addConfirmedRecords(records) {
+      syncLog.push({ msg: "confirmed", records });
+      mergeAndPushConfirmedRecords(records);
+    },
+    addNewRecords(records) {
+      for (const record of records) {
+        if (newRecords.length > 0) {
+          const lastRecord = newRecords[newRecords.length - 1];
+          const mergedOperation = mergeOperations(lastRecord.event.body.operation, record.event.body.operation);
+          if (mergedOperation) {
+            lastRecord.event = {
+              ...lastRecord.event,
+              body: {
+                ...lastRecord.event.body,
+                operation: mergedOperation
+              }
+            };
+            lastRecord.command = commandFactory(mergedOperation);
+            continue;
+          }
+        }
+        newRecords.push(record);
+        syncLog.push({ msg: "addedNew", records: [record] });
+      }
+    },
+    confirmSentRecords(events) {
+      const records = recordsToSend;
+      if (records.length !== events.length) {
+        console.error("Mismatch between records and events length");
+        return;
+      }
+      for (let i = 0;i < records.length; i++) {
+        records[i].event.order = events[i].order;
+      }
+      syncLog.push({ msg: "confirmed", records: [...records] });
+      mergeAndPushConfirmedRecords(records);
+      recordsToSend.splice(0, records.length);
+    },
+    confirmSentRecordIds(eventIds, order) {
+      const confirmedRecordsById = [];
+      for (const eventId of eventIds) {
+        const index = recordsToSend.findIndex((record2) => record2.event.body.eventId === eventId);
+        if (index === -1) {
+          continue;
+        }
+        const [record] = recordsToSend.splice(index, 1);
+        record.event.order = order;
+        confirmedRecordsById.push(record);
+      }
+      if (confirmedRecordsById.length === 0) {
+        return;
+      }
+      syncLog.push({ msg: "confirmed", records: confirmedRecordsById });
+      mergeAndPushConfirmedRecords(confirmedRecordsById);
+    },
+    getConfirmedRecords() {
+      return confirmedRecords;
+    },
+    getRecordsToSend() {
+      return recordsToSend;
+    },
+    getNewRecords() {
+      return newRecords;
+    },
+    getAllRecords() {
+      return [...confirmedRecords, ...recordsToSend, ...newRecords];
+    },
+    prepareRecordsToSend() {
+      if (recordsToSend.length === 0 && newRecords.length > 0) {
+        const records = [...newRecords];
+        recordsToSend.push(...records);
+        newRecords.length = 0;
+        syncLog.push({ msg: "toSend", records });
+      }
+      return recordsToSend;
+    },
+    forwardIterable() {
+      return function* () {
+        yield* confirmedRecords;
+        yield* recordsToSend;
+        yield* newRecords;
+      }();
+    },
+    backwardIterable() {
+      return function* () {
+        for (let i = newRecords.length - 1;i >= 0; i--)
+          yield newRecords[i];
+        for (let i = recordsToSend.length - 1;i >= 0; i--)
+          yield recordsToSend[i];
+        for (let i = confirmedRecords.length - 1;i >= 0; i--)
+          yield confirmedRecords[i];
+      }();
+    },
+    revertUnconfirmed(predicate) {
+      const toRevert = [...recordsToSend, ...newRecords].filter(predicate || (() => true));
+      revert(toRevert);
+      syncLog.push({ msg: "revertUnconfirmed", records: toRevert });
+    },
+    applyUnconfirmed(predicate) {
+      const filter = predicate || (() => true);
+      if (justConfirmed.length > 0) {
+        const confirmedEvents = justConfirmed.map((record) => record.event);
+        const transformedSend = transformEvents(confirmedEvents, recordsToSend.map((record) => record.event));
+        const transformedNew = transformEvents(confirmedEvents, newRecords.map((record) => record.event));
+        const updatedRecordsToSend = transformedSend.map((event) => ({
+          event,
+          command: commandFactory(event.body.operation)
+        }));
+        const updatedNewRecords = transformedNew.map((event) => ({
+          event,
+          command: commandFactory(event.body.operation)
+        }));
+        recordsToSend.length = 0;
+        recordsToSend.push(...updatedRecordsToSend);
+        newRecords.length = 0;
+        newRecords.push(...updatedNewRecords);
+        justConfirmed.length = 0;
+      }
+      const unconfirmed = [...recordsToSend, ...newRecords].filter(filter);
+      apply(unconfirmed);
+      syncLog.push({ msg: "applyUnconfirmed", records: unconfirmed });
+    },
+    justConfirmed,
+    getSyncLog() {
+      return syncLog;
+    },
+    syncLogSubject,
+    clear() {
+      confirmedRecords.length = 0;
+      recordsToSend.length = 0;
+      newRecords.length = 0;
+      syncLog.length = 0;
+      syncLogSubject.publish(syncLog);
+    },
+    clearConfirmedRecords() {
+      confirmedRecords.length = 0;
+      syncLog.length = 0;
+      syncLogSubject.publish(syncLog);
+    },
+    removeUnconfirmedEventsByItems(itemIds) {
+      function shouldRemoveEvent(operation, ids) {
+        if (operation.method === "add" && operation.class === "Board") {
+          if (Array.isArray(operation.item)) {
+            return operation.item.some((id) => ids.includes(id));
+          }
+          return ids.includes(operation.item);
+        }
+        if (operation.method === "remove" && operation.class === "Board") {
+          return operation.item.some((id) => ids.includes(id));
+        }
+        return false;
+      }
+      const nextRecordsToSend = recordsToSend.filter((record) => !shouldRemoveEvent(record.event.body.operation, itemIds));
+      if (nextRecordsToSend.length !== recordsToSend.length) {
+        recordsToSend.length = 0;
+        recordsToSend.push(...nextRecordsToSend);
+      }
+      const nextNewRecords = newRecords.filter((record) => !shouldRemoveEvent(record.event.body.operation, itemIds));
+      if (nextNewRecords.length !== newRecords.length) {
+        newRecords.length = 0;
+        newRecords.push(...nextNewRecords);
+      }
+    },
+    isAllEventsConfirmed() {
+      return recordsToSend.length === 0 && newRecords.length === 0;
+    },
+    setSnapshotLastIndex(index) {
+      snapshotLastIndex = index;
+    },
+    getSnapshotLastIndex() {
+      return snapshotLastIndex;
+    }
+  };
+}
+var init_createEventsList = __esm(() => {
+  init_Merge();
+  init_mergeRecords();
+  init_SyncLog();
+  init_transformEvents();
+});
+
+// src/Events/Log/getRecordByIdFromList.ts
+function getRecordByIdFromList(id, list) {
+  for (const record of list.forwardIterable()) {
+    if (record.event.body.eventId === id) {
+      return record;
+    }
+  }
+  return;
+}
+
+// src/Events/Log/shouldSkipEvent.ts
+function shouldSkipEvent(record, userId) {
+  const { operation } = record.event.body;
+  return record.event.body.userId !== userId || operation.method === "updateVideoData" || operation.class === "Audio" && operation.method === "setUrl";
+}
+
+// src/Events/Log/getRedoRecordFromList.ts
+function getRedoRecordFromList(userId, list) {
+  let counter = 0;
+  for (const record of list.backwardIterable()) {
+    if (shouldSkipEvent(record, userId)) {
+      continue;
+    }
+    if (record.event.body.operation.method !== "undo" && record.event.body.operation.method !== "redo") {
+      return null;
+    }
+    const { method } = record.event.body.operation;
+    if (method === "redo") {
+      counter++;
+    } else if (method === "undo") {
+      if (counter > 0) {
+        counter--;
+      } else if (counter === 0) {
+        return record;
+      }
+    }
+  }
+  return null;
+}
+var init_getRedoRecordFromList = () => {};
+
+// src/Events/Log/getUndoRecordFromList.ts
+function getUndoRecordFromList(userId, list) {
+  let counter = 0;
+  const isAllEventsConfirmed = list.isAllEventsConfirmed();
+  if (!isAllEventsConfirmed) {
+    return null;
+  }
+  for (const record of list.getConfirmedRecords().slice().reverse()) {
+    if (shouldSkipEvent(record, userId)) {
+      continue;
+    }
+    if (record.event.body.operation.method === "undo") {
+      counter++;
+    } else if (counter === 0) {
+      return record;
+    } else {
+      counter--;
+    }
+  }
+  return null;
+}
+var init_getUndoRecordFromList = () => {};
+
+// src/Events/Log/getUnpublishedEventFromList.ts
+function getUnpublishedEventFromList(list) {
+  const recordsToSend = list.prepareRecordsToSend();
+  if (recordsToSend.length === 0) {
+    return null;
+  }
+  const mergedRecords = mergeRecords(recordsToSend);
+  const operations = getOperationsFromEventRecords(mergedRecords);
+  return {
+    event: combineOperationsIntoPack(recordsToSend[0].event, operations),
+    sentEventIds: recordsToSend.map((record) => record.event.body.eventId)
+  };
+}
+function getOperationsFromEventRecords(records) {
+  return records.map((record) => ({
+    ...record.event.body.operation,
+    actualId: record.event.body.eventId
+  }));
+}
+function combineOperationsIntoPack(baseEvent, operations) {
+  const { operation, ...bodyWithoutOperation } = baseEvent.body;
+  return {
+    ...baseEvent,
+    body: {
+      ...bodyWithoutOperation,
+      operations
+    }
+  };
+}
+var init_getUnpublishedEventFromList = __esm(() => {
+  init_mergeRecords();
+});
+
+// src/Events/mergeEvents.ts
+function mergeEvents(events) {
+  if (events.length < 2) {
+    return events;
+  }
+  const mergedEvents = [];
+  let previous = null;
+  for (const event of events) {
+    if (!previous) {
+      previous = event;
+      continue;
+    }
+    const mergedOperation = mergeOperations(previous.body.operation, event.body.operation);
+    if (!mergedOperation) {
+      mergedEvents.push(previous);
+      previous = event;
+    } else {
+      previous = {
+        ...event,
+        body: {
+          ...event.body,
+          operation: mergedOperation
+        }
+      };
+    }
+  }
+  if (previous) {
+    mergedEvents.push(previous);
+  }
+  return mergedEvents;
+}
+var init_mergeEvents = __esm(() => {
+  init_Merge();
+});
+
 // src/Events/Log/expandEvents.ts
 function expandEvents(events) {
   return events.flatMap((event) => {
@@ -6063,6 +6160,9 @@ class EventsLog {
     const events = expandEvents([event]);
     this.list.confirmSentRecords(events);
   }
+  confirmSentLocalEventIds(eventIds, order) {
+    this.list.confirmSentRecordIds(eventIds, order);
+  }
   getUnorderedRecords() {
     return this.list.getRecordsToSend().concat(this.list.getNewRecords());
   }
@@ -6105,6 +6205,7 @@ var init_EventsLog = __esm(() => {
   init_createEventsList();
   init_getRedoRecordFromList();
   init_getUndoRecordFromList();
+  init_getUnpublishedEventFromList();
   init_insertEventsFromOtherConnectionsIntoList();
 });
 
@@ -12052,6 +12153,9 @@ class SpatialIndex {
     this.Mbr = new Mbr;
   }
   insert(item) {
+    if (this.itemsArray.includes(item) || this.getById(item.getId())) {
+      return;
+    }
     this.itemsArray.push(item);
     this.itemsIndex.insert(item);
     if (conf.isNode()) {
@@ -12649,6 +12753,9 @@ class SimpleSpatialIndex {
     this.Mbr = new Mbr;
   }
   insert(item) {
+    if (this.itemsArray.includes(item) || this.getById(item.getId())) {
+      return;
+    }
     this.itemsArray.push(item);
     if (this.Mbr.getWidth() === 0 && this.Mbr.getHeight() === 0) {
       this.Mbr = item.getMbr().copy();
@@ -13075,7 +13182,10 @@ var init_BaseItem = __esm(() => {
         if (this.parent !== childId && this.getId() !== childId && !this.hasAncestor(childId)) {
           if (!this.index?.getById(childId) && foundItem) {
             const localMatrix = foundItem.transformation.toMatrix().toLocalOf(containerNestingMatrix);
-            this.board.items.index.remove(foundItem, true);
+            const currentParentId = foundItem.parent;
+            const currentParent = currentParentId !== "Board" ? this.board.items.getById(currentParentId) : undefined;
+            const sourceIndex = currentParent?.index || this.board.items.index;
+            sourceIndex.remove(foundItem, true);
             foundItem.parent = this.getId();
             foundItem.onParentChanged(this.getId());
             foundItem.transformation.setLocalMatrix(localMatrix);
@@ -16737,7 +16847,7 @@ var init_getListTypeAtSelectionStart = __esm(() => {
 });
 
 // src/Items/RichText/editorHelpers/links/setLink.ts
-import { Editor as Editor11, Transforms as Transforms10 } from "slate";
+import { Editor as Editor11, Transforms as Transforms10, Text as Text6 } from "slate";
 var setLink = (editor, link, selection) => {
   if (!selection) {
     selectWholeText(editor);
@@ -16749,15 +16859,15 @@ var setLink = (editor, link, selection) => {
   }
   const format = link ? "rgba(71, 120, 245, 1)" : "rgb(20, 21, 26)";
   Transforms10.setNodes(editor, { fontColor: format }, {
-    match: (n) => !Editor11.isEditor(n) && n.type === "text",
+    match: (n) => Text6.isText(n),
     split: true
   });
-  for (const [node, path2] of Editor11.nodes(editor, {
-    match: (n) => !Editor11.isEditor(n) && n.type === "text"
+  for (const [, path2] of Editor11.nodes(editor, {
+    match: (n) => Text6.isText(n)
   })) {
     const nodeRange = Editor11.range(editor, path2);
     Transforms10.select(editor, nodeRange);
-    Transforms10.setNodes(editor, { link }, { split: false, match: (n) => !Editor11.isEditor(n) && n.type === "text" });
+    Transforms10.setNodes(editor, { link }, { split: false, match: (n) => Text6.isText(n) });
   }
 };
 var init_setLink = __esm(() => {
@@ -27441,7 +27551,7 @@ var init_setEditorFocus = () => {};
 import {
   Editor as Editor30,
   Element as Element9,
-  Text as Text6,
+  Text as Text7,
   Transforms as Transforms20
 } from "slate";
 var isEditInProcessValue = false, counter = 0, RichText;
@@ -28009,7 +28119,7 @@ var init_RichText = __esm(() => {
     }
     getMinFontSize() {
       const textNodes = Editor30.nodes(this.editor.editor, {
-        match: (n) => Text6.isText(n),
+        match: (n) => Text7.isText(n),
         at: []
       });
       const fontSizes = [];
@@ -57782,25 +57892,16 @@ function handleBoardEventMessage(message, board) {
   if (event.order <= log.getLastIndex()) {
     return;
   }
-  const eventUserId = parseFloat(event.body.eventId.split(":")[0]);
-  const currentUserId = Number(localStorage.getItem("userId") || "0");
-  const isEventFromCurrentUser = eventUserId === currentUserId;
+  const eventConnectionId = Number(event.body.eventId.split(":")[0]);
+  const currentConnectionId = board.events.connection?.connectionId;
+  const isEventFromCurrentUser = currentConnectionId !== undefined && eventConnectionId === currentConnectionId;
   if (isEventFromCurrentUser) {
     return;
   }
   if ("operations" in event.body) {
-    log.insertEventsFromOtherConnections({
-      ...event,
-      body: {
-        ...event.body,
-        userId: Number(message.userId)
-      }
-    });
+    log.insertEventsFromOtherConnections(event);
   } else {
-    log.insertEventsFromOtherConnections({
-      ...event,
-      userId: Number(message.userId)
-    });
+    log.insertEventsFromOtherConnections(event);
   }
   const last = log.getLastConfirmed();
   if (last) {
@@ -57852,11 +57953,11 @@ function tryPublishEvent(board) {
   if (log.pendingEvent) {
     return;
   }
-  const unpublishedEvent = log.getUnpublishedEvent();
-  if (!unpublishedEvent) {
+  const unpublishedBatch = log.getUnpublishedEvent();
+  if (!unpublishedBatch) {
     return;
   }
-  sendBoardEvent(board, unpublishedEvent, log.currentSequenceNumber);
+  sendBoardEvent(board, unpublishedBatch, log.currentSequenceNumber);
 }
 function tryResendEvent(board) {
   const { log } = board.events;
@@ -57873,7 +57974,10 @@ function tryResendEvent(board) {
     board.presence.clear();
     conf.connection?.notifyAboutLostConnection();
   }
-  sendBoardEvent(board, log.pendingEvent.event, log.currentSequenceNumber);
+  sendBoardEvent(board, {
+    event: log.pendingEvent.event,
+    sentEventIds: log.pendingEvent.sentEventIds
+  }, log.currentSequenceNumber);
 }
 function handleSnapshotApplication(snapshot, board) {
   const { log } = board.events;
@@ -57898,8 +58002,9 @@ function handleBoardEventListApplication(events, board) {
     board.events.subject.publish(newEvents[0]);
   }
 }
-function sendBoardEvent(board, event, sequenceNumber) {
+function sendBoardEvent(board, batch, sequenceNumber) {
   const { log } = board.events;
+  const { event, sentEventIds } = batch;
   const toSend = {
     ...event,
     body: {
@@ -57917,6 +58022,7 @@ function sendBoardEvent(board, event, sequenceNumber) {
   const date = Date.now();
   log.pendingEvent = {
     event: toSend,
+    sentEventIds,
     sequenceNumber,
     lastSentTime: date
   };
@@ -57964,7 +58070,7 @@ function handleConfirmation(msg, board) {
   conf.connection?.dismissNotificationAboutLostConnection();
   log.currentSequenceNumber++;
   log.pendingEvent.event.order = msg.order;
-  log.confirmSentLocalEvent(log.pendingEvent.event);
+  log.confirmSentLocalEventIds(log.pendingEvent.sentEventIds, msg.order);
   board.subject.publish();
   log.pendingEvent = null;
   log.firstSentTime = null;