rita-workspace 0.5.44 → 0.5.46

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

@@ -991,12 +991,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 (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 (expectedDrawingId !== activeDrawingIdRef.current) return;
       if (Array.isArray(elements) && elements.length === 0 && fresh && Array.isArray(fresh.elements) && fresh.elements.length > 0) {
         return;
       }
@@ -1007,7 +1011,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 +1019,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");
     }
@@ -1767,6 +1771,20 @@ var DrawingsDialog = ({
       newFolderInputRef.current.focus();
     }
   }, [creatingFolder]);
+  (0, import_react5.useEffect)(() => {
+    if (!open) return;
+    const handler = (e) => {
+      if (e.key !== "Escape") return;
+      const active = document.activeElement;
+      const tag = active?.tagName;
+      if (tag === "INPUT" || tag === "TEXTAREA" || active?.isContentEditable) {
+        return;
+      }
+      onClose();
+    };
+    document.addEventListener("keydown", handler);
+    return () => document.removeEventListener("keydown", handler);
+  }, [open, onClose]);
   const handleMouseDown = (0, import_react5.useCallback)((e) => {
     if (e.target.closest("button")) return;
     if (e.target.closest("input")) return;
@@ -2825,12 +2843,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) {
@@ -2868,7 +2888,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

@@ -919,12 +919,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 (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 (expectedDrawingId !== activeDrawingIdRef.current) return;
       if (Array.isArray(elements) && elements.length === 0 && fresh && Array.isArray(fresh.elements) && fresh.elements.length > 0) {
         return;
       }
@@ -935,7 +939,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 +947,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");
     }
@@ -1695,6 +1699,20 @@ var DrawingsDialog = ({
       newFolderInputRef.current.focus();
     }
   }, [creatingFolder]);
+  useEffect3(() => {
+    if (!open) return;
+    const handler = (e) => {
+      if (e.key !== "Escape") return;
+      const active = document.activeElement;
+      const tag = active?.tagName;
+      if (tag === "INPUT" || tag === "TEXTAREA" || active?.isContentEditable) {
+        return;
+      }
+      onClose();
+    };
+    document.addEventListener("keydown", handler);
+    return () => document.removeEventListener("keydown", handler);
+  }, [open, onClose]);
   const handleMouseDown = useCallback2((e) => {
     if (e.target.closest("button")) return;
     if (e.target.closest("input")) return;
@@ -2753,12 +2771,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) {
@@ -2796,7 +2816,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.44",
+  "version": "0.5.46",
   "description": "Multi-drawing workspace feature for Rita (Excalidraw fork)",
   "main": "dist/index.js",
   "module": "dist/index.mjs",