@haklex/rich-ext-excalidraw 0.0.52 → 0.0.53

package/dist/ExcalidrawEditRenderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExcalidrawEditRenderer.d.ts","sourceRoot":"","sources":["../src/ExcalidrawEditRenderer.tsx"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAiB,EAAE,EAAE,MAAM,OAAO,CAAA;AAM9C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAA;AAGjD,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,EAAE,kBAAkB,GAAG,IAAI,CAAA;IACnC,gBAAgB,EAAE,CAAC,QAAQ,EAAE,kBAAkB,KAAK,IAAI,CAAA;CACzD;AAsYD,eAAO,MAAM,sBAAsB,EAAE,EAAE,CAAC,2BAA2B,CAiIlE,CAAA"}
+{"version":3,"file":"ExcalidrawEditRenderer.d.ts","sourceRoot":"","sources":["../src/ExcalidrawEditRenderer.tsx"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAiB,EAAE,EAAE,MAAM,OAAO,CAAA;AAM9C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAA;AAGjD,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,EAAE,kBAAkB,GAAG,IAAI,CAAA;IACnC,gBAAgB,EAAE,CAAC,QAAQ,EAAE,kBAAkB,KAAK,IAAI,CAAA;CACzD;AA4aD,eAAO,MAAM,sBAAsB,EAAE,EAAE,CAAC,2BAA2B,CAiIlE,CAAA"}

package/dist/index.mjs

@@ -150,22 +150,15 @@ const ExcalidrawEditorDialogContent = ({
     const mode = storageModeRef.current;
     if (mode === "delta" && saveSnapshot) {
       setIsSaving(true);
-      const frozenDoc = structuredClone(doc);
+      structuredClone(doc);
       return (async () => {
         try {
           const currentBaseUrl = baseRefRef.current;
           const currentBaseData = baseDataRef.current;
-          if (currentBaseUrl && currentBaseData) {
-            const { diff } = await import("jsondiffpatch");
-            const delta = diff(currentBaseData, frozenDoc);
-            onSave(
-              delta ? { type: "delta", baseUrl: currentBaseUrl, delta } : { type: "remote", url: currentBaseUrl }
-            );
-          } else {
+          if (!currentBaseUrl || !currentBaseData) {
             const ref = await saveSnapshot(doc);
             baseRefRef.current = ref;
             baseDataRef.current = doc;
-            onSave({ type: "remote", url: ref });
             setSavedRef(ref);
           }
           isDirtyRef.current = false;
@@ -176,10 +169,14 @@ const ExcalidrawEditorDialogContent = ({
       })();
     }
     if (mode === "remote" && saveSnapshot) {
+      if (baseRefRef.current && baseDataRef.current && JSON.stringify(doc) === JSON.stringify(baseDataRef.current)) {
+        isDirtyRef.current = false;
+        setIsDirty(false);
+        return Promise.resolve();
+      }
       setIsSaving(true);
       return saveSnapshot(doc).then(
         (ref) => {
-          onSave({ type: "remote", url: ref });
           baseRefRef.current = ref;
           baseDataRef.current = doc;
           isDirtyRef.current = false;
@@ -192,14 +189,40 @@ const ExcalidrawEditorDialogContent = ({
         }
       );
     }
-    try {
-      onSave({ type: "inline", data: doc });
-      isDirtyRef.current = false;
-      setIsDirty(false);
-    } catch (err) {
-      console.error("[excalidraw] inline save failed", err);
-    }
+    isDirtyRef.current = false;
+    setIsDirty(false);
     return Promise.resolve();
+  }, [saveSnapshot, getSnapshot]);
+  const emitSnapshot = useCallback(async () => {
+    const doc = getSnapshot();
+    if (!doc) return;
+    const mode = storageModeRef.current;
+    if (mode === "delta" && saveSnapshot) {
+      const currentBaseUrl = baseRefRef.current;
+      const currentBaseData = baseDataRef.current;
+      if (currentBaseUrl && currentBaseData) {
+        const { diff } = await import("jsondiffpatch");
+        const delta = diff(currentBaseData, structuredClone(doc));
+        onSave(
+          delta ? { type: "delta", baseUrl: currentBaseUrl, delta } : { type: "remote", url: currentBaseUrl }
+        );
+      } else {
+        const ref = await saveSnapshot(doc);
+        onSave({ type: "remote", url: ref });
+      }
+      return;
+    }
+    if (mode === "remote") {
+      const ref = baseRefRef.current;
+      if (ref) {
+        onSave({ type: "remote", url: ref });
+      } else if (saveSnapshot) {
+        const newRef = await saveSnapshot(doc);
+        onSave({ type: "remote", url: newRef });
+      }
+      return;
+    }
+    onSave({ type: "inline", data: doc });
   }, [onSave, saveSnapshot, getSnapshot]);
   const handleChange = useCallback(
     (elements) => {
@@ -218,12 +241,12 @@ const ExcalidrawEditorDialogContent = ({
     [performSave]
   );
   const handleSaveAndClose = useCallback(() => {
-    void performSave().then(() => {
-      const doc = getSnapshot();
-      onClose(doc);
+    void performSave().then(async () => {
+      await emitSnapshot();
+      onClose(getSnapshot());
       dismiss();
     });
-  }, [performSave, getSnapshot, onClose, dismiss]);
+  }, [performSave, emitSnapshot, getSnapshot, onClose, dismiss]);
   const handleDiscard = useCallback(() => {
     if (saveTimerRef.current) clearTimeout(saveTimerRef.current);
     dismiss();
@@ -285,10 +308,12 @@ const ExcalidrawEditorDialogContent = ({
     if (isDirtyRef.current) {
       showConfirmDialog();
     } else {
-      onClose(getSnapshot());
-      dismiss();
+      void emitSnapshot().then(() => {
+        onClose(getSnapshot());
+        dismiss();
+      });
     }
-  }, [dismiss, showConfirmDialog, getSnapshot, onClose]);
+  }, [dismiss, showConfirmDialog, emitSnapshot, getSnapshot, onClose]);
   useEffect(() => {
     const handleKeyDown = (e) => {
       if (e.key === "Escape") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haklex/rich-ext-excalidraw",
-  "version": "0.0.52",
+  "version": "0.0.53",
   "description": "Excalidraw whiteboard extension",
   "license": "MIT",
   "type": "module",
@@ -22,10 +22,10 @@
   "dependencies": {
     "@excalidraw/excalidraw": "0.17.0",
     "jsondiffpatch": "^0.7.3",
-    "@haklex/rich-editor": "0.0.52",
-    "@haklex/rich-headless": "0.0.52",
-    "@haklex/rich-editor-ui": "0.0.52",
-    "@haklex/rich-style-token": "0.0.52"
+    "@haklex/rich-editor": "0.0.53",
+    "@haklex/rich-headless": "0.0.53",
+    "@haklex/rich-editor-ui": "0.0.53",
+    "@haklex/rich-style-token": "0.0.53"
   },
   "devDependencies": {
     "@lexical/react": "^0.41.0",