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
Prevent mobile editor return loop
yoma63234bfa21e7
diff --git a/apps/web/src/components/EditorPane.tsx b/apps/web/src/components/EditorPane.tsxindex dd0cd4d2..fa4c9d54 100644--- a/apps/web/src/components/EditorPane.tsx+++ b/apps/web/src/components/EditorPane.tsx@@ -50,7 +50,7 @@ import { Select, SelectTrigger, SelectValue, SelectContent, SelectItem } from "@import { EditorToolbar } from "./EditorToolbar";import { RevisionHistoryDialog } from "./dialogs/RevisionHistoryDialog";import { api } from "@/lib/api";-import { openStandaloneMobileEditor } from "@/lib/mobile-editor";+import { consumeStandaloneMobileEditorReturn, openStandaloneMobileEditor } from "@/lib/mobile-editor";import { cn, formatDateTime, parseTagsText } from "@/lib/utils";import { docToMarkdown, markdownToDoc, type Notebook, type MemoDetail, type TiptapDoc } from "@edgeever/shared";import { compressImageForUpload } from "@/lib/image-compression";@@ -949,6 +949,13 @@ export const EditorPane = (props: EditorPaneProps) => {useEffect(() => {if (isMobileViewport && mobileDefaultEditRequested && props.memo?.id) {+ if (consumeStandaloneMobileEditorReturn(props.memo.id)) {+ props.onMobileDefaultEditConsumed();+ setMobileNativeEditMemoId(null);+ props.onBackToList();+ return;+ }+if (standaloneOpenMemoIdRef.current === props.memo.id) {return;}@@ -957,7 +964,28 @@ export const EditorPane = (props: EditorPaneProps) => {props.onMobileDefaultEditConsumed();openStandaloneMobileEditor(props.memo.id);}- }, [isMobileViewport, mobileDefaultEditRequested, props.memo?.id, props.onMobileDefaultEditConsumed]);+ }, [isMobileViewport, mobileDefaultEditRequested, props.memo?.id, props.onBackToList, props.onMobileDefaultEditConsumed]);++ useEffect(() => {+ const clearReturnedStandaloneEditor = () => {+ if (!consumeStandaloneMobileEditorReturn(props.memo?.id ?? null)) {+ return;+ }++ props.onMobileDefaultEditConsumed();+ setMobileNativeEditMemoId(null);+ props.onBackToList();+ };++ clearReturnedStandaloneEditor();+ window.addEventListener("pageshow", clearReturnedStandaloneEditor);+ document.addEventListener("visibilitychange", clearReturnedStandaloneEditor);++ return () => {+ window.removeEventListener("pageshow", clearReturnedStandaloneEditor);+ document.removeEventListener("visibilitychange", clearReturnedStandaloneEditor);+ };+ }, [props.memo?.id, props.onBackToList, props.onMobileDefaultEditConsumed]);useEffect(() => {const mediaQuery = window.matchMedia(MOBILE_EDITOR_QUERY);diff --git a/apps/web/src/components/MobileStandaloneTiptapEditor.tsx b/apps/web/src/components/MobileStandaloneTiptapEditor.tsxindex a5705da7..f3b8cb1b 100644--- a/apps/web/src/components/MobileStandaloneTiptapEditor.tsx+++ b/apps/web/src/components/MobileStandaloneTiptapEditor.tsx@@ -14,6 +14,7 @@ import {import { getNotebookMoveOptions } from "@/lib/app-helpers";import { compressImageForUpload } from "@/lib/image-compression";import { localDb, type LocalDraft } from "@/lib/local-db";+import { markStandaloneMobileEditorReturning } from "@/lib/mobile-editor";import {DEFAULT_MOBILE_EDITOR_MEMO_TITLE,MOBILE_EDITOR_AUTO_SAVE_DELAY_MS,@@ -432,13 +433,15 @@ export const MobileStandaloneTiptapEditor = ({}, [persistLocalDraft, saveNow, setSaveStateStable]);const navigateBack = useCallback(() => {+ markStandaloneMobileEditorReturning(memoId);+if (onLeave) {onLeave();return;}window.location.replace(returnTo);- }, [onLeave, returnTo]);+ }, [memoId, onLeave, returnTo]);const leavePage = useCallback(async () => {if (leavingRef.current) {@@ -676,6 +679,7 @@ export const MobileStandaloneTiptapEditor = ({void saveNow({ keepalive: true });}}+ markStandaloneMobileEditorReturning(memoId);};const handleVisibilityChange = () => {if (document.visibilityState === "hidden" && dirtyRef.current) {@@ -683,6 +687,12 @@ export const MobileStandaloneTiptapEditor = ({if (!sendBackgroundSave()) {void saveNow({ keepalive: true });}+ markStandaloneMobileEditorReturning(memoId);+ return;+ }++ if (document.visibilityState === "hidden") {+ markStandaloneMobileEditorReturning(memoId);return;}@@ -740,7 +750,7 @@ export const MobileStandaloneTiptapEditor = ({window.clearTimeout(initialFocusTimerRef.current);}};- }, [currentSnapshot, draftKey, persistLocalDraft, reconcileBackgroundSave, saveNow, sendBackgroundSave, setSaveStateStable]);+ }, [currentSnapshot, draftKey, memoId, persistLocalDraft, reconcileBackgroundSave, saveNow, sendBackgroundSave, setSaveStateStable]);const saveLabel = getMobileEditorSaveLabel(saveState);const statusClassName = getMobileEditorStatusClassName(saveState);diff --git a/apps/web/src/lib/mobile-editor.ts b/apps/web/src/lib/mobile-editor.tsindex a349304a..0e4c02da 100644--- a/apps/web/src/lib/mobile-editor.ts+++ b/apps/web/src/lib/mobile-editor.ts@@ -1,4 +1,6 @@export const STANDALONE_MOBILE_EDITOR_PATH = "/mobile-edit.html";+const STANDALONE_MOBILE_EDITOR_MEMO_KEY = "edgeever-standalone-mobile-editor-memo-id";+const STANDALONE_MOBILE_EDITOR_RETURN_KEY = "edgeever-standalone-mobile-editor-return-memo-id";export const getStandaloneMobileEditorHref = (memoId: string, returnTo = "/") => {const params = new URLSearchParams({@@ -9,5 +11,35 @@ export const getStandaloneMobileEditorHref = (memoId: string, returnTo = "/") =>};export const openStandaloneMobileEditor = (memoId: string, returnTo = "/") => {+ markStandaloneMobileEditorOpened(memoId);window.location.href = getStandaloneMobileEditorHref(memoId, returnTo);};++export const markStandaloneMobileEditorOpened = (memoId: string) => {+ sessionStorage.setItem(STANDALONE_MOBILE_EDITOR_MEMO_KEY, memoId);+ sessionStorage.removeItem(STANDALONE_MOBILE_EDITOR_RETURN_KEY);+};++export const markStandaloneMobileEditorReturning = (memoId: string | null) => {+ if (!memoId) {+ return;+ }++ sessionStorage.setItem(STANDALONE_MOBILE_EDITOR_RETURN_KEY, memoId);+};++export const consumeStandaloneMobileEditorReturn = (memoId: string | null) => {+ if (!memoId) {+ return false;+ }++ const returningMemoId = sessionStorage.getItem(STANDALONE_MOBILE_EDITOR_RETURN_KEY);+ const matched = returningMemoId === memoId;++ if (matched) {+ sessionStorage.removeItem(STANDALONE_MOBILE_EDITOR_RETURN_KEY);+ sessionStorage.removeItem(STANDALONE_MOBILE_EDITOR_MEMO_KEY);+ }++ return matched;+};