Skip to content

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

Make mobile notebook selection non-blocking

yoma6f19d8053308
diff --git a/apps/web/src/components/WorkspaceApp.tsx b/apps/web/src/components/WorkspaceApp.tsx
index aff9f8a7..c9836f96 100644
--- a/apps/web/src/components/WorkspaceApp.tsx
+++ b/apps/web/src/components/WorkspaceApp.tsx
@@ -13,7 +13,7 @@ import {
type PointerEvent as ReactPointerEvent,
} from "react";
import { useInfiniteQuery, useQuery, useMutation, useQueryClient, type QueryClient } from "@tanstack/react-query";
-import { Check, Home, Search, UserRound, Plus, ChevronDown, ChevronRight, RefreshCw, X } from "lucide-react";
+import { Home, Search, UserRound, Plus, ChevronDown, ChevronRight, RefreshCw, X } from "lucide-react";
import { useTranslation } from "react-i18next";
import { useLocation, useNavigate } from "react-router";
import { Button } from "@/components/ui/button";
@@ -624,122 +624,6 @@ const MobileNotebookPickerItem = ({
);
};
-const CreateMemoNotebookPicker = ({
- notebooks,
- defaultNotebookId,
- isCreating,
- onClose,
- onCreate,
-}: {
- notebooks: Notebook[];
- defaultNotebookId: string | null;
- isCreating: boolean;
- onClose: () => void;
- onCreate: (notebookId: string) => void;
-}) => {
- const { t } = useTranslation();
- const [query, setQuery] = useState("");
- const options = useMemo(() => getNotebookMoveOptions(notebooks), [notebooks]);
- const normalizedQuery = query.trim().toLocaleLowerCase("zh-CN");
- const filteredOptions = useMemo(
- () =>
- normalizedQuery
- ? options.filter((option) => option.name.toLocaleLowerCase("zh-CN").includes(normalizedQuery))
- : options,
- [normalizedQuery, options]
- );
- const defaultNotebookName =
- options.find((option) => option.id === defaultNotebookId)?.name ?? t("createMemoNotebookPicker.defaultFallback");
-
- useEffect(() => {
- window.setTimeout(() => {
- if (!defaultNotebookId) {
- return;
- }
- document
- .querySelector<HTMLElement>(`[data-create-memo-notebook-id="${CSS.escape(defaultNotebookId)}"]`)
- ?.scrollIntoView({ block: "center" });
- }, 0);
- }, [defaultNotebookId]);
-
- return (
- <Drawer open={true} onOpenChange={(open) => { if (!open) onClose(); }}>
- <DrawerContent className="inset-x-0 max-h-[82dvh] overflow-hidden border-x-0 border-b-0 pb-[env(safe-area-inset-bottom)]">
- <header className="flex h-14 items-center justify-between border-b border-slate-200 px-4">
- <DrawerHeader className="min-w-0 p-0">
- <DrawerTitle className="text-base">{t("createMemoNotebookPicker.title")}</DrawerTitle>
- <DrawerDescription className="truncate">
- {t("createMemoNotebookPicker.defaultNotebook", { name: defaultNotebookName })}
- </DrawerDescription>
- </DrawerHeader>
- <Button size="icon" variant="ghost" title={t("common.close")} aria-label={t("common.close")} onClick={onClose}>
- <X className="h-4 w-4" />
- </Button>
- </header>
- <div className="border-b border-slate-100 px-4 py-2">
- <div className="flex h-9 items-center gap-2 rounded-md bg-slate-100 px-3 text-sm text-slate-500">
- <Search className="h-4 w-4" />
- <input
- className="min-w-0 flex-1 bg-transparent text-slate-900 outline-none placeholder:text-slate-400"
- value={query}
- placeholder={t("createMemoNotebookPicker.searchPlaceholder")}
- aria-label={t("createMemoNotebookPicker.searchPlaceholder")}
- onChange={(event) => setQuery(event.target.value)}
- />
- {query && (
- <button
- className="flex h-6 w-6 shrink-0 items-center justify-center rounded-md text-slate-400 transition hover:bg-white hover:text-slate-700"
- type="button"
- title={t("mobileNotebookPicker.clearSearch")}
- aria-label={t("mobileNotebookPicker.clearSearch")}
- onMouseDown={(event) => event.preventDefault()}
- onClick={() => setQuery("")}
- >
- <X className="h-3.5 w-3.5" />
- </button>
- )}
- </div>
- </div>
- <div className="max-h-[calc(82dvh_-_8.25rem_-_env(safe-area-inset-bottom))] overflow-y-auto p-2">
- {filteredOptions.length > 0 ? (
- filteredOptions.map((option) => {
- const isDefault = option.id === defaultNotebookId;
-
- return (
- <button
- key={option.id}
- className={cn(
- "mb-1 flex h-12 w-full items-center gap-3 rounded-md px-3 text-left text-sm transition",
- isDefault ? "bg-emerald-50 font-semibold text-emerald-900" : "text-slate-800 hover:bg-slate-50"
- )}
- type="button"
- disabled={isCreating}
- data-create-memo-notebook-id={option.id}
- onClick={() => onCreate(option.id)}
- >
- <span className="min-w-0 flex-1 truncate text-base">{option.selectLabel}</span>
- {isDefault && (
- <span className="inline-flex items-center gap-1 rounded-full bg-emerald-100 px-2 py-0.5 text-xs font-semibold text-emerald-800">
- <Check className="h-3 w-3" />
- {t("createMemoNotebookPicker.defaultBadge")}
- </span>
- )}
- </button>
- );
- })
- ) : (
- <div className="px-3 py-8 text-center text-sm font-medium text-slate-700">
- {normalizedQuery
- ? t("createMemoNotebookPicker.noSearchResult", { query })
- : t("createMemoNotebookPicker.noNotebook")}
- </div>
- )}
- </div>
- </DrawerContent>
- </Drawer>
- );
-};
-
export const WorkspaceApp = ({
authRequired,
user,
@@ -777,8 +661,6 @@ export const WorkspaceApp = ({
);
const [tagsOpen, setTagsOpen] = useState(false);
const [templatesOpen, setTemplatesOpen] = useState(false);
- const [createMemoNotebookPickerOpen, setCreateMemoNotebookPickerOpen] = useState(false);
- const [pendingCreateMemoTemplate, setPendingCreateMemoTemplate] = useState<MemoTemplate | undefined>();
const [mobileNotebookPickerOpen, setMobileNotebookPickerOpen] = useState(false);
const [mobileBottomNavActive, setMobileBottomNavActive] = useState<MobileBottomNavItem>(() =>
isInitialSettingsRoute ? "settings" : "home"
@@ -880,15 +762,14 @@ export const WorkspaceApp = ({
const workspaceBackTargetActive = Boolean(
appNoticeDialog ||
notebookDeleteConfirmation ||
- notebookNameDialog ||
+ notebookNameDialog ||
memoDeleteConfirmation ||
emptyTrashConfirmationOpen ||
- createMemoNotebookPickerOpen ||
- mobileNotebookPickerOpen ||
- mobileListActionsOpen ||
- mobileMoveOpen ||
- mobileMoreOpen ||
- mobileSearchActive ||
+ mobileNotebookPickerOpen ||
+ mobileListActionsOpen ||
+ mobileMoveOpen ||
+ mobileMoreOpen ||
+ mobileSearchActive ||
templatesOpen ||
rightView !== "editor" ||
tagsOpen ||
@@ -904,7 +785,6 @@ export const WorkspaceApp = ({
!notebookNameDialog &&
!memoDeleteConfirmation &&
!emptyTrashConfirmationOpen &&
- !createMemoNotebookPickerOpen &&
!mobileNotebookPickerOpen &&
!mobileListActionsOpen &&
!mobileMoveOpen &&
@@ -1511,21 +1391,8 @@ export const WorkspaceApp = ({
setTemplatesOpen(false);
setMobileBottomNavActive("home");
- setPendingCreateMemoTemplate(template);
- setCreateMemoNotebookPickerOpen(true);
- };
-
- const handleCreateMemoInNotebook = (notebookId: string) => {
- if (!notebookId || memoView === "trash") {
- return;
- }
-
- const template = pendingCreateMemoTemplate;
- setCreateMemoNotebookPickerOpen(false);
- setPendingCreateMemoTemplate(undefined);
- setMobileBottomNavActive("home");
createMemoMutation.mutate({
- notebookId,
+ notebookId: defaultMemoNotebookId,
title: template?.title ?? DEFAULT_MEMO_TITLE,
contentMarkdown: template?.contentMarkdown ?? "",
tags: template?.tags ?? [],
@@ -1910,12 +1777,6 @@ export const WorkspaceApp = ({
return true;
}
- if (createMemoNotebookPickerOpen) {
- setCreateMemoNotebookPickerOpen(false);
- setPendingCreateMemoTemplate(undefined);
- return true;
- }
-
if (mobileNotebookPickerOpen) {
setMobileNotebookPickerOpen(false);
return true;
@@ -1979,7 +1840,6 @@ export const WorkspaceApp = ({
rightView,
clearMemoSelection,
createNotebookMutation.isPending,
- createMemoNotebookPickerOpen,
deleteMemoMutation.isPending,
deleteMemosMutation.isPending,
deleteNotebookMutation.isPending,
@@ -2051,7 +1911,6 @@ export const WorkspaceApp = ({
rightView !== "editor" ||
memoDeleteConfirmation ||
emptyTrashConfirmationOpen ||
- createMemoNotebookPickerOpen ||
mobileNotebookPickerOpen ||
notebookDeleteConfirmation ||
notebookNameDialog ||
@@ -2110,7 +1969,6 @@ export const WorkspaceApp = ({
canCreateMemo,
clearMemoSelection,
createNotebookMutation.isPending,
- createMemoNotebookPickerOpen,
createMemoMutation.isPending,
handleCreateNotebook,
handleCreateMemo,
@@ -2583,18 +2441,6 @@ export const WorkspaceApp = ({
onOpenSettings={handleOpenSettings}
/>
)}
- {createMemoNotebookPickerOpen && (
- <CreateMemoNotebookPicker
- notebooks={notebooks}
- defaultNotebookId={defaultMemoNotebookId}
- isCreating={createMemoMutation.isPending}
- onClose={() => {
- setCreateMemoNotebookPickerOpen(false);
- setPendingCreateMemoTemplate(undefined);
- }}
- onCreate={handleCreateMemoInNotebook}
- />
- )}
{mobileNotebookPickerOpen && (
<MobileNotebookPicker
currentLabel={memoView === "trash" ? t("notebookPane.trash") : undefined}
diff --git a/apps/web/src/i18n/resources/en-US.ts b/apps/web/src/i18n/resources/en-US.ts
index 31dc7b3c..835d46b9 100644
--- a/apps/web/src/i18n/resources/en-US.ts
+++ b/apps/web/src/i18n/resources/en-US.ts
@@ -51,15 +51,6 @@ export const enUS = {
createDisabled: "You cannot create a note in this view",
creating: "Creating",
},
- createMemoNotebookPicker: {
- title: "Choose notebook",
- defaultNotebook: "Default: {{name}}",
- defaultFallback: "Inbox",
- defaultBadge: "Default",
- searchPlaceholder: "Search notebooks",
- noSearchResult: "No notebook found for “{{query}}”",
- noNotebook: "No notebook available",
- },
workspace: {
inboxDeleteTitle: "Inbox cannot be deleted",
inboxDeleteDescription: "Inbox is the default notebook, so new notes always have a home.",
diff --git a/apps/web/src/i18n/resources/zh-CN.ts b/apps/web/src/i18n/resources/zh-CN.ts
index 083d1a39..a69f2732 100644
--- a/apps/web/src/i18n/resources/zh-CN.ts
+++ b/apps/web/src/i18n/resources/zh-CN.ts
@@ -51,15 +51,6 @@ export const zhCN = {
createDisabled: "当前视图不可新建笔记",
creating: "正在创建",
},
- createMemoNotebookPicker: {
- title: "选择笔记本",
- defaultNotebook: "默认:{{name}}",
- defaultFallback: "等待分类",
- defaultBadge: "默认",
- searchPlaceholder: "搜索笔记本",
- noSearchResult: "没有找到「{{query}}」",
- noNotebook: "暂无可用笔记本",
- },
workspace: {
inboxDeleteTitle: "等待分类不能删除",
inboxDeleteDescription: "等待分类是默认笔记本,用来保证新笔记始终有归属。",
diff --git a/apps/web/src/mobile-edit.tsx b/apps/web/src/mobile-edit.tsx
index 1220df08..22dd60f8 100644
--- a/apps/web/src/mobile-edit.tsx
+++ b/apps/web/src/mobile-edit.tsx
@@ -5,7 +5,8 @@ import StarterKit from "@tiptap/starter-kit";
import Image from "@tiptap/extension-image";
import Placeholder from "@tiptap/extension-placeholder";
import { ImagePlus } from "lucide-react";
-import { docToMarkdown, emptyDoc, markdownToDoc, type MemoDetail, type Resource, type TiptapDoc } from "@edgeever/shared";
+import { docToMarkdown, emptyDoc, markdownToDoc, type MemoDetail, type Notebook, type Resource, type TiptapDoc } from "@edgeever/shared";
+import { getNotebookMoveOptions } from "@/lib/app-helpers";
import { compressImageForUpload } from "@/lib/image-compression";
import "./styles/mobile-markdown-editor.css";
@@ -19,6 +20,10 @@ type MemoResponse = {
memo: MemoDetail;
};
+type ListNotebooksResponse = {
+ notebooks: Notebook[];
+};
+
type ResourceResponse = {
resource: Resource;
};
@@ -97,6 +102,8 @@ const MobileTiptapEditorApp = () => {
const draftKey = memoId ? `${DRAFT_STORAGE_PREFIX}${memoId}` : "";
const [memo, setMemo] = useState<MemoDetail | null>(null);
const memoRef = useRef<MemoDetail | null>(null);
+ const [notebooks, setNotebooks] = useState<Notebook[]>([]);
+ const [notebookUpdatePending, setNotebookUpdatePending] = useState(false);
const [title, setTitle] = useState("");
const titleRef = useRef("");
const [tagsText, setTagsText] = useState("");
@@ -105,6 +112,7 @@ const MobileTiptapEditorApp = () => {
const [saveState, setSaveState] = useState<SaveState>("loading");
const saveStateRef = useRef<SaveState>("loading");
const [error, setError] = useState<string | null>(null);
+ const notebookOptions = useMemo(() => getNotebookMoveOptions(notebooks), [notebooks]);
const dirtyRef = useRef(false);
const leavingRef = useRef(false);
const savingRef = useRef(false);
@@ -253,6 +261,7 @@ const MobileTiptapEditorApp = () => {
}),
});
+ memoRef.current = data.memo;
setMemo(data.memo);
lastSavedSnapshotRef.current = currentSnapshot();
dirtyRef.current = false;
@@ -337,6 +346,53 @@ const MobileTiptapEditorApp = () => {
scheduleMetadataSave();
};
+ const handleNotebookChange = async (nextNotebookId: string) => {
+ const currentMemo = memoRef.current;
+ if (!currentMemo || !nextNotebookId || nextNotebookId === currentMemo.notebookId || notebookUpdatePending) {
+ return;
+ }
+
+ setNotebookUpdatePending(true);
+ setSaveStateStable("saving");
+ setError(null);
+
+ try {
+ if (dirtyRef.current) {
+ const saved = await saveNow();
+ if (!saved) {
+ return;
+ }
+ }
+
+ const sourceMemo = memoRef.current;
+ if (!sourceMemo || nextNotebookId === sourceMemo.notebookId) {
+ return;
+ }
+
+ const data = await requestJson<MemoResponse>(`/api/v1/memos/${encodeURIComponent(sourceMemo.id)}`, {
+ method: "PATCH",
+ body: JSON.stringify({
+ expectedRevision: sourceMemo.revision,
+ notebookId: nextNotebookId,
+ }),
+ });
+
+ memoRef.current = data.memo;
+ setMemo(data.memo);
+ setSaveStateStable("saved");
+ window.setTimeout(() => {
+ if (!dirtyRef.current && !savingRef.current && !leavingRef.current) {
+ setSaveStateStable("idle");
+ }
+ }, 1200);
+ } catch (notebookError) {
+ setError(notebookError instanceof Error ? notebookError.message : "切换笔记本失败");
+ setSaveStateStable("error");
+ } finally {
+ setNotebookUpdatePending(false);
+ }
+ };
+
const handleImageUpload = async (file?: File | null) => {
const currentMemo = memoRef.current;
if (!currentMemo || !editor || !file) {
@@ -390,6 +446,26 @@ const MobileTiptapEditorApp = () => {
}, INITIAL_EDITOR_FOCUS_DELAY_MS);
}, [editor]);
+ useEffect(() => {
+ let cancelled = false;
+
+ void requestJson<ListNotebooksResponse>("/api/v1/notebooks")
+ .then((data) => {
+ if (!cancelled) {
+ setNotebooks(data.notebooks);
+ }
+ })
+ .catch(() => {
+ if (!cancelled) {
+ setNotebooks([]);
+ }
+ });
+
+ return () => {
+ cancelled = true;
+ };
+ }, []);
+
useEffect(() => {
if (!memoId || !editor) {
if (!memoId) {
@@ -553,15 +629,34 @@ const MobileTiptapEditorApp = () => {
placeholder={DEFAULT_MEMO_TITLE}
onChange={(event) => handleTitleChange(event.target.value)}
/>
- <input
- className="mobile-editor-tags"
- value={tagsText}
- autoComplete="on"
- autoCorrect="on"
- inputMode="text"
- placeholder="添加标签,用逗号分隔"
- onChange={(event) => handleTagsChange(event.target.value)}
- />
+ <div className="mobile-editor-meta-row">
+ <select
+ className="mobile-editor-notebook-select"
+ value={memo?.notebookId ?? ""}
+ aria-label="所在笔记本"
+ disabled={!memo || notebookUpdatePending || saveState === "loading" || notebookOptions.length === 0}
+ onChange={(event) => void handleNotebookChange(event.target.value)}
+ >
+ {notebookOptions.length === 0 ? (
+ <option value={memo?.notebookId ?? ""}>等待分类</option>
+ ) : (
+ notebookOptions.map((notebook) => (
+ <option key={notebook.id} value={notebook.id}>
+ {notebook.selectLabel}
+ </option>
+ ))
+ )}
+ </select>
+ <input
+ className="mobile-editor-tags"
+ value={tagsText}
+ autoComplete="on"
+ autoCorrect="on"
+ inputMode="text"
+ placeholder="添加标签,用逗号分隔"
+ onChange={(event) => handleTagsChange(event.target.value)}
+ />
+ </div>
<div className="mobile-editor-tool-row">
<button
diff --git a/apps/web/src/styles/mobile-markdown-editor.css b/apps/web/src/styles/mobile-markdown-editor.css
index 090101b3..ec69b6d1 100644
--- a/apps/web/src/styles/mobile-markdown-editor.css
+++ b/apps/web/src/styles/mobile-markdown-editor.css
@@ -24,7 +24,8 @@ body {
}
button,
-input {
+input,
+select {
font: inherit;
}
@@ -124,7 +125,8 @@ input {
}
.mobile-editor-title,
-.mobile-editor-tags {
+.mobile-editor-tags,
+.mobile-editor-notebook-select {
width: 100%;
border: 0;
background: #fff;
@@ -139,12 +141,38 @@ input {
}
.mobile-editor-tags {
+ min-width: 0;
+ flex: 1;
color: #64748b;
font-size: 15px;
line-height: 1.5;
padding: 4px 0;
}
+.mobile-editor-meta-row {
+ display: flex;
+ align-items: center;
+ gap: 10px;
+ min-width: 0;
+}
+
+.mobile-editor-notebook-select {
+ flex: 0 1 auto;
+ max-width: 46%;
+ min-width: 7.5rem;
+ border-radius: 8px;
+ background: #f8fafc;
+ color: #475569;
+ font-size: 15px;
+ font-weight: 650;
+ line-height: 1.5;
+ padding: 5px 26px 5px 8px;
+}
+
+.mobile-editor-notebook-select:disabled {
+ color: #94a3b8;
+}
+
.mobile-editor-title::placeholder,
.mobile-editor-tags::placeholder {
color: #94a3b8;