canvu-react 0.4.6 → 0.4.8

package/dist/realtime.js

@@ -1996,6 +1996,7 @@ function createYjsBoardDoc() {
     doc,
     yItems,
     lastServerConfirmedIds: /* @__PURE__ */ new Set(),
+    lastServerConfirmedItemSerializations: /* @__PURE__ */ new Map(),
     serverItemSeenAt: /* @__PURE__ */ new Map()
   };
 }
@@ -2052,6 +2053,10 @@ function valuesEqual(left, right) {
     return false;
   }
 }
+function serializeItem(value) {
+  const item = value instanceof Y.Map ? yMapToVectorItem(value) : value;
+  return JSON.stringify(item);
+}
 function updateYMapInPlace(yMap, next) {
   const nextKeys = /* @__PURE__ */ new Set();
   for (const [key, value] of Object.entries(next)) {
@@ -2121,6 +2126,14 @@ function applyServerSnapshotToYDoc(board, options) {
       if (!id) continue;
       const existing = indexYItemsById(board.yItems).get(id);
       if (existing) {
+        const currentSerialized = serializeItem(existing.yMap);
+        const incomingSerialized = serializeItem(item);
+        const confirmedSerialized = board.lastServerConfirmedItemSerializations.get(id);
+        const hasPendingLocalChange = confirmedSerialized === void 0 ? currentSerialized !== incomingSerialized : currentSerialized !== confirmedSerialized && currentSerialized !== incomingSerialized;
+        if (hasPendingLocalChange) {
+          board.serverItemSeenAt.set(id, now);
+          continue;
+        }
         updateYMapInPlace(existing.yMap, item);
         board.serverItemSeenAt.set(id, now);
         continue;
@@ -2131,9 +2144,13 @@ function applyServerSnapshotToYDoc(board, options) {
     }
   }, origin);
   board.lastServerConfirmedIds = /* @__PURE__ */ new Set();
+  board.lastServerConfirmedItemSerializations = /* @__PURE__ */ new Map();
   for (const item of snapshotItems) {
     const id = getItemId(item);
-    if (id) board.lastServerConfirmedIds.add(id);
+    if (id) {
+      board.lastServerConfirmedIds.add(id);
+      board.lastServerConfirmedItemSerializations.set(id, serializeItem(item));
+    }
   }
 }
 function replaceYDocWithSnapshot(board, options) {
@@ -2148,11 +2165,13 @@ function replaceYDocWithSnapshot(board, options) {
     }
   }, origin);
   board.lastServerConfirmedIds = /* @__PURE__ */ new Set();
+  board.lastServerConfirmedItemSerializations = /* @__PURE__ */ new Map();
   board.serverItemSeenAt = /* @__PURE__ */ new Map();
   for (const item of snapshotItems) {
     const id = getItemId(item);
     if (id) {
       board.lastServerConfirmedIds.add(id);
+      board.lastServerConfirmedItemSerializations.set(id, serializeItem(item));
       board.serverItemSeenAt.set(id, now);
     }
   }
@@ -2164,7 +2183,8 @@ function getLocallyPendingItemIds(board) {
     if (!yMap) continue;
     const id = getItemId(yMap);
     if (!id) continue;
-    if (!board.lastServerConfirmedIds.has(id)) {
+    const confirmedSerialized = board.lastServerConfirmedItemSerializations.get(id);
+    if (!confirmedSerialized || serializeItem(yMap) !== confirmedSerialized) {
       pending.add(id);
     }
   }
@@ -2704,6 +2724,7 @@ function useRealtimeSession(options) {
           restoredFromBinary = decodeYDocState(board, draft.yDocState);
           if (restoredFromBinary) {
             const allIds = /* @__PURE__ */ new Set();
+            const allItems = readVectorItems(board.yItems);
             for (let i = 0; i < board.yItems.length; i++) {
               const yMap = board.yItems.get(i);
               if (!yMap) continue;
@@ -2712,9 +2733,17 @@ function useRealtimeSession(options) {
             }
             const pendingIds = new Set(draft.pendingIds ?? []);
             board.lastServerConfirmedIds = /* @__PURE__ */ new Set();
+            board.lastServerConfirmedItemSerializations = /* @__PURE__ */ new Map();
             for (const id of allIds) {
               if (!pendingIds.has(id)) {
                 board.lastServerConfirmedIds.add(id);
+                const item = allItems.find((candidate) => candidate.id === id);
+                if (item) {
+                  board.lastServerConfirmedItemSerializations.set(
+                    id,
+                    JSON.stringify(item)
+                  );
+                }
               }
             }
           }
@@ -2725,6 +2754,7 @@ function useRealtimeSession(options) {
             origin: ORIGIN_BOOTSTRAP
           });
           board.lastServerConfirmedIds = /* @__PURE__ */ new Set();
+          board.lastServerConfirmedItemSerializations = /* @__PURE__ */ new Map();
         }
       }
       const items = board ? readVectorItems(board.yItems) : draft.items;