Skip to content

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

Reduce mobile editor input work

yoma092063b14a02
diff --git a/apps/web/src/components/EditorPane.tsx b/apps/web/src/components/EditorPane.tsx
index 7a26635a..f0dad7d7 100644
--- a/apps/web/src/components/EditorPane.tsx
+++ b/apps/web/src/components/EditorPane.tsx
@@ -439,6 +439,9 @@ export const EditorPane = ({
const hasUnsavedChangesRef = useRef(false);
const editingMemoIdRef = useRef<string | null>(memo?.id ?? null);
const imageCompressionEnabledRef = useRef(imageCompressionEnabled);
+ const draftPersistTimerRef = useRef<number | null>(null);
+ const pendingBackAfterSaveRef = useRef(false);
+ const toolbarRefreshFrameRef = useRef<number | null>(null);
useEffect(() => {
const mediaQuery = window.matchMedia(MOBILE_EDITOR_QUERY);
@@ -767,15 +770,32 @@ export const EditorPane = ({
return;
}
- const refreshToolbar = () => setEditorStateVersion((version) => version + 1);
+ const refreshToolbar = () => {
+ if (isMobileViewport && !mobileToolbarOpen) {
+ return;
+ }
+
+ if (toolbarRefreshFrameRef.current !== null) {
+ return;
+ }
+
+ toolbarRefreshFrameRef.current = window.requestAnimationFrame(() => {
+ toolbarRefreshFrameRef.current = null;
+ setEditorStateVersion((version) => version + 1);
+ });
+ };
editor.on("selectionUpdate", refreshToolbar);
editor.on("transaction", refreshToolbar);
return () => {
editor.off("selectionUpdate", refreshToolbar);
editor.off("transaction", refreshToolbar);
+ if (toolbarRefreshFrameRef.current !== null) {
+ window.cancelAnimationFrame(toolbarRefreshFrameRef.current);
+ toolbarRefreshFrameRef.current = null;
+ }
};
- }, [editor]);
+ }, [editor, isMobileViewport, mobileToolbarOpen]);
const persistCurrentDraft = useCallback(
(nextTitle = title, nextTagsText = tagsText) => {
@@ -786,13 +806,31 @@ export const EditorPane = ({
return;
}
- void localDb.drafts.put({
- memoId: currentMemo.id,
- title: nextTitle,
- tagsText: nextTagsText,
- contentJson: currentEditor.getJSON() as TiptapDoc,
- updatedAt: new Date().toISOString(),
- });
+ const writeDraft = () => {
+ const latestMemo = memoRef.current;
+ const latestEditor = editorRef.current;
+
+ if (!latestMemo || latestMemo.isDeleted || !isEditorReady(latestEditor)) {
+ return;
+ }
+
+ void localDb.drafts.put({
+ memoId: latestMemo.id,
+ title: nextTitle,
+ tagsText: nextTagsText,
+ contentJson: latestEditor.getJSON() as TiptapDoc,
+ updatedAt: new Date().toISOString(),
+ });
+ };
+
+ if (draftPersistTimerRef.current !== null) {
+ window.clearTimeout(draftPersistTimerRef.current);
+ }
+
+ draftPersistTimerRef.current = window.setTimeout(() => {
+ draftPersistTimerRef.current = null;
+ writeDraft();
+ }, 350);
},
[tagsText, title]
);
@@ -803,11 +841,17 @@ export const EditorPane = ({
return;
}
- hasUnsavedChangesRef.current = true;
- setHasUnsavedChanges(true);
- setDirtyVersion((version) => version + 1);
+ if (!hasUnsavedChangesRef.current) {
+ hasUnsavedChangesRef.current = true;
+ setHasUnsavedChanges(true);
+ }
+
+ if (noteSearchOpen && noteSearchQuery.trim()) {
+ setDirtyVersion((version) => version + 1);
+ }
+
setSaveState((current) => (current === "conflict" ? current : "idle"));
- }, []);
+ }, [noteSearchOpen, noteSearchQuery]);
const currentSnapshot = useCallback(() => {
const currentEditor = editorRef.current;
@@ -928,6 +972,15 @@ export const EditorPane = ({
};
}, [editor, markDirty, memo, persistCurrentDraft]);
+ useEffect(() => {
+ return () => {
+ if (draftPersistTimerRef.current !== null) {
+ window.clearTimeout(draftPersistTimerRef.current);
+ draftPersistTimerRef.current = null;
+ }
+ };
+ }, []);
+
const saveMutation = useMutation({
mutationFn: async () => {
const currentMemo = memoRef.current;
@@ -1048,6 +1101,32 @@ export const EditorPane = ({
return () => window.clearTimeout(timer);
}, [dirtyVersion, editor, hasUnsavedChanges, memo, saveBlocked, saveMutation, saveState]);
+ useEffect(() => {
+ if (
+ !pendingBackAfterSaveRef.current ||
+ saveBlocked ||
+ !memo ||
+ memo.isDeleted ||
+ !editor ||
+ !hasUnsavedChanges ||
+ saveMutation.isPending ||
+ saveState === "conflict"
+ ) {
+ return;
+ }
+
+ pendingBackAfterSaveRef.current = false;
+ saveMutation.mutate(undefined, {
+ onSuccess: () => onBackToList(),
+ onError: (error) => {
+ const sourceError = error instanceof MemoSaveRequestError ? error.originalError : error;
+ if (error instanceof MemoSaveRequestError && shouldQueueMemoSaveError(sourceError)) {
+ onBackToList();
+ }
+ },
+ });
+ }, [editor, hasUnsavedChanges, memo, onBackToList, saveBlocked, saveMutation, saveState]);
+
if (isSelectionMode) {
return (
<div className="flex h-full min-w-0 flex-col bg-white">
@@ -1171,6 +1250,14 @@ export const EditorPane = ({
};
const handleMobileBack = () => {
+ if (saveBlocked && editor && hasUnsavedChanges) {
+ pendingBackAfterSaveRef.current = true;
+ setSaveState("saving");
+ setIsMobileEditing(false);
+ setMobileToolbarOpen(false);
+ return;
+ }
+
if (readOnly || saveBlocked || !editor || !hasUnsavedChanges) {
onBackToList();
return;
diff --git a/apps/web/src/components/WorkspaceApp.tsx b/apps/web/src/components/WorkspaceApp.tsx
index 5ffebfa7..68e15150 100644
--- a/apps/web/src/components/WorkspaceApp.tsx
+++ b/apps/web/src/components/WorkspaceApp.tsx
@@ -592,6 +592,7 @@ export const WorkspaceApp = ({
const [isPullRefreshing, setIsPullRefreshing] = useState(false);
const isPullRefreshingRef = useRef(false);
const skipNextHomeRouteSyncRef = useRef(false);
+ const abandonedPendingMemoIdsRef = useRef<Set<string>>(new Set());
const [mobileListActionsOpen, setMobileListActionsOpen] = useState(false);
const [mobileMoveOpen, setMobileMoveOpen] = useState(false);
@@ -709,6 +710,19 @@ export const WorkspaceApp = ({
setMemoSelectionMode(false);
}, []);
+ const clearPendingCreatedMemo = useCallback(
+ (abandon = true) => {
+ if (abandon && pendingCreatedMemo) {
+ abandonedPendingMemoIdsRef.current.add(pendingCreatedMemo.id);
+ }
+
+ setIsOpeningCreatedMemo(false);
+ setPendingCreatedMemo(null);
+ setCreatedMemoPreserveSourceId(null);
+ },
+ [pendingCreatedMemo]
+ );
+
const replaceMemoSelection = useCallback((memoIds: string[]) => {
setSelectedMemoIds(new Set(memoIds));
setMemoSelectionMode(true);
@@ -1089,6 +1103,18 @@ export const WorkspaceApp = ({
payload: { notebookId: string; title?: string; contentMarkdown?: string; tags?: string[] };
}) => api.createMemo(payload),
onSuccess: (data, variables) => {
+ if (abandonedPendingMemoIdsRef.current.has(variables.pendingMemoId)) {
+ abandonedPendingMemoIdsRef.current.delete(variables.pendingMemoId);
+ setIsOpeningCreatedMemo(false);
+ setPendingCreatedMemo(null);
+ setCreatedMemoPreserveSourceId(null);
+ void Promise.all([
+ queryClient.invalidateQueries({ queryKey: ["memos"] }),
+ queryClient.invalidateQueries({ queryKey: ["notebooks"] }),
+ ]);
+ return;
+ }
+
const targetNotebookId =
selectedNotebookId && selectedNotebookId !== data.memo.notebookId ? data.memo.notebookId : selectedNotebookId;
@@ -1600,9 +1626,7 @@ export const WorkspaceApp = ({
setSelectedNotebookId(notebookId);
setMobileBottomNavActive("home");
clearMemoSelection();
- setIsOpeningCreatedMemo(false);
- setPendingCreatedMemo(null);
- setCreatedMemoPreserveSourceId(null);
+ clearPendingCreatedMemo();
setCreatedMemoEditId(null);
setCreatedMemoSelectionGuardId(null);
setMobileNotebookPickerOpen(false);
@@ -1615,9 +1639,7 @@ export const WorkspaceApp = ({
setSelectedNotebookId(null);
setMobileBottomNavActive("home");
clearMemoSelection();
- setIsOpeningCreatedMemo(false);
- setPendingCreatedMemo(null);
- setCreatedMemoPreserveSourceId(null);
+ clearPendingCreatedMemo();
setCreatedMemoEditId(null);
setCreatedMemoSelectionGuardId(null);
setMobileNotebookPickerOpen(false);
@@ -1633,9 +1655,7 @@ export const WorkspaceApp = ({
setSelectedNotebookId(null);
setSearch("");
clearMemoSelection();
- setIsOpeningCreatedMemo(false);
- setPendingCreatedMemo(null);
- setCreatedMemoPreserveSourceId(null);
+ clearPendingCreatedMemo();
setCreatedMemoEditId(null);
setCreatedMemoSelectionGuardId(null);
setActivePane("memos");
@@ -1792,9 +1812,7 @@ export const WorkspaceApp = ({
}
if (activePane === "editor" || activePane === "notebooks") {
- setIsOpeningCreatedMemo(false);
- setPendingCreatedMemo(null);
- setCreatedMemoPreserveSourceId(null);
+ clearPendingCreatedMemo();
setActivePane("memos");
return true;
}
@@ -2186,9 +2204,7 @@ export const WorkspaceApp = ({
setSelectedNotebookId(null);
setMobileBottomNavActive("home");
clearMemoSelection();
- setIsOpeningCreatedMemo(false);
- setPendingCreatedMemo(null);
- setCreatedMemoPreserveSourceId(null);
+ clearPendingCreatedMemo();
setCreatedMemoEditId(null);
setCreatedMemoSelectionGuardId(null);
setSelectedMemoId(null);
@@ -2197,9 +2213,7 @@ export const WorkspaceApp = ({
onOpenMemo={(memoId) => {
navigateWorkspaceHome();
setRightView("editor");
- setIsOpeningCreatedMemo(false);
- setPendingCreatedMemo(null);
- setCreatedMemoPreserveSourceId(null);
+ clearPendingCreatedMemo();
setCreatedMemoEditId(null);
setCreatedMemoSelectionGuardId(null);
setSelectedMemoId(memoId);
@@ -2291,16 +2305,12 @@ export const WorkspaceApp = ({
hasNextMemo={Boolean(nextMemoId)}
hasPreviousMemo={Boolean(previousMemoId)}
onBackToList={() => {
- setIsOpeningCreatedMemo(false);
- setPendingCreatedMemo(null);
- setCreatedMemoPreserveSourceId(null);
+ clearPendingCreatedMemo();
setActivePane("memos");
}}
onOpenNextMemo={() => {
if (nextMemoId) {
- setIsOpeningCreatedMemo(false);
- setPendingCreatedMemo(null);
- setCreatedMemoPreserveSourceId(null);
+ clearPendingCreatedMemo();
setCreatedMemoEditId(null);
setCreatedMemoSelectionGuardId(null);
setSelectedMemoId(nextMemoId);
@@ -2308,9 +2318,7 @@ export const WorkspaceApp = ({
}}
onOpenPreviousMemo={() => {
if (previousMemoId) {
- setIsOpeningCreatedMemo(false);
- setPendingCreatedMemo(null);
- setCreatedMemoPreserveSourceId(null);
+ clearPendingCreatedMemo();
setCreatedMemoEditId(null);
setCreatedMemoSelectionGuardId(null);
setSelectedMemoId(previousMemoId);