feat: implement manual save with toast notification (#4)
* feat: implement manual save via Ctrl+S with toast and increase autosave interval - Increased autosave interval to 30s. - Captured Ctrl+S / Meta+S to trigger manual save. - Added a minimalistic, translucent toast in the top right to display saving status. * feat: implement manual save via Ctrl+S with toast and increase autosave interval - Increased autosave interval to 30s. - Captured Ctrl+S / Meta+S to trigger manual save. - Added a minimalistic, translucent toast in the top right to display saving status. --------- Co-authored-by: ruinivist <179396038+ruinivist@users.noreply.github.com>
This commit is contained in:
+56
-2
@@ -96,6 +96,7 @@ export function App() {
|
|||||||
const [loading, setLoading] = useState(true);
|
const [loading, setLoading] = useState(true);
|
||||||
const [error, setError] = useState<string | null>(null);
|
const [error, setError] = useState<string | null>(null);
|
||||||
const [isSidebarOpen, setIsSidebarOpen] = useState(false);
|
const [isSidebarOpen, setIsSidebarOpen] = useState(false);
|
||||||
|
const [toastMessage, setToastMessage] = useState<string | null>(null);
|
||||||
|
|
||||||
const currentIdRef = useRef<string | null>(activeId);
|
const currentIdRef = useRef<string | null>(activeId);
|
||||||
const currentTitleRef = useRef(activeTitle);
|
const currentTitleRef = useRef(activeTitle);
|
||||||
@@ -106,6 +107,7 @@ export function App() {
|
|||||||
const inFlightSaveRef = useRef<Promise<void> | null>(null);
|
const inFlightSaveRef = useRef<Promise<void> | null>(null);
|
||||||
const loadVersionRef = useRef(0);
|
const loadVersionRef = useRef(0);
|
||||||
const themeSyncFrameRef = useRef<number | null>(null);
|
const themeSyncFrameRef = useRef<number | null>(null);
|
||||||
|
const toastTimeoutRef = useRef<number | null>(null);
|
||||||
|
|
||||||
const activeDrawing = useMemo(
|
const activeDrawing = useMemo(
|
||||||
() => drawings.find((drawing) => drawing.id === activeId) ?? null,
|
() => drawings.find((drawing) => drawing.id === activeId) ?? null,
|
||||||
@@ -118,7 +120,7 @@ export function App() {
|
|||||||
return list;
|
return list;
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const saveScene = useCallback(async () => {
|
const saveScene = useCallback(async (isManual = false) => {
|
||||||
const drawingId = currentIdRef.current;
|
const drawingId = currentIdRef.current;
|
||||||
const nextScene = latestSceneRef.current;
|
const nextScene = latestSceneRef.current;
|
||||||
if (!drawingId || !nextScene) {
|
if (!drawingId || !nextScene) {
|
||||||
@@ -126,15 +128,37 @@ export function App() {
|
|||||||
}
|
}
|
||||||
setError(null);
|
setError(null);
|
||||||
|
|
||||||
|
if (isManual) {
|
||||||
|
setToastMessage("Saving...");
|
||||||
|
if (toastTimeoutRef.current !== null) {
|
||||||
|
clearTimeout(toastTimeoutRef.current);
|
||||||
|
toastTimeoutRef.current = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const promise = requestJson<{ ok: true; drawing: DrawingMeta }>(`/api/drawings/${drawingId}`, {
|
const promise = requestJson<{ ok: true; drawing: DrawingMeta }>(`/api/drawings/${drawingId}`, {
|
||||||
method: "PUT",
|
method: "PUT",
|
||||||
body: JSON.stringify(nextScene),
|
body: JSON.stringify(nextScene),
|
||||||
})
|
})
|
||||||
.then((body) => {
|
.then((body) => {
|
||||||
setDrawings((current) => replaceMeta(current, body.drawing));
|
setDrawings((current) => replaceMeta(current, body.drawing));
|
||||||
|
if (isManual) {
|
||||||
|
setToastMessage("Saved");
|
||||||
|
if (toastTimeoutRef.current !== null) {
|
||||||
|
clearTimeout(toastTimeoutRef.current);
|
||||||
|
}
|
||||||
|
toastTimeoutRef.current = window.setTimeout(() => setToastMessage(null), 2000);
|
||||||
|
}
|
||||||
})
|
})
|
||||||
.catch((saveError: unknown) => {
|
.catch((saveError: unknown) => {
|
||||||
setError(saveError instanceof Error ? saveError.message : "Save failed");
|
setError(saveError instanceof Error ? saveError.message : "Save failed");
|
||||||
|
if (isManual) {
|
||||||
|
setToastMessage("Save failed");
|
||||||
|
if (toastTimeoutRef.current !== null) {
|
||||||
|
clearTimeout(toastTimeoutRef.current);
|
||||||
|
}
|
||||||
|
toastTimeoutRef.current = window.setTimeout(() => setToastMessage(null), 2000);
|
||||||
|
}
|
||||||
throw saveError;
|
throw saveError;
|
||||||
})
|
})
|
||||||
.finally(() => {
|
.finally(() => {
|
||||||
@@ -158,6 +182,17 @@ export function App() {
|
|||||||
}
|
}
|
||||||
}, [saveScene]);
|
}, [saveScene]);
|
||||||
|
|
||||||
|
const triggerManualSave = useCallback(async () => {
|
||||||
|
if (timeoutRef.current !== null) {
|
||||||
|
clearTimeout(timeoutRef.current);
|
||||||
|
timeoutRef.current = null;
|
||||||
|
}
|
||||||
|
if (inFlightSaveRef.current) {
|
||||||
|
await inFlightSaveRef.current;
|
||||||
|
}
|
||||||
|
await saveScene(true);
|
||||||
|
}, [saveScene]);
|
||||||
|
|
||||||
const scheduleSave = useCallback(() => {
|
const scheduleSave = useCallback(() => {
|
||||||
if (timeoutRef.current !== null) {
|
if (timeoutRef.current !== null) {
|
||||||
clearTimeout(timeoutRef.current);
|
clearTimeout(timeoutRef.current);
|
||||||
@@ -166,7 +201,7 @@ export function App() {
|
|||||||
timeoutRef.current = window.setTimeout(() => {
|
timeoutRef.current = window.setTimeout(() => {
|
||||||
timeoutRef.current = null;
|
timeoutRef.current = null;
|
||||||
void saveScene();
|
void saveScene();
|
||||||
}, 1500);
|
}, 30000);
|
||||||
}, [saveScene]);
|
}, [saveScene]);
|
||||||
|
|
||||||
const loadDrawing = useCallback(
|
const loadDrawing = useCallback(
|
||||||
@@ -329,6 +364,20 @@ export function App() {
|
|||||||
});
|
});
|
||||||
}, [syncThemeTokens]);
|
}, [syncThemeTokens]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const handleKeyDown = (e: KeyboardEvent) => {
|
||||||
|
if ((e.ctrlKey || e.metaKey) && e.key.toLowerCase() === "s") {
|
||||||
|
e.preventDefault();
|
||||||
|
e.stopPropagation();
|
||||||
|
void triggerManualSave();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
window.addEventListener("keydown", handleKeyDown, { capture: true });
|
||||||
|
return () => {
|
||||||
|
window.removeEventListener("keydown", handleKeyDown, { capture: true });
|
||||||
|
};
|
||||||
|
}, [triggerManualSave]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const currentPathId = pathToId();
|
const currentPathId = pathToId();
|
||||||
if (currentPathId) {
|
if (currentPathId) {
|
||||||
@@ -410,6 +459,11 @@ export function App() {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="app-shell" ref={appShellRef}>
|
<div className="app-shell" ref={appShellRef}>
|
||||||
|
{toastMessage && (
|
||||||
|
<div className="toast-overlay" aria-live="polite">
|
||||||
|
{toastMessage}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
<main className="editor-shell">
|
<main className="editor-shell">
|
||||||
<div className="app-actions">
|
<div className="app-actions">
|
||||||
<button
|
<button
|
||||||
|
|||||||
@@ -253,6 +253,22 @@ input {
|
|||||||
pointer-events: auto;
|
pointer-events: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.toast-overlay {
|
||||||
|
position: fixed;
|
||||||
|
top: 16px;
|
||||||
|
right: 16px;
|
||||||
|
z-index: 100;
|
||||||
|
background: var(--app-overlay-bg);
|
||||||
|
backdrop-filter: blur(4px);
|
||||||
|
color: var(--app-text-color);
|
||||||
|
padding: 8px 16px;
|
||||||
|
border-radius: 8px;
|
||||||
|
font-size: var(--app-sidebar-font-size);
|
||||||
|
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
|
||||||
|
border: 1px solid var(--app-sidebar-border);
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
|
||||||
.editor-frame,
|
.editor-frame,
|
||||||
.editor-loading {
|
.editor-loading {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
|||||||
Reference in New Issue
Block a user