Skip to content

AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.

Render new memo optimistically on mobile

yoma5f8359faa229
diff --git a/apps/web/src/components/EditorPane.tsx b/apps/web/src/components/EditorPane.tsx
index 23099557..7a26635a 100644
--- a/apps/web/src/components/EditorPane.tsx
+++ b/apps/web/src/components/EditorPane.tsx
@@ -361,6 +361,8 @@ const MobileNotebookSelectSheet = ({
export const EditorPane = ({
memo,
mobileDefaultEditMemoId,
+ preserveUnsavedContentFromMemoId,
+ saveBlocked = false,
isTrashView,
notebooks,
isLoading,
@@ -381,6 +383,8 @@ export const EditorPane = ({
}: {
memo: MemoDetail | null;
mobileDefaultEditMemoId: string | null;
+ preserveUnsavedContentFromMemoId?: string | null;
+ saveBlocked?: boolean;
isTrashView: boolean;
notebooks: Notebook[];
isLoading: boolean;
@@ -492,7 +496,7 @@ export const EditorPane = ({
const currentMemo = memoRef.current;
const currentEditor = editorRef.current;
- if (!currentMemo || currentMemo.isDeleted || !currentEditor || !currentEditor.isEditable || files.length === 0) {
+ if (saveBlocked || !currentMemo || currentMemo.isDeleted || !currentEditor || !currentEditor.isEditable || files.length === 0) {
return;
}
@@ -535,13 +539,13 @@ export const EditorPane = ({
window.setTimeout(() => setImageUploadState("idle"), 2200);
}
})();
- }, [queryClient, t]);
+ }, [queryClient, saveBlocked, t]);
const insertResourceFiles = useCallback((files: File[]) => {
const currentMemo = memoRef.current;
const currentEditor = editorRef.current;
- if (!currentMemo || currentMemo.isDeleted || !currentEditor || !currentEditor.isEditable || files.length === 0) {
+ if (saveBlocked || !currentMemo || currentMemo.isDeleted || !currentEditor || !currentEditor.isEditable || files.length === 0) {
return;
}
@@ -596,7 +600,7 @@ export const EditorPane = ({
window.setTimeout(() => setImageUploadState("idle"), 2200);
}
})();
- }, [queryClient]);
+ }, [queryClient, saveBlocked, t]);
const editor = useEditor({
extensions: [
@@ -837,8 +841,22 @@ export const EditorPane = ({
}
const sameMemo = editingMemoIdRef.current === memo.id;
+ const shouldPreserveUnsavedContent =
+ Boolean(preserveUnsavedContentFromMemoId) &&
+ editingMemoIdRef.current === preserveUnsavedContentFromMemoId &&
+ memo.id !== preserveUnsavedContentFromMemoId &&
+ hasUnsavedChangesRef.current &&
+ !memo.isDeleted;
+
memoRef.current = memo;
+ if (shouldPreserveUnsavedContent) {
+ editingMemoIdRef.current = memo.id;
+ setSaveState("idle");
+ void localDb.drafts.delete(preserveUnsavedContentFromMemoId as string);
+ return;
+ }
+
if (sameMemo && hasUnsavedChangesRef.current && !memo.isDeleted) {
return;
}
@@ -883,7 +901,7 @@ export const EditorPane = ({
return () => {
cancelled = true;
};
- }, [isTrashView, memo, editor]);
+ }, [isTrashView, memo, editor, preserveUnsavedContentFromMemoId]);
useEffect(() => {
if (isEditorReady(editor)) {
@@ -919,6 +937,10 @@ export const EditorPane = ({
throw new Error("No memo selected");
}
+ if (saveBlocked) {
+ throw new Error("Memo is not ready to save");
+ }
+
if (currentMemo.isDeleted) {
throw new Error("Deleted memos are read-only");
}
@@ -951,7 +973,11 @@ export const EditorPane = ({
return { memo: data.memo, snapshot };
},
- onMutate: () => setSaveState("saving"),
+ onMutate: () => {
+ if (!saveBlocked) {
+ setSaveState("saving");
+ }
+ },
onSuccess: async ({ memo: savedMemo, snapshot }) => {
memoRef.current = savedMemo;
await onSaved(savedMemo);
@@ -1008,6 +1034,7 @@ export const EditorPane = ({
memo.isDeleted ||
!editor ||
!hasUnsavedChanges ||
+ saveBlocked ||
saveMutation.isPending ||
saveState === "conflict"
) {
@@ -1019,7 +1046,7 @@ export const EditorPane = ({
}, 1200);
return () => window.clearTimeout(timer);
- }, [dirtyVersion, editor, hasUnsavedChanges, memo, saveMutation, saveState]);
+ }, [dirtyVersion, editor, hasUnsavedChanges, memo, saveBlocked, saveMutation, saveState]);
if (isSelectionMode) {
return (
@@ -1106,7 +1133,7 @@ export const EditorPane = ({
: "0/0";
const updateMemoNotebook = (notebookId: string, sourceMemo: MemoDetail = memoRef.current ?? memo) => {
- if (effectiveReadOnly || notebookId === sourceMemo.notebookId || notebookUpdatePending) {
+ if (saveBlocked || effectiveReadOnly || notebookId === sourceMemo.notebookId || notebookUpdatePending) {
setMobileNotebookSheetOpen(false);
return;
}
@@ -1133,7 +1160,7 @@ export const EditorPane = ({
};
const handleNotebookChange = (notebookId: string) => {
- if (!hasUnsavedChanges || saveMutation.isPending) {
+ if (saveBlocked || !hasUnsavedChanges || saveMutation.isPending) {
updateMemoNotebook(notebookId);
return;
}
@@ -1144,7 +1171,7 @@ export const EditorPane = ({
};
const handleMobileBack = () => {
- if (readOnly || !editor || !hasUnsavedChanges) {
+ if (readOnly || saveBlocked || !editor || !hasUnsavedChanges) {
onBackToList();
return;
}
@@ -1161,7 +1188,7 @@ export const EditorPane = ({
};
const handleMobileDone = () => {
- if (readOnly || !editor || !hasUnsavedChanges) {
+ if (readOnly || saveBlocked || !editor || !hasUnsavedChanges) {
setIsMobileEditing(false);
setMobileToolbarOpen(false);
return;
@@ -1285,7 +1312,7 @@ export const EditorPane = ({
variant="ghost"
title={t("editor.uploadAttachment")}
aria-label={t("editor.uploadAttachment")}
- disabled={mobileDoneDisabled || effectiveReadOnly}
+ disabled={mobileDoneDisabled || effectiveReadOnly || saveBlocked}
onClick={() => fileInputRef.current?.click()}
>
<Paperclip className="h-4 w-4" />
@@ -1308,7 +1335,7 @@ export const EditorPane = ({
<Button className="hidden sm:inline-flex" size="icon" variant="ghost" title={t("editor.searchCurrentMemo")} aria-label={t("editor.searchCurrentMemo")} onClick={() => openNoteSearch()}>
<Search className="h-4 w-4" />
</Button>
- <Button className="hidden sm:inline-flex" size="icon" variant="ghost" title={t("editor.versionHistory")} aria-label={t("editor.versionHistory")} onClick={() => setHistoryOpen(true)}>
+ <Button className="hidden sm:inline-flex" size="icon" variant="ghost" title={t("editor.versionHistory")} aria-label={t("editor.versionHistory")} disabled={saveBlocked} onClick={() => setHistoryOpen(true)}>
<History className="h-4 w-4" />
</Button>
<GitHubRepositoryLink className="hidden h-8 w-8 justify-center rounded-md text-slate-500 transition hover:bg-slate-50 hover:text-slate-900 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-emerald-500/70 lg:inline-flex" />
@@ -1320,7 +1347,7 @@ export const EditorPane = ({
title={t("editor.save")}
aria-label={t("editor.save")}
onClick={() => saveMutation.mutate()}
- disabled={!editor || saveMutation.isPending || !hasUnsavedChanges}
+ disabled={!editor || saveBlocked || saveMutation.isPending || !hasUnsavedChanges}
>
<Save className="h-4 w-4" />
</Button>
@@ -1354,6 +1381,7 @@ export const EditorPane = ({
</DropdownMenuItem>
<DropdownMenuItem
className="flex h-9 w-full items-center gap-2 px-3 text-left text-sm text-slate-700 hover:bg-slate-50 cursor-pointer outline-none"
+ disabled={saveBlocked}
onClick={() => {
setHistoryOpen(true);
}}
@@ -1373,6 +1401,7 @@ export const EditorPane = ({
<DropdownMenuSeparator className="my-1 h-px bg-slate-100" />
<DropdownMenuItem
className="flex h-9 w-full items-center gap-2 px-3 text-left text-sm text-rose-700 hover:bg-rose-50 cursor-pointer outline-none"
+ disabled={saveBlocked}
onClick={() => void onPermanentDeleted(memo.id)}
>
<Trash2 className="h-4 w-4" />
@@ -1384,6 +1413,7 @@ export const EditorPane = ({
<DropdownMenuSeparator className="my-1 h-px bg-slate-100" />
<DropdownMenuItem
className="flex h-9 w-full items-center gap-2 px-3 text-left text-sm text-rose-700 hover:bg-rose-50 cursor-pointer outline-none"
+ disabled={saveBlocked}
onClick={() => void onDeleted(memo.id)}
>
<Trash2 className="h-4 w-4" />
@@ -1412,7 +1442,7 @@ export const EditorPane = ({
<button
className="flex h-8 min-w-0 max-w-full items-center gap-1 rounded-md border border-transparent bg-transparent px-2 text-sm font-medium text-slate-600 outline-none transition hover:border-slate-200 hover:bg-slate-50 hover:text-slate-900 focus-visible:border-emerald-300 focus-visible:ring-2 focus-visible:ring-emerald-500/20 disabled:opacity-50 sm:hidden"
type="button"
- disabled={effectiveReadOnly || notebookUpdatePending}
+ disabled={saveBlocked || effectiveReadOnly || notebookUpdatePending}
title={t("editor.currentNotebook")}
aria-label={t("editor.currentNotebookAria", { name: currentNotebookLabel })}
onClick={() => setMobileNotebookSheetOpen(true)}
@@ -1423,7 +1453,7 @@ export const EditorPane = ({
<div className="hidden min-w-[9rem] max-w-[18rem] sm:block">
<Select
value={memo.notebookId}
- disabled={effectiveReadOnly || notebookUpdatePending}
+ disabled={saveBlocked || effectiveReadOnly || notebookUpdatePending}
onValueChange={(value) => handleNotebookChange(value)}
>
<SelectTrigger className="h-8 min-w-0 border-transparent bg-transparent px-2 text-sm font-medium text-slate-600 hover:border-slate-200 hover:bg-slate-50 hover:text-slate-900 whitespace-nowrap">
@@ -1580,7 +1610,7 @@ export const EditorPane = ({
{mobileNotebookSheetOpen && (
<MobileNotebookSelectSheet
- isUpdating={notebookUpdatePending || saveMutation.isPending}
+ isUpdating={saveBlocked || notebookUpdatePending || saveMutation.isPending}
options={notebookOptions}
selectedNotebookId={memo.notebookId}
onClose={() => setMobileNotebookSheetOpen(false)}
diff --git a/apps/web/src/components/WorkspaceApp.tsx b/apps/web/src/components/WorkspaceApp.tsx
index 8d984482..5ffebfa7 100644
--- a/apps/web/src/components/WorkspaceApp.tsx
+++ b/apps/web/src/components/WorkspaceApp.tsx
@@ -28,7 +28,7 @@ import { MemoListPane, MemoSelectionActionBar } from "./MemoListPane";
import { AppConfirmDialog, MemoDeleteConfirmDialog, NotebookNameDialog } from "./dialogs/ConfirmDialogs";
import { api } from "@/lib/api";
import { cn } from "@/lib/utils";
-import type { Notebook, AuthUser, MemoSummary, MemoDetail } from "@edgeever/shared";
+import { emptyDoc, markdownToDoc, type Notebook, type AuthUser, type MemoSummary, type MemoDetail } from "@edgeever/shared";
import type {
Pane,
MemoView,
@@ -107,6 +107,7 @@ const TagsDialog = lazy(() => import("./dialogs/TagsDialog").then((module) => ({
const TemplatesDialog = lazy(() => import("./dialogs/TemplatesDialog").then((module) => ({ default: module.TemplatesDialog })));
const SETTINGS_PATH = "/settings";
+const PENDING_CREATED_MEMO_ID_PREFIX = "pending-created-memo-";
const emptySyncQueueSummary = (): SyncQueueSummary => ({
total: 0,
@@ -143,6 +144,32 @@ const cacheMemoDetail = (queryClient: QueryClient, memo: MemoDetail, view: MemoV
queryClient.setQueryData(memoDetailQueryKey(memo.id, view), { memo });
};
+const createPendingMemoDetail = (notebookId: string, template?: MemoTemplate): MemoDetail => {
+ const now = new Date().toISOString();
+ const contentMarkdown = template?.contentMarkdown ?? "";
+
+ return {
+ id: `${PENDING_CREATED_MEMO_ID_PREFIX}${crypto.randomUUID()}`,
+ notebookId,
+ title: template?.title ?? DEFAULT_MEMO_TITLE,
+ excerpt: "",
+ tags: template?.tags ?? [],
+ isPinned: false,
+ isArchived: false,
+ isDeleted: false,
+ revision: 0,
+ createdAt: now,
+ updatedAt: now,
+ deletedAt: null,
+ contentJson: contentMarkdown ? markdownToDoc(contentMarkdown) : emptyDoc(),
+ contentMarkdown,
+ contentText: "",
+ sourceMemoIds: [],
+ mergeSourceCount: 0,
+ mergedIntoMemoId: null,
+ };
+};
+
const getAdjacentMemoIdAfterRemoval = (memos: MemoSummary[], removedMemoIds: Set<string>, anchorMemoId: string) => {
const anchorIndex = memos.findIndex((memo) => memo.id === anchorMemoId);
@@ -527,6 +554,8 @@ export const WorkspaceApp = ({
const [createdMemoEditId, setCreatedMemoEditId] = useState<string | null>(null);
const [createdMemoSelectionGuardId, setCreatedMemoSelectionGuardId] = useState<string | null>(null);
const [isOpeningCreatedMemo, setIsOpeningCreatedMemo] = useState(false);
+ const [pendingCreatedMemo, setPendingCreatedMemo] = useState<MemoDetail | null>(null);
+ const [createdMemoPreserveSourceId, setCreatedMemoPreserveSourceId] = useState<string | null>(null);
const [selectedMemoIds, setSelectedMemoIds] = useState<Set<string>>(new Set());
const [memoSelectionMode, setMemoSelectionMode] = useState(false);
const [selectionMoveTargetNotebookId, setSelectionMoveTargetNotebookId] = useState("");
@@ -736,6 +765,10 @@ export const WorkspaceApp = ({
writeShortcutSettingsPreference(shortcutSettings);
}, [shortcutSettings]);
+ useEffect(() => {
+ void import("./EditorPane");
+ }, []);
+
useEffect(() => {
if (location.pathname === SETTINGS_PATH) {
skipNextHomeRouteSyncRef.current = false;
@@ -1011,7 +1044,7 @@ export const WorkspaceApp = ({
const memoQuery = useQuery({
queryKey: selectedMemoId ? memoDetailQueryKey(selectedMemoId, memoView) : ["memo", selectedMemoId, memoView],
queryFn: () => api.getMemo(selectedMemoId as string, { includeDeleted: memoView === "trash" }),
- enabled: Boolean(selectedMemoId),
+ enabled: Boolean(selectedMemoId && !pendingCreatedMemo),
});
const createNotebookMutation = useMutation({
@@ -1049,12 +1082,19 @@ export const WorkspaceApp = ({
});
const createMemoMutation = useMutation({
- mutationFn: api.createMemo,
- onSuccess: (data) => {
+ mutationFn: ({
+ payload,
+ }: {
+ pendingMemoId: string;
+ payload: { notebookId: string; title?: string; contentMarkdown?: string; tags?: string[] };
+ }) => api.createMemo(payload),
+ onSuccess: (data, variables) => {
const targetNotebookId =
selectedNotebookId && selectedNotebookId !== data.memo.notebookId ? data.memo.notebookId : selectedNotebookId;
setIsOpeningCreatedMemo(false);
+ setCreatedMemoPreserveSourceId(variables.pendingMemoId);
+ setPendingCreatedMemo(null);
setMemoView("notebook");
setSearch("");
if (targetNotebookId !== selectedNotebookId) {
@@ -1074,6 +1114,10 @@ export const WorkspaceApp = ({
},
onError: () => {
setIsOpeningCreatedMemo(false);
+ setPendingCreatedMemo(null);
+ setCreatedMemoPreserveSourceId(null);
+ setCreatedMemoEditId(null);
+ setSelectedMemoId(null);
setActivePane("memos");
},
});
@@ -1211,7 +1255,10 @@ export const WorkspaceApp = ({
});
const selectedNotebook = notebooks.find((notebook) => notebook.id === selectedNotebookId) ?? null;
- const selectedMemo = memoQuery.data?.memo ?? null;
+ const cachedSelectedMemo = selectedMemoId
+ ? queryClient.getQueryData<{ memo: MemoDetail }>(memoDetailQueryKey(selectedMemoId, memoView))?.memo ?? null
+ : null;
+ const selectedMemo = pendingCreatedMemo ?? memoQuery.data?.memo ?? cachedSelectedMemo;
const selectionMoveNotebookOptions = useMemo(() => getNotebookMoveOptions(notebooks), [notebooks]);
const selectedMemosInCurrentList = useMemo(
() => memos.filter((memo) => selectedMemoIds.has(memo.id)),
@@ -1283,21 +1330,27 @@ export const WorkspaceApp = ({
}
setTemplatesOpen(false);
+ const pendingMemo = createPendingMemoDetail(defaultMemoNotebookId, template);
navigateWorkspaceHome();
setIsOpeningCreatedMemo(true);
+ setPendingCreatedMemo(pendingMemo);
+ setCreatedMemoPreserveSourceId(null);
setMemoView("notebook");
setSearch("");
setRightView("editor");
setMobileBottomNavActive("home");
- setCreatedMemoEditId(null);
+ setCreatedMemoEditId(pendingMemo.id);
setCreatedMemoSelectionGuardId(null);
- setSelectedMemoId(null);
+ setSelectedMemoId(pendingMemo.id);
setActivePane("editor");
createMemoMutation.mutate({
- notebookId: defaultMemoNotebookId,
- title: template?.title ?? DEFAULT_MEMO_TITLE,
- contentMarkdown: template?.contentMarkdown ?? "",
- tags: template?.tags ?? [],
+ pendingMemoId: pendingMemo.id,
+ payload: {
+ notebookId: defaultMemoNotebookId,
+ title: template?.title ?? DEFAULT_MEMO_TITLE,
+ contentMarkdown: template?.contentMarkdown ?? "",
+ tags: template?.tags ?? [],
+ },
});
};
@@ -1548,6 +1601,8 @@ export const WorkspaceApp = ({
setMobileBottomNavActive("home");
clearMemoSelection();
setIsOpeningCreatedMemo(false);
+ setPendingCreatedMemo(null);
+ setCreatedMemoPreserveSourceId(null);
setCreatedMemoEditId(null);
setCreatedMemoSelectionGuardId(null);
setMobileNotebookPickerOpen(false);
@@ -1561,6 +1616,8 @@ export const WorkspaceApp = ({
setMobileBottomNavActive("home");
clearMemoSelection();
setIsOpeningCreatedMemo(false);
+ setPendingCreatedMemo(null);
+ setCreatedMemoPreserveSourceId(null);
setCreatedMemoEditId(null);
setCreatedMemoSelectionGuardId(null);
setMobileNotebookPickerOpen(false);
@@ -1577,6 +1634,8 @@ export const WorkspaceApp = ({
setSearch("");
clearMemoSelection();
setIsOpeningCreatedMemo(false);
+ setPendingCreatedMemo(null);
+ setCreatedMemoPreserveSourceId(null);
setCreatedMemoEditId(null);
setCreatedMemoSelectionGuardId(null);
setActivePane("memos");
@@ -1734,6 +1793,8 @@ export const WorkspaceApp = ({
if (activePane === "editor" || activePane === "notebooks") {
setIsOpeningCreatedMemo(false);
+ setPendingCreatedMemo(null);
+ setCreatedMemoPreserveSourceId(null);
setActivePane("memos");
return true;
}
@@ -2126,6 +2187,8 @@ export const WorkspaceApp = ({
setMobileBottomNavActive("home");
clearMemoSelection();
setIsOpeningCreatedMemo(false);
+ setPendingCreatedMemo(null);
+ setCreatedMemoPreserveSourceId(null);
setCreatedMemoEditId(null);
setCreatedMemoSelectionGuardId(null);
setSelectedMemoId(null);
@@ -2135,6 +2198,8 @@ export const WorkspaceApp = ({
navigateWorkspaceHome();
setRightView("editor");
setIsOpeningCreatedMemo(false);
+ setPendingCreatedMemo(null);
+ setCreatedMemoPreserveSourceId(null);
setCreatedMemoEditId(null);
setCreatedMemoSelectionGuardId(null);
setSelectedMemoId(memoId);
@@ -2214,9 +2279,11 @@ export const WorkspaceApp = ({
<EditorPane
memo={selectedMemo}
mobileDefaultEditMemoId={createdMemoEditId}
+ preserveUnsavedContentFromMemoId={createdMemoPreserveSourceId}
+ saveBlocked={Boolean(pendingCreatedMemo)}
isTrashView={memoView === "trash"}
notebooks={notebooks}
- isLoading={memoQuery.isLoading || isOpeningCreatedMemo}
+ isLoading={memoQuery.isLoading || (isOpeningCreatedMemo && !pendingCreatedMemo)}
searchFocusToken={noteSearchFocusToken}
replaceFocusToken={noteReplaceFocusToken}
imageCompressionEnabled={imageCompressionEnabled}
@@ -2225,11 +2292,15 @@ export const WorkspaceApp = ({
hasPreviousMemo={Boolean(previousMemoId)}
onBackToList={() => {
setIsOpeningCreatedMemo(false);
+ setPendingCreatedMemo(null);
+ setCreatedMemoPreserveSourceId(null);
setActivePane("memos");
}}
onOpenNextMemo={() => {
if (nextMemoId) {
setIsOpeningCreatedMemo(false);
+ setPendingCreatedMemo(null);
+ setCreatedMemoPreserveSourceId(null);
setCreatedMemoEditId(null);
setCreatedMemoSelectionGuardId(null);
setSelectedMemoId(nextMemoId);
@@ -2238,6 +2309,8 @@ export const WorkspaceApp = ({
onOpenPreviousMemo={() => {
if (previousMemoId) {
setIsOpeningCreatedMemo(false);
+ setPendingCreatedMemo(null);
+ setCreatedMemoPreserveSourceId(null);
setCreatedMemoEditId(null);
setCreatedMemoSelectionGuardId(null);
setSelectedMemoId(previousMemoId);