AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.
HTML ai-agentcloudflarecloudflare-d1cloudflare-r2cloudflare-workersdockerelectronevernoteevernote-alternativeknowledge-basemcpnote-takingobsidian-alternativeoffline-firstpersonal-knowledge-basepwaself-hostedsqlitetiptapweb-clipper
feat(mobile): change notebook from note view without editing
tianma-if6580bec3b1b3
diff --git a/apps/ios/EdgeEver/Features/Workspace/MemoDetailView.swift b/apps/ios/EdgeEver/Features/Workspace/MemoDetailView.swiftindex 433ce414..1b8e4161 100644--- a/apps/ios/EdgeEver/Features/Workspace/MemoDetailView.swift+++ b/apps/ios/EdgeEver/Features/Workspace/MemoDetailView.swift@@ -45,6 +45,7 @@ struct MemoDetailView: View {@State private var showMoreMenu = false@State private var showNoteIdCopied = false@State private var showAiAssistant = false+ @State private var showNotebookPicker = false@State private var resourceTarget: ResourceTarget?@State private var imagePreview: (source: String, alt: String)?/// TipTap EditorBundle is ~4MB; keep native text visible until first setContent finishes.@@ -276,6 +277,17 @@ struct MemoDetailView: View {}}}+ .sheet(isPresented: $showNotebookPicker) {+ EditNotebookPickerSheet(+ notebooks: availableNotebooks,+ selectedId: memo?.notebookId ?? ""+ ) { notebookId in+ showNotebookPicker = false+ guard let memo else { return }+ Task { await moveMemoToNotebook(memo, notebookId: notebookId) }+ }+ .presentationDetents([.medium, .large])+ }.fullScreenCover(isPresented: Binding(get: { imagePreview != nil },set: { if !$0 { imagePreview = nil } }@@ -395,6 +407,7 @@ struct MemoDetailView: View {searchQuery = ""searchMatchCount = 0searchMatchIndex = 0+ showNotebookPicker = falseload()refreshSyncStatus()}@@ -641,18 +654,7 @@ struct MemoDetailView: View {.edgeEverSuccessShine(trigger: pinPulse)HStack(spacing: 8) {- HStack(spacing: 4) {- Text(notebookName(for: memo))- .font(.system(size: 14))- .foregroundStyle(AppTheme.secondary)- .lineLimit(1)- Image(systemName: "chevron.down")- .font(.system(size: 11, weight: .semibold))- .foregroundStyle(AppTheme.muted)- }- .frame(maxWidth: .infinity, alignment: .leading)- .layoutPriority(0)- .accessibilityIdentifier(DetailMemoChrome.notebook)+ notebookAffiliationControl(memo)HStack(spacing: 8) {Image(systemName: "tag")@@ -823,12 +825,47 @@ struct MemoDetailView: View {env.preferences.isEnglish ? syncStatus.labelEN : syncStatus.labelZH}+ private var availableNotebooks: [Notebook] {+ (try? env.mirror.listNotebooks(scope: env.session.dataScope ?? "")) ?? []+ }+private func notebookName(for memo: MemoDetail) -> String {- let notebooks = (try? env.mirror.listNotebooks(scope: env.session.dataScope ?? "")) ?? []- return notebooks.first(where: { $0.id == memo.notebookId })?.name+ availableNotebooks.first(where: { $0.id == memo.notebookId })?.name?? env.preferences.t("笔记本", en: "Notebook")}+ private func notebookAffiliationLabel(_ memo: MemoDetail) -> some View {+ HStack(spacing: 4) {+ Text(notebookName(for: memo))+ .font(.system(size: 14))+ .foregroundStyle(AppTheme.secondary)+ .lineLimit(1)+ Image(systemName: "chevron.down")+ .font(.system(size: 11, weight: .semibold))+ .foregroundStyle(AppTheme.muted)+ }+ .frame(maxWidth: .infinity, alignment: .leading)+ .layoutPriority(0)+ }++ @ViewBuilder+ private func notebookAffiliationControl(_ memo: MemoDetail) -> some View {+ if memo.isDeleted {+ notebookAffiliationLabel(memo)+ .accessibilityIdentifier(DetailMemoChrome.notebook)+ } else {+ Button {+ showNotebookPicker = true+ } label: {+ notebookAffiliationLabel(memo)+ }+ .buttonStyle(.plain)+ .accessibilityLabel(env.preferences.t("所在笔记本", en: "Notebook"))+ .accessibilityHint(env.preferences.t("更改笔记所属笔记本", en: "Change the notebook for this note"))+ .accessibilityIdentifier(DetailMemoChrome.notebook)+ }+ }+private func handleSyncStatusPress() {switch syncStatus {case .conflict:@@ -937,6 +974,40 @@ struct MemoDetailView: View {return title.isEmpty ? env.preferences.t("无标题笔记", en: "Untitled note") : title}+ private func moveMemoToNotebook(_ memo: MemoDetail, notebookId: String) async {+ guard !memo.isDeleted else { return }+ guard !notebookId.isEmpty, notebookId != memo.notebookId else { return }+ guard let scope = env.session.dataScope else { return }+ let revision = memo.revision+ let contentHash = memo.contentHash+ var updated = memo+ updated.notebookId = notebookId+ updated.updatedAt = EdgeEverDate.nowString()+ do {+ try env.mirror.upsertMemo(scope: scope, memo: updated)+ self.memo = updated+ try env.outbox.enqueueUpdate(+ scope: scope,+ payload: MemoUpdatePayload(+ memoId: updated.id,+ expectedRevision: revision,+ expectedContentHash: contentHash,+ title: updated.title ?? "",+ contentMarkdown: updated.contentMarkdown,+ contentJson: try? updated.contentJson.jsonString(),+ notebookId: notebookId,+ tags: updated.tags+ )+ )+ await env.runSyncCycle()+ load()+ refreshSyncStatus()+ } catch {+ self.error = error.localizedDescription+ load()+ }+ }+private func togglePin(_ memo: MemoDetail) async {guard let scope = env.session.dataScope else { return }do {diff --git a/apps/ios/EdgeEver/Features/Workspace/MemoEditView.swift b/apps/ios/EdgeEver/Features/Workspace/MemoEditView.swiftindex b7de7d12..3928c686 100644--- a/apps/ios/EdgeEver/Features/Workspace/MemoEditView.swift+++ b/apps/ios/EdgeEver/Features/Workspace/MemoEditView.swift@@ -1536,7 +1536,7 @@ struct MemoTagPickerSheet: View {// MARK: - Compact notebook picker for create/edit-private struct EditNotebookPickerSheet: View {+struct EditNotebookPickerSheet: View {@Environment(AppEnvironment.self) private var env@Environment(\.dismiss) private var dismisslet notebooks: [Notebook]diff --git a/apps/ios/Tests/EdgeEverTests/ChromeParityTests.swift b/apps/ios/Tests/EdgeEverTests/ChromeParityTests.swiftindex 6e26699c..5b55e9a6 100644--- a/apps/ios/Tests/EdgeEverTests/ChromeParityTests.swift+++ b/apps/ios/Tests/EdgeEverTests/ChromeParityTests.swift@@ -149,6 +149,9 @@ final class ChromeParityTests: XCTestCase {XCTAssertTrue(src.contains("DetailMemoChrome.history"), "missing history action")XCTAssertTrue(src.contains("DetailMemoChrome.metaRow"), "missing meta row")XCTAssertTrue(src.contains("DetailMemoChrome.title"), "missing detail title")+ XCTAssertTrue(src.contains("showNotebookPicker"), "view-mode notebook affiliation must be tappable")+ XCTAssertTrue(src.contains("moveMemoToNotebook"), "view-mode notebook change must persist without entering edit")+ XCTAssertTrue(src.contains("EditNotebookPickerSheet"), "view-mode notebook picker must reuse the editor sheet")XCTAssertTrue(src.contains("TipTapWebView"), "viewer wiring must remain")// Edit is requested via callback; presentation is owned by WorkspaceView (reliable).XCTAssertTrue(src.contains("onEdit"), "detail requests edit via onEdit callback")diff --git a/apps/mobile/src/screens/WorkspaceEditors.tsx b/apps/mobile/src/screens/WorkspaceEditors.tsxindex 182b9ba3..2c7fb77a 100644--- a/apps/mobile/src/screens/WorkspaceEditors.tsx+++ b/apps/mobile/src/screens/WorkspaceEditors.tsx@@ -759,9 +759,14 @@ export const CreateMemoModal = ({</View><NotebookPickerModalactiveNotebookId={targetNotebookId}+ includeAllNotes={false}notebooks={notebooks}onClose={() => setNotebookPickerOpen(false)}onSelect={(nextNotebookId) => {+ if (!nextNotebookId || nextNotebookId === "all") {+ setNotebookPickerOpen(false);+ return;+ }setNotebookId(nextNotebookId);setNotebookPickerOpen(false);markDirty();@@ -1214,9 +1219,14 @@ export const RichEditorModal = ({)}<NotebookPickerModalactiveNotebookId={notebookId}+ includeAllNotes={false}notebooks={notebooks}onClose={() => setNotebookPickerOpen(false)}onSelect={(nextNotebookId) => {+ if (!nextNotebookId || nextNotebookId === "all") {+ setNotebookPickerOpen(false);+ return;+ }setNotebookId(nextNotebookId);setNotebookPickerOpen(false);dirtyRef.current = true;diff --git a/apps/mobile/src/screens/WorkspaceMemoDetail.tsx b/apps/mobile/src/screens/WorkspaceMemoDetail.tsxindex 1bb08a0e..d803e3ec 100644--- a/apps/mobile/src/screens/WorkspaceMemoDetail.tsx+++ b/apps/mobile/src/screens/WorkspaceMemoDetail.tsx@@ -499,6 +499,7 @@ export const MemoDetailModal = ({const [imageShareTags, setImageShareTags] = useState(false);const [imageShareUpdatedAt, setImageShareUpdatedAt] = useState(true);const [imageShareBranding, setImageShareBranding] = useState(true);+ const [viewerNotebookPickerOpen, setViewerNotebookPickerOpen] = useState(false);const [preparedNoteImage, setPreparedNoteImage] = useState<MobilePreparedNoteImage | null>(null);const viewerRef = useRef<LocalTiptapEditorRef>(null);const imageExportIntentRef = useRef<"preview" | "share">("share");@@ -566,6 +567,20 @@ export const MemoDetailModal = ({throw error;}}, [baseUrl, client, resolvedLocale, session?.token]);+ const handleViewerNotebookSelect = useCallback((nextNotebookId: string) => {+ setViewerNotebookPickerOpen(false);+ if (+ !memo+ || memo.isDeleted+ || !nextNotebookId+ || nextNotebookId === "all"+ || nextNotebookId === memo.notebookId+ ) {+ return;+ }+ updateMutation.mutate({ memo, payload: { notebookId: nextNotebookId } });+ }, [memo, updateMutation]);+const saveResourceAs = useCallback(async (target: MobileResourceTarget) => {if (!client) throw new Error(resolvedLocale !== "zh-CN" ? "The resource client is unavailable." : "当前无法读取资源。");const result = await saveMobileResourceAs(client, target, { baseUrl, token: session?.token });@@ -668,6 +683,7 @@ export const MemoDetailModal = ({setActiveMatchIndex(0);setImagePreview(null);setAiAssistantOpen(false);+ setViewerNotebookPickerOpen(false);safeDomCall(() => viewerRef.current?.search("", -1));}, [isEditing]);@@ -680,6 +696,7 @@ export const MemoDetailModal = ({setActiveMatchIndex(0);setImagePreview(null);setResourceTarget(null);+ setViewerNotebookPickerOpen(false);resourceDataUrlCacheRef.current.clear();}, [initialSearchQuery, memo?.id]);@@ -1124,10 +1141,24 @@ export const MemoDetailModal = ({/>)}<View style={styles.detailMetaRow}>+ {memo.isDeleted ? (<View style={styles.detailNotebookButton}><Text numberOfLines={1} selectable style={styles.detailNotebookName}>{notebookName}</Text><ChevronDown color="#94a3b8" size={14} /></View>+ ) : (+ <Pressable+ accessibilityHint="更改笔记所属笔记本"+ accessibilityLabel="所在笔记本"+ accessibilityRole="button"+ disabled={isSaving}+ onPress={() => setViewerNotebookPickerOpen(true)}+ style={styles.detailNotebookButton}+ >+ <Text numberOfLines={1} style={styles.detailNotebookName}>{notebookName}</Text>+ <ChevronDown color="#94a3b8" size={14} />+ </Pressable>+ )}<View style={styles.detailTagsGroup}><Tag color="#64748b" size={16} /><HighlightedMetadataText@@ -1570,9 +1601,14 @@ export const MemoDetailModal = ({<><NotebookPickerModalactiveNotebookId={editor.notebookId}+ includeAllNotes={false}notebooks={notebooks}onClose={() => editor.setNotebookPickerOpen(false)}onSelect={(nextNotebookId) => {+ if (!nextNotebookId || nextNotebookId === "all") {+ editor.setNotebookPickerOpen(false);+ return;+ }editor.setNotebookId(nextNotebookId);editor.setNotebookPickerOpen(false);editor.markDirty();@@ -1591,7 +1627,16 @@ export const MemoDetailModal = ({/>{editor.uploadSourcePicker}</>- ) : null}+ ) : (+ <NotebookPickerModal+ activeNotebookId={memo?.notebookId ?? ""}+ includeAllNotes={false}+ notebooks={notebooks}+ onClose={() => setViewerNotebookPickerOpen(false)}+ onSelect={handleViewerNotebookSelect}+ visible={viewerNotebookPickerOpen}+ />+ )}</SafeAreaView>) : null}</Modal>diff --git a/apps/mobile/src/screens/WorkspacePickers.tsx b/apps/mobile/src/screens/WorkspacePickers.tsxindex 3b20c1a2..9676ca49 100644--- a/apps/mobile/src/screens/WorkspacePickers.tsx+++ b/apps/mobile/src/screens/WorkspacePickers.tsx@@ -86,12 +86,14 @@ const useAutoCenterSelectedScrollRow = (visible: boolean, selectedKey: string) =export const NotebookPickerModal = ({activeNotebookId,+ includeAllNotes = true,notebooks,onClose,onSelect,visible,}: {activeNotebookId: string;+ includeAllNotes?: boolean;notebooks: Notebook[];onClose: () => void;onSelect: (notebookId: string) => void;@@ -179,6 +181,7 @@ export const NotebookPickerModal = ({) : null}</View>+ {includeAllNotes ? (<PressableaccessibilityLabel={activeNotebookId === ALL_NOTES_ID ? "当前:全部笔记" : "切换到全部笔记"}accessibilityRole="button"@@ -194,6 +197,7 @@ export const NotebookPickerModal = ({</View>{activeNotebookId === ALL_NOTES_ID ? <Check color="#0f172a" size={18} /> : null}</Pressable>+ ) : null}<View style={styles.notebookPickerSectionHeader}><Text style={styles.label}>{searchQuery ? "匹配的笔记本" : "笔记本"}</Text>diff --git a/tests/mobile-app-scope.test.ts b/tests/mobile-app-scope.test.tsindex f1c3d84d..dc466411 100644--- a/tests/mobile-app-scope.test.ts+++ b/tests/mobile-app-scope.test.ts@@ -25,6 +25,14 @@ const iosWorkspaceViewSource = readFileSync(new URL("../apps/ios/EdgeEver/Features/Workspace/WorkspaceView.swift", import.meta.url),"utf8");+const iosMemoDetailSource = readFileSync(+ new URL("../apps/ios/EdgeEver/Features/Workspace/MemoDetailView.swift", import.meta.url),+ "utf8"+);+const mobilePickersSource = readFileSync(+ new URL("../apps/mobile/src/screens/WorkspacePickers.tsx", import.meta.url),+ "utf8"+);const mobileTagsSource = readFileSync(new URL("../apps/mobile/src/lib/mobile-tags.ts", import.meta.url),"utf8"@@ -196,6 +204,19 @@ describe("mobile app scope", () => {expect(localTiptapEditorSource).not.toContain('import "mermaid/dist/mermaid.min.js"');});+ test("lets view-mode change the note notebook without entering the editor", () => {+ expect(memoDetailSource).toContain('setViewerNotebookPickerOpen(true)');+ expect(memoDetailSource).toContain("payload: { notebookId: nextNotebookId }");+ expect(memoDetailSource).toContain("includeAllNotes={false}");+ expect(memoDetailSource).toContain('accessibilityLabel="所在笔记本"');+ expect(memoDetailSource).toContain("handleViewerNotebookSelect");+ expect(mobilePickersSource).toContain("includeAllNotes = true");+ expect(iosMemoDetailSource).toContain("showNotebookPicker = true");+ expect(iosMemoDetailSource).toContain("moveMemoToNotebook");+ expect(iosMemoDetailSource).toContain("EditNotebookPickerSheet");+ expect(iosMemoDetailSource).toContain("notebookAffiliationControl");+ });+test("declares iOS privacy strings and full-screen phone-on-iPad presentation", () => {const infoPlist = appJson.expo.ios?.infoPlist ?? {};expect(appJson.expo.ios?.supportsTablet).toBe(false);