canvu-react 0.4.10 → 0.4.12

package/dist/realtime.cjs

@@ -528,7 +528,8 @@ function parseDocumentSnapshot(value) {
     revision,
     updatedAt,
     items,
-    ...getString(value.updatedByClientId) ? { updatedByClientId: getString(value.updatedByClientId) } : {}
+    ...getString(value.updatedByClientId) ? { updatedByClientId: getString(value.updatedByClientId) } : {},
+    ...getNumber(value.persistedRevision) != null ? { persistedRevision: getNumber(value.persistedRevision) } : {}
   };
 }
 function parseRealtimeSessionPeer(value) {
@@ -2321,6 +2322,9 @@ function sameSerializedItems(left, right) {
 function nowMs() {
   return Date.now();
 }
+function hasDurableDocumentPersistence(snapshot) {
+  return snapshot.persistedRevision == null || snapshot.persistedRevision >= snapshot.revision;
+}
 function draftStorageKey(roomId) {
   return `${DRAFT_STORAGE_PREFIX}${roomId}`;
 }
@@ -2546,7 +2550,7 @@ function useRealtimeSession(options) {
   const applyDocument = react.useCallback(
     (snapshot, options2) => {
       const currentSnapshot = latestDocumentRef.current;
-      if (currentSnapshot && currentSnapshot.revision === snapshot.revision && currentSnapshot.updatedByClientId === snapshot.updatedByClientId && sameSerializedItems(currentSnapshot.items, snapshot.items)) {
+      if (currentSnapshot && currentSnapshot.revision === snapshot.revision && currentSnapshot.updatedByClientId === snapshot.updatedByClientId && currentSnapshot.persistedRevision === snapshot.persistedRevision && sameSerializedItems(currentSnapshot.items, snapshot.items)) {
         return;
       }
       const board = boardRef.current;
@@ -2851,11 +2855,23 @@ function useRealtimeSession(options) {
       }
       const pendingIds = getLocallyPendingItemIds(board);
       if (pendingIds.size === 0) {
-        clearLocalDraftRef.current();
-        setHasPendingDocumentSync(false);
         outboundInFlightRef.current = null;
         queuedDirtyRef.current = false;
-        return false;
+        if (hasDurableDocumentPersistence(serverDocument)) {
+          clearLocalDraftRef.current();
+          setHasPendingDocumentSync(false);
+          return false;
+        }
+        const mergedItems2 = readVectorItems(board.yItems);
+        setLocalDraft({
+          roomId,
+          baseRevision: serverDocument.revision,
+          items: mergedItems2,
+          updatedAt: nowMs(),
+          pendingIds: []
+        });
+        setHasPendingDocumentSync(true);
+        return true;
       }
       const mergedItems = readVectorItems(board.yItems);
       setLocalDraft({
@@ -3203,8 +3219,20 @@ function useRealtimeSession(options) {
           scheduleDocumentFlushRef.current();
         } else {
           queuedDirtyRef.current = false;
-          clearLocalDraftRef.current();
-          setHasPendingDocumentSync(false);
+          if (hasDurableDocumentPersistence(parsed.document)) {
+            clearLocalDraftRef.current();
+            setHasPendingDocumentSync(false);
+          } else {
+            const mergedItems = board ? readVectorItems(board.yItems) : [];
+            setLocalDraftRef.current({
+              roomId,
+              baseRevision: currentRevisionRef.current,
+              items: mergedItems,
+              updatedAt: nowMs(),
+              pendingIds: []
+            });
+            setHasPendingDocumentSync(true);
+          }
         }
         setConflictStateRef.current(null);
         return;
@@ -3671,7 +3699,7 @@ function useRealtimeCanvasDocument(options) {
         }
         return;
       }
-      if (hasPendingLocalChanges && hasLocalItems && hasMissingLocalItems(items, resolvedItems)) {
+      if (hasLocalItems && hasMissingLocalItems(items, resolvedItems)) {
         const normalizedLocalItems = normalizeItems ? normalizeItems(items) : [...items];
         session.remoteAdapter.send?.(normalizedLocalItems);
         return;