Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions src/db/draw.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { NonDeletedExcalidrawElement } from "@excalidraw/excalidraw/element/types";
import { BinaryFiles } from "@excalidraw/excalidraw/types";
import { supabase } from "./supabase";
import { AuthError, PostgrestError } from "@supabase/supabase-js";

Expand All @@ -8,6 +9,12 @@ export type DBResponse = {
error: PostgrestError | AuthError | null;
};

export type ExcalidrawData = {
elements: readonly NonDeletedExcalidrawElement[];
appState?: Record<string, unknown>;
files?: BinaryFiles;
};

export const DB_NAME = "draw";

export async function getPages(user_id: string): Promise<DBResponse> {
Expand All @@ -32,12 +39,17 @@ export async function getDrawData(id: string): Promise<DBResponse> {

export async function createNewPage(
elements?: readonly NonDeletedExcalidrawElement[],
files?: BinaryFiles,
): Promise<DBResponse> {
const { data: profile, error: profileError } = await supabase.auth.getUser();
if (profile) {
const excalidrawData: ExcalidrawData = {
elements: elements || [],
files: files || {}
};
const { data, error } = await supabase
.from(DB_NAME)
.insert({ user_id: profile.user?.id, page_elements: { elements } })
.insert({ user_id: profile.user?.id, page_elements: excalidrawData })
.select();
return { data, error };
}
Expand All @@ -48,11 +60,16 @@ export async function setDrawData(
id: string,
elements: readonly NonDeletedExcalidrawElement[],
name: string,
files?: BinaryFiles,
): Promise<DBResponse> {
const updateTime = new Date().toISOString();
const excalidrawData: ExcalidrawData = {
elements,
files: files || {}
};
const { data, error } = await supabase
.from(DB_NAME)
.update({ name: name, page_elements: { elements }, updated_at: updateTime })
.update({ name: name, page_elements: excalidrawData, updated_at: updateTime })
.eq("page_id", id)
.select();

Expand Down
7 changes: 5 additions & 2 deletions src/stores/drawDataStore.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { NonDeletedExcalidrawElement } from "@excalidraw/excalidraw/element/types";
import { BinaryFiles } from "@excalidraw/excalidraw/types";
import { create } from "zustand";
import { persist } from "zustand/middleware";

Expand All @@ -7,6 +8,7 @@ export type DrawData = {
elements: readonly NonDeletedExcalidrawElement[];
updatedAt: string;
name: string;
files?: BinaryFiles;
};
};

Expand All @@ -17,6 +19,7 @@ type DrawDataStore = {
elements: readonly NonDeletedExcalidrawElement[],
updatedAt: string,
name: string,
files?: BinaryFiles,
) => void;
getPageData: (page_id: string) => DrawData[string] | undefined;
};
Expand All @@ -25,7 +28,7 @@ const drawDataStore = create<DrawDataStore>()(
persist(
(set, get) => ({
data: {},
setPageData: (page_id, elements, updatedAt, name) =>
setPageData: (page_id, elements, updatedAt, name, files) =>
set((state) => {
const currentData = state.data[page_id];
if (
Expand All @@ -35,7 +38,7 @@ const drawDataStore = create<DrawDataStore>()(
return {
data: {
...state.data,
[page_id]: { elements, updatedAt, name },
[page_id]: { elements, updatedAt, name, files },
},
};
}
Expand Down
3 changes: 2 additions & 1 deletion src/views/Mermaid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ export default function Mermaid() {

async function handleSaveAsNewPage() {
const elements = excalidrawAPI?.getSceneElements();
const data = await createNewPage(elements);
const files = excalidrawAPI?.getFiles();
const data = await createNewPage(elements, files);

if (data.data && data.data[0]?.page_id) {
goToPage(data.data[0].page_id);
Expand Down
29 changes: 24 additions & 5 deletions src/views/Page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { Input } from "@/components/ui/input";
import { toast } from "sonner";
import { Excalidraw, WelcomeScreen } from "@excalidraw/excalidraw";
import { NonDeletedExcalidrawElement } from "@excalidraw/excalidraw/element/types";
import { ExcalidrawImperativeAPI } from "@excalidraw/excalidraw/types";
import { ExcalidrawImperativeAPI, BinaryFiles } from "@excalidraw/excalidraw/types";
import { useQuery, useMutation } from "@tanstack/react-query";
import { RefreshCcw } from "lucide-react";
import { getDrawData, setDrawData } from "@/db/draw";
Expand All @@ -38,7 +38,8 @@ export default function Page({ id }: PageProps) {
mutationFn: (data: {
elements: NonDeletedExcalidrawElement[];
name: string;
}) => setDrawData(id, data.elements, data.name),
files?: BinaryFiles;
}) => setDrawData(id, data.elements, data.name, data.files),
onSuccess: () => {
setIsSaving(false);
},
Expand All @@ -54,11 +55,20 @@ export default function Page({ id }: PageProps) {

async function updateScene() {
if (data?.data && excalidrawAPI) {
const elements = data.data[0].page_elements.elements;
const pageData = data.data[0].page_elements;
const elements = pageData.elements || [];
const files = pageData.files || {};

excalidrawAPI.updateScene({
elements: elements,
appState: { theme: theme },
});

// Update files if they exist
if (Object.keys(files).length > 0) {
excalidrawAPI.addFiles(Object.values(files));
}

setName(data.data[0].name);
}
if (data?.error) {
Expand All @@ -69,20 +79,23 @@ export default function Page({ id }: PageProps) {
const setSceneData = useCallback(async () => {
if (excalidrawAPI) {
const scene = excalidrawAPI.getSceneElements();
const files = excalidrawAPI.getFiles();
const updatedAt = new Date().toISOString();

const existingData = drawDataStore.getState().getPageData(id);

if (JSON.stringify(existingData?.elements) !== JSON.stringify(scene)) {
if (JSON.stringify(existingData?.elements) !== JSON.stringify(scene) ||
JSON.stringify(existingData?.files) !== JSON.stringify(files)) {
setIsSaving(true);
// Save locally first
drawDataStore.getState().setPageData(id, scene, updatedAt, name);
drawDataStore.getState().setPageData(id, scene, updatedAt, name, files);

// Then push to API
mutate(
{
elements: scene as NonDeletedExcalidrawElement[],
name,
files,
},
{
onSettled() {
Expand Down Expand Up @@ -117,6 +130,12 @@ export default function Page({ id }: PageProps) {
elements: localData.elements,
appState: { theme: theme },
});

// Load files if they exist
if (localData.files && Object.keys(localData.files).length > 0) {
excalidrawAPI.addFiles(Object.values(localData.files));
}

setName(localData.name);
}
}, [id, excalidrawAPI, theme]);
Expand Down