rita-workspace 0.5.45 → 0.5.47

package/dist/index.d.mts

@@ -160,7 +160,7 @@ interface WorkspaceContextValue {
     /** Re-numbers `position` for the given drawing IDs in order. Use the full ordered slice
      *  the user reordered (e.g. all root drawings, or all drawings in a folder). */
     reorderDrawings: (orderedIds: string[]) => Promise<void>;
-    saveCurrentDrawing: (elements: unknown[], appState: Record<string, unknown>, files?: Record<string, unknown>) => Promise<void>;
+    saveCurrentDrawing: (expectedDrawingId: string, elements: unknown[], appState: Record<string, unknown>, files?: Record<string, unknown>) => Promise<void>;
     saveDrawingById: (id: string, elements: unknown[], appState: Record<string, unknown>, files?: Record<string, unknown>) => Promise<void>;
     refreshDrawings: () => Promise<void>;
     exportWorkspace: () => Promise<void>;

package/dist/index.d.ts

@@ -160,7 +160,7 @@ interface WorkspaceContextValue {
     /** Re-numbers `position` for the given drawing IDs in order. Use the full ordered slice
      *  the user reordered (e.g. all root drawings, or all drawings in a folder). */
     reorderDrawings: (orderedIds: string[]) => Promise<void>;
-    saveCurrentDrawing: (elements: unknown[], appState: Record<string, unknown>, files?: Record<string, unknown>) => Promise<void>;
+    saveCurrentDrawing: (expectedDrawingId: string, elements: unknown[], appState: Record<string, unknown>, files?: Record<string, unknown>) => Promise<void>;
     saveDrawingById: (id: string, elements: unknown[], appState: Record<string, unknown>, files?: Record<string, unknown>) => Promise<void>;
     refreshDrawings: () => Promise<void>;
     exportWorkspace: () => Promise<void>;

package/dist/index.js

@@ -431,6 +431,13 @@ function isLanguageSupported(langCode) {
   return lang in translations;
 }
 
+// src/state/saveGuard.ts
+function shouldAbortSaveDueToIdMismatch(expectedDrawingId, currentActiveDrawingId) {
+  if (!expectedDrawingId) return true;
+  if (!currentActiveDrawingId) return true;
+  return expectedDrawingId !== currentActiveDrawingId;
+}
+
 // src/state/WorkspaceContext.tsx
 var import_jsx_runtime = require("react/jsx-runtime");
 warmDB();
@@ -991,12 +998,16 @@ function WorkspaceProvider({ children, lang = "en" }) {
       return null;
     }
   }, [workspace]);
-  const saveCurrentDrawing = (0, import_react.useCallback)(async (elements, appState, files) => {
-    if (!activeDrawing) return;
-    if (isDrawingOpenedEarlierInOtherTab(activeDrawing.id)) return;
+  const saveCurrentDrawing = (0, import_react.useCallback)(async (expectedDrawingId, elements, appState, files) => {
+    if (shouldAbortSaveDueToIdMismatch(expectedDrawingId, activeDrawingIdRef.current)) {
+      return;
+    }
+    if (!activeDrawing || activeDrawing.id !== expectedDrawingId) return;
+    if (isDrawingOpenedEarlierInOtherTab(expectedDrawingId)) return;
     try {
-      const fresh = await getDrawing(activeDrawing.id);
+      const fresh = await getDrawing(expectedDrawingId);
       if (fresh && fresh.updatedAt > (activeDrawing.updatedAt ?? 0)) return;
+      if (shouldAbortSaveDueToIdMismatch(expectedDrawingId, activeDrawingIdRef.current)) return;
       if (Array.isArray(elements) && elements.length === 0 && fresh && Array.isArray(fresh.elements) && fresh.elements.length > 0) {
         return;
       }
@@ -1007,7 +1018,7 @@ function WorkspaceProvider({ children, lang = "en" }) {
       if (files) {
         updateData.files = files;
       }
-      await updateDrawing(activeDrawing.id, updateData);
+      await updateDrawing(expectedDrawingId, updateData);
       const now = Date.now();
       const patch = {
         elements,
@@ -1015,8 +1026,8 @@ function WorkspaceProvider({ children, lang = "en" }) {
         ...files ? { files } : {},
         updatedAt: now
       };
-      setDrawings((prev) => prev.map((d) => d.id === activeDrawing.id ? { ...d, ...patch } : d));
-      setActiveDrawing2((prev) => prev && prev.id === activeDrawing.id ? { ...prev, ...patch } : prev);
+      setDrawings((prev) => prev.map((d) => d.id === expectedDrawingId ? { ...d, ...patch } : d));
+      setActiveDrawing2((prev) => prev && prev.id === expectedDrawingId ? { ...prev, ...patch } : prev);
     } catch (err) {
       setError(err instanceof Error ? err.message : "Failed to save drawing");
     }
@@ -1754,11 +1765,7 @@ var DrawingsDialog = ({
         setSelectedId(null);
       }
       setIsRefreshing(true);
-      refreshDrawings().then(() => {
-        if (isFirstOpen) {
-          setExpandedFolders(new Set(foldersRef.current.map((f) => f.id)));
-        }
-      }).finally(() => setIsRefreshing(false));
+      refreshDrawings().finally(() => setIsRefreshing(false));
     }
     prevOpenRef.current = open;
   }, [open, refreshDrawings]);
@@ -2839,12 +2846,14 @@ function useExcalidrawBridge({
     if (saveTimeoutRef.current) {
       clearTimeout(saveTimeoutRef.current);
     }
+    const expectedId = activeDrawing?.id;
+    if (!expectedId) return;
     saveTimeoutRef.current = setTimeout(async () => {
       const elements = excalidrawAPI.getSceneElements();
       const appState = excalidrawAPI.getAppState();
-      await saveCurrentDrawing(elements, appState);
+      await saveCurrentDrawing(expectedId, elements, appState);
     }, autoSaveInterval);
-  }, [excalidrawAPI, saveCurrentDrawing, autoSaveInterval]);
+  }, [excalidrawAPI, saveCurrentDrawing, autoSaveInterval, activeDrawing]);
   (0, import_react6.useEffect)(() => {
     return () => {
       if (saveTimeoutRef.current) {
@@ -2882,7 +2891,7 @@ function WorkspaceBridge({
         scrollY: appState.scrollY
         // Add other persistent properties as needed
       };
-      await saveCurrentDrawing(elements, persistentAppState, files);
+      await saveCurrentDrawing(activeDrawing.id, elements, persistentAppState, files);
       onDrawingSave?.(activeDrawing.id);
     } catch (error) {
       console.error("[WorkspaceBridge] Failed to save drawing:", error);

package/dist/index.mjs

@@ -359,6 +359,13 @@ function isLanguageSupported(langCode) {
   return lang in translations;
 }
 
+// src/state/saveGuard.ts
+function shouldAbortSaveDueToIdMismatch(expectedDrawingId, currentActiveDrawingId) {
+  if (!expectedDrawingId) return true;
+  if (!currentActiveDrawingId) return true;
+  return expectedDrawingId !== currentActiveDrawingId;
+}
+
 // src/state/WorkspaceContext.tsx
 import { jsx } from "react/jsx-runtime";
 warmDB();
@@ -919,12 +926,16 @@ function WorkspaceProvider({ children, lang = "en" }) {
       return null;
     }
   }, [workspace]);
-  const saveCurrentDrawing = useCallback(async (elements, appState, files) => {
-    if (!activeDrawing) return;
-    if (isDrawingOpenedEarlierInOtherTab(activeDrawing.id)) return;
+  const saveCurrentDrawing = useCallback(async (expectedDrawingId, elements, appState, files) => {
+    if (shouldAbortSaveDueToIdMismatch(expectedDrawingId, activeDrawingIdRef.current)) {
+      return;
+    }
+    if (!activeDrawing || activeDrawing.id !== expectedDrawingId) return;
+    if (isDrawingOpenedEarlierInOtherTab(expectedDrawingId)) return;
     try {
-      const fresh = await getDrawing(activeDrawing.id);
+      const fresh = await getDrawing(expectedDrawingId);
       if (fresh && fresh.updatedAt > (activeDrawing.updatedAt ?? 0)) return;
+      if (shouldAbortSaveDueToIdMismatch(expectedDrawingId, activeDrawingIdRef.current)) return;
       if (Array.isArray(elements) && elements.length === 0 && fresh && Array.isArray(fresh.elements) && fresh.elements.length > 0) {
         return;
       }
@@ -935,7 +946,7 @@ function WorkspaceProvider({ children, lang = "en" }) {
       if (files) {
         updateData.files = files;
       }
-      await updateDrawing(activeDrawing.id, updateData);
+      await updateDrawing(expectedDrawingId, updateData);
       const now = Date.now();
       const patch = {
         elements,
@@ -943,8 +954,8 @@ function WorkspaceProvider({ children, lang = "en" }) {
         ...files ? { files } : {},
         updatedAt: now
       };
-      setDrawings((prev) => prev.map((d) => d.id === activeDrawing.id ? { ...d, ...patch } : d));
-      setActiveDrawing2((prev) => prev && prev.id === activeDrawing.id ? { ...prev, ...patch } : prev);
+      setDrawings((prev) => prev.map((d) => d.id === expectedDrawingId ? { ...d, ...patch } : d));
+      setActiveDrawing2((prev) => prev && prev.id === expectedDrawingId ? { ...prev, ...patch } : prev);
     } catch (err) {
       setError(err instanceof Error ? err.message : "Failed to save drawing");
     }
@@ -1682,11 +1693,7 @@ var DrawingsDialog = ({
         setSelectedId(null);
       }
       setIsRefreshing(true);
-      refreshDrawings().then(() => {
-        if (isFirstOpen) {
-          setExpandedFolders(new Set(foldersRef.current.map((f) => f.id)));
-        }
-      }).finally(() => setIsRefreshing(false));
+      refreshDrawings().finally(() => setIsRefreshing(false));
     }
     prevOpenRef.current = open;
   }, [open, refreshDrawings]);
@@ -2767,12 +2774,14 @@ function useExcalidrawBridge({
     if (saveTimeoutRef.current) {
       clearTimeout(saveTimeoutRef.current);
     }
+    const expectedId = activeDrawing?.id;
+    if (!expectedId) return;
     saveTimeoutRef.current = setTimeout(async () => {
       const elements = excalidrawAPI.getSceneElements();
       const appState = excalidrawAPI.getAppState();
-      await saveCurrentDrawing(elements, appState);
+      await saveCurrentDrawing(expectedId, elements, appState);
     }, autoSaveInterval);
-  }, [excalidrawAPI, saveCurrentDrawing, autoSaveInterval]);
+  }, [excalidrawAPI, saveCurrentDrawing, autoSaveInterval, activeDrawing]);
   useEffect4(() => {
     return () => {
       if (saveTimeoutRef.current) {
@@ -2810,7 +2819,7 @@ function WorkspaceBridge({
         scrollY: appState.scrollY
         // Add other persistent properties as needed
       };
-      await saveCurrentDrawing(elements, persistentAppState, files);
+      await saveCurrentDrawing(activeDrawing.id, elements, persistentAppState, files);
       onDrawingSave?.(activeDrawing.id);
     } catch (error) {
       console.error("[WorkspaceBridge] Failed to save drawing:", error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rita-workspace",
-  "version": "0.5.45",
+  "version": "0.5.47",
   "description": "Multi-drawing workspace feature for Rita (Excalidraw fork)",
   "main": "dist/index.js",
   "module": "dist/index.mjs",