Restore study gestures and shuffle progress; harden note autosave and record V1 comparison

This commit is contained in:
Elijah 2026-11-11 20:00:17 -07:00
parent 4bf121728b
commit d7e19db468
8 changed files with 236 additions and 37 deletions

View file

@ -1,7 +1,7 @@
import { useQuery } from '@tanstack/react-query';
import { BookOpen, Check, ChevronRight, Download, Eye, FolderInput, Layers, MoreHorizontal, Pencil, Printer, Share2, Sparkles, Trash2 } from 'lucide-react';
import { useEffect, useRef, useState } from 'react';
import { Link, useNavigate, useParams, useSearchParams } from 'react-router';
import { useCallback, useEffect, useRef, useState } from 'react';
import { Link, useBlocker, useNavigate, useParams, useSearchParams } from 'react-router';
import { toast } from 'sonner';
import { MoveDialog, ShareDialog } from '@/features/dialogs';
import { MarkdownArea } from '@/features/editors';
@ -36,6 +36,14 @@ export default function NotePage() {
const loaded = useRef('');
const timer = useRef<ReturnType<typeof setTimeout> | null>(null);
const latest = useRef({ title: '', content: '' });
const revision = useRef(0);
const savedRevision = useRef(0);
const saves = useRef<Promise<boolean>>(Promise.resolve(true));
const deleting = useRef(false);
const savingNavigation = useRef(false);
const blocker = useBlocker(({ currentLocation, nextLocation }) =>
!deleting.current && revision.current > savedRevision.current && currentLocation.pathname !== nextLocation.pathname,
);
useEffect(() => {
if (note && loaded.current !== note.id) {
@ -43,39 +51,68 @@ export default function NotePage() {
setTitle(note.title);
setContent(note.content);
latest.current = { title: note.title, content: note.content };
revision.current = 0;
savedRevision.current = 0;
setEditing(Boolean(params.get('edit')) || note.content.trim() === '');
if (params.get('edit')) setParams({}, { replace: true });
}
}, [note, params, setParams]);
const saveNow = async () => {
const saveNow = useCallback(() => {
if (timer.current) clearTimeout(timer.current);
timer.current = null;
setStatus('saving');
try {
await api.patch(`/api/notes/${noteId}`, { title: latest.current.title.trim() || 'Untitled note', content: latest.current.content });
setStatus('saved');
} catch {
setStatus('error');
}
};
const version = revision.current;
const payload = { title: latest.current.title.trim() || 'Untitled note', content: latest.current.content };
// Save in order: a slower, older request must never overwrite a newer edit.
saves.current = saves.current.then(async () => {
if (savedRevision.current >= version) return true;
setStatus('saving');
try {
await api.patch(`/api/notes/${noteId}`, payload);
savedRevision.current = version;
setStatus(version === revision.current ? 'saved' : 'dirty');
return true;
} catch {
setStatus('error');
return false;
}
});
return saves.current;
}, [noteId]);
const change = (patch: Partial<{ title: string; content: string }>) => {
latest.current = { ...latest.current, ...patch };
revision.current += 1;
if (patch.title !== undefined) setTitle(patch.title);
if (patch.content !== undefined) setContent(patch.content);
setStatus('dirty');
if (timer.current) clearTimeout(timer.current);
timer.current = setTimeout(() => void saveNow(), 900);
};
useEffect(
() => () => {
if (timer.current) {
clearTimeout(timer.current);
void api.patch(`/api/notes/${noteId}`, { title: latest.current.title.trim() || 'Untitled note', content: latest.current.content }).catch(() => undefined);
useEffect(() => {
if (blocker.state !== 'blocked' || savingNavigation.current) return;
savingNavigation.current = true;
void saveNow().then((ok) => {
savingNavigation.current = false;
if (ok && savedRevision.current >= revision.current) blocker.proceed?.();
else {
blocker.reset?.();
toast.error('Your note could not be saved. Stay here and retry when connected.');
}
},
[noteId],
);
});
}, [blocker, saveNow]);
useEffect(() => {
const warn = (e: BeforeUnloadEvent) => {
if (revision.current > savedRevision.current && !deleting.current) {
e.preventDefault();
e.returnValue = '';
}
};
window.addEventListener('beforeunload', warn);
return () => {
window.removeEventListener('beforeunload', warn);
if (timer.current) clearTimeout(timer.current);
};
}, []);
if (q.isError) return <ErrorState title="Note not found" message={errorMessage(q.error)} onRetry={() => q.refetch()} />;
if (!q.data || !note) {
@ -94,6 +131,7 @@ export default function NotePage() {
if (timer.current) clearTimeout(timer.current);
timer.current = null;
await api.del(`/api/notes/${note.id}`);
deleting.current = true;
await refresh();
navigate(`/classes/${note.classId}`);
} catch (e) {
@ -134,6 +172,9 @@ export default function NotePage() {
)}
</span>
)}
{editing && status === 'error' && (
<button type="button" className="font-medium text-accent underline underline-offset-2" onClick={() => void saveNow()}>Retry save</button>
)}
{q.data.share?.enabled && (
<Badge tone="accent">
<Share2 /> Shared
@ -145,8 +186,12 @@ export default function NotePage() {
<Segmented
label="Mode"
value={editing ? 'edit' : 'read'}
onChange={(v) => {
if (v === 'read' && status !== 'saved') void saveNow().then(() => void refresh(qk.note(noteId)));
onChange={async (v) => {
if (v === 'read' && status !== 'saved') {
const ok = await saveNow();
if (!ok || savedRevision.current < revision.current) return;
void refresh(qk.note(noteId));
}
setEditing(v === 'edit');
}}
options={[

View file

@ -274,6 +274,7 @@ export default function ReviewPage() {
hint={current.card.hint}
flipped={flipped}
onFlip={flip}
onSwipe={seenAnswer && !busy ? (known) => void rate(known ? 3 : 1) : undefined}
leaving={leaving}
burst={burst}
footer={ai.data?.ready ? <Explain body={{ kind: 'card', front: current.card.front, back: current.card.back }} /> : undefined}