use submodule

excalidraw/excalidraw-app/app-jotai.ts

@@ -1,127 +1,37 @@
-import { atom } from "jotai";
-import { jotaiStore } from "../packages/excalidraw/jotai";
-import { StorageType } from "./components/StorageSettingsDialog";
+// eslint-disable-next-line no-restricted-imports
+import {
+  atom,
+  Provider,
+  useAtom,
+  useAtomValue,
+  useSetAtom,
+  createStore,
+  type PrimitiveAtom,
+} from "jotai";
+import { useLayoutEffect } from "react";
 
-export type User = {
-  id: number;
-  githubId: number;
-  login: string;
-  name: string;
-  avatarUrl: string;
-};
+export const appJotaiStore = createStore();
 
-export const userAtom = atom<User | null>(null);
+export { atom, Provider, useAtom, useAtomValue, useSetAtom };
 
-const baseCurrentCanvasIdAtom = atom<string | null>(
-  localStorage.getItem("excalidraw-current-canvas-id"),
-);
+export const useAtomWithInitialValue = <
+  T extends unknown,
+  A extends PrimitiveAtom<T>,
+>(
+  atom: A,
+  initialValue: T | (() => T),
+) => {
+  const [value, setValue] = useAtom(atom);
 
-export const currentCanvasIdAtom = atom(
-  (get) => get(baseCurrentCanvasIdAtom),
-  (get, set, newId: string | null) => {
-    set(baseCurrentCanvasIdAtom, newId);
-    if (newId) {
-      localStorage.setItem("excalidraw-current-canvas-id", newId);
+  useLayoutEffect(() => {
+    if (typeof initialValue === "function") {
+      // @ts-ignore
+      setValue(initialValue());
     } else {
-      localStorage.removeItem("excalidraw-current-canvas-id");
+      setValue(initialValue);
     }
-  },
-);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
 
-// Storage Configuration
-// -----------------------------------------------------------------------------
-
-interface StorageConfig {
-  type: StorageType;
-  // Cloudflare KV
-  kvUrl?: string;
-  kvApiToken?: string;
-  // AWS S3
-  s3AccessKeyId?: string;
-  s3SecretAccessKey?: string;
-  s3Region?: string;
-  s3BucketName?: string;
-}
-
-const STORAGE_CONFIG_LOCAL_STORAGE_KEY = "excalidraw-storage-config-type";
-const STORAGE_CONFIG_SESSION_STORAGE_KEY =
-  "excalidraw-storage-config-credentials";
-
-const getInitialStorageConfig = (): StorageConfig => {
-  const defaultConfig: StorageConfig = { type: "indexed-db" };
-
-  try {
-    const nonSensitive = localStorage.getItem(STORAGE_CONFIG_LOCAL_STORAGE_KEY);
-    const sensitive = sessionStorage.getItem(
-      STORAGE_CONFIG_SESSION_STORAGE_KEY,
-    );
-
-    const nonSensitiveConfig = nonSensitive ? JSON.parse(nonSensitive) : {};
-    const sensitiveConfig = sensitive ? JSON.parse(sensitive) : {};
-
-    return { ...defaultConfig, ...nonSensitiveConfig, ...sensitiveConfig };
-  } catch (e) {
-    console.error("Failed to load storage config", e);
-    return defaultConfig;
-  }
+  return [value, setValue] as const;
 };
-
-const baseStorageConfigAtom = atom<StorageConfig>(getInitialStorageConfig());
-
-export const storageConfigAtom = atom(
-  (get) => get(baseStorageConfigAtom),
-  (get, set, newConfig: StorageConfig) => {
-    const {
-      type,
-      kvUrl,
-      kvApiToken,
-      s3AccessKeyId,
-      s3SecretAccessKey,
-      s3Region,
-      s3BucketName,
-    } = newConfig;
-
-    const nonSensitive = { type };
-    const sensitive = {
-      kvUrl,
-      kvApiToken,
-      s3AccessKeyId,
-      s3SecretAccessKey,
-      s3Region,
-      s3BucketName,
-    };
-
-    try {
-      localStorage.setItem(
-        STORAGE_CONFIG_LOCAL_STORAGE_KEY,
-        JSON.stringify(nonSensitive),
-      );
-      sessionStorage.setItem(
-        STORAGE_CONFIG_SESSION_STORAGE_KEY,
-        JSON.stringify(sensitive),
-      );
-    } catch (e) {
-      console.error("Failed to save storage config", e);
-    }
-
-    set(baseStorageConfigAtom, newConfig);
-  },
-);
-
-// Dialog States
-// -----------------------------------------------------------------------------
-export const createCanvasDialogAtom = atom({ isOpen: false });
-
-export const renameCanvasDialogAtom = atom<{
-  isOpen: boolean;
-  canvasId: string | null;
-  currentName: string | null;
-}>({
-  isOpen: false,
-  canvasId: null,
-  currentName: null,
-});
-
-export const saveAsDialogAtom = atom({ isOpen: false });
-
-export const appJotaiStore = jotaiStore;