Skip to content

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

feat: add markdown source editor mode

yoma4d0e48e15878
diff --git a/apps/web/src/components/EditorPane.tsx b/apps/web/src/components/EditorPane.tsx
index a501cd6a..43834698 100644
--- a/apps/web/src/components/EditorPane.tsx
+++ b/apps/web/src/components/EditorPane.tsx
@@ -1104,6 +1104,8 @@ const RichEditorPane = ({
);
const [isMobileEditing, setIsMobileEditing] = useState(false);
const [mobilePlainText, setMobilePlainText] = useState("");
+ const [markdownSource, setMarkdownSource] = useState("");
+ const [isMarkdownMode, setIsMarkdownMode] = useState(false);
const [mobileToolbarOpen, setMobileToolbarOpen] = useState(false);
const [mobileImeDebugOpen, setMobileImeDebugOpen] = useState(false);
const [mobileImeDebugActiveElement, setMobileImeDebugActiveElement] = useState(getActiveElementLabel);
@@ -1114,6 +1116,7 @@ const RichEditorPane = ({
const mobileEditingActive = isMobileEditing || mobileDefaultEditRequested;
const effectiveReadOnly = readOnly || (isMobileViewport && !mobileEditingActive);
const useMobilePlainTextEditor = isMobileViewport && mobileEditingActive && !readOnly;
+ const useMarkdownSourceEditor = !useMobilePlainTextEditor && isMarkdownMode;
const memoRef = useRef<MemoDetail | null>(memo);
const editSessionRef = useRef<MemoEditSession | null>(null);
@@ -1543,11 +1546,15 @@ const RichEditorPane = ({
memoId: currentMemo.id,
title: nextTitle,
tagsText: nextTagsText,
- contentJson: useMobilePlainTextEditor ? markdownToDoc(nextMobilePlainText) : (currentEditor?.getJSON() as TiptapDoc),
+ contentJson: useMobilePlainTextEditor
+ ? markdownToDoc(nextMobilePlainText)
+ : useMarkdownSourceEditor
+ ? markdownToDoc(markdownSource)
+ : (currentEditor?.getJSON() as TiptapDoc),
updatedAt: new Date().toISOString(),
});
},
- [getMobilePlainTextValue, tagsText, title, useMobilePlainTextEditor]
+ [getMobilePlainTextValue, markdownSource, tagsText, title, useMarkdownSourceEditor, useMobilePlainTextEditor]
);
const markDirty = useCallback(() => {
@@ -1572,13 +1579,17 @@ const RichEditorPane = ({
return markdownToDoc(getMobilePlainTextValue());
}
+ if (useMarkdownSourceEditor) {
+ return markdownToDoc(markdownSource);
+ }
+
const currentEditor = editorRef.current;
if (!isEditorReady(currentEditor)) {
return null;
}
return currentEditor.getJSON() as TiptapDoc;
- }, [getMobilePlainTextValue, useMobilePlainTextEditor]);
+ }, [getMobilePlainTextValue, markdownSource, useMarkdownSourceEditor, useMobilePlainTextEditor]);
const currentSnapshot = useCallback(() => {
const contentJson = getCurrentContentJson();
@@ -1607,6 +1618,8 @@ const RichEditorPane = ({
setTitle("");
setTagsText("");
setMobilePlainText("");
+ setMarkdownSource("");
+ setIsMarkdownMode(false);
setMobilePlainTextElementValue(mobileTextAreaRef.current, "");
setSaveState("idle");
if (isEditorReady(currentEditor)) {
@@ -1656,6 +1669,7 @@ const RichEditorPane = ({
setTitle(nextTitle);
setTagsText(nextTagsText);
setMobilePlainText(nextMarkdown);
+ setMarkdownSource(nextMarkdown);
setMobilePlainTextElementValue(mobileTextAreaRef.current, nextMarkdown);
if (isEditorReady(currentEditor)) {
@@ -1719,6 +1733,30 @@ const RichEditorPane = ({
};
}, [editor, markDirty, memo, persistCurrentDraft]);
+ const handleMarkdownModeChange = useCallback(() => {
+ if (effectiveReadOnly || !isEditorReady(editor)) {
+ return;
+ }
+
+ if (isMarkdownMode) {
+ hydratingRef.current = true;
+ editor.commands.setContent(markdownToDoc(markdownSource));
+ setIsMarkdownMode(false);
+ window.setTimeout(() => {
+ hydratingRef.current = false;
+ }, 0);
+ return;
+ }
+
+ setMarkdownSource(docToMarkdown(editor.getJSON() as TiptapDoc));
+ setIsMarkdownMode(true);
+ }, [editor, effectiveReadOnly, isMarkdownMode, markdownSource]);
+
+ const handleMarkdownSourceChange = useCallback((value: string) => {
+ setMarkdownSource(value);
+ markDirty();
+ }, [markDirty]);
+
useEffect(() => {
if (!useMobilePlainTextEditor) {
return;
@@ -1770,6 +1808,7 @@ const RichEditorPane = ({
editSessionId: editSession.id,
title,
contentJson,
+ contentMarkdown: useMarkdownSourceEditor ? markdownSource : undefined,
tags: parseTagsText(tagsText),
};
let data;
@@ -1781,6 +1820,7 @@ const RichEditorPane = ({
editSessionId: payload.editSessionId,
title: payload.title,
contentJson: payload.contentJson,
+ contentMarkdown: payload.contentMarkdown,
tags: payload.tags,
});
} catch (error) {
@@ -2570,7 +2610,14 @@ const RichEditorPane = ({
</Button>
</div>
)}
- {(!isMobileViewport || (mobileToolbarOpen && !useMobilePlainTextEditor)) && <EditorToolbar editor={editor} readOnly={effectiveReadOnly} />}
+ {(!isMobileViewport || (mobileToolbarOpen && !useMobilePlainTextEditor)) && (
+ <EditorToolbar
+ editor={editor}
+ readOnly={effectiveReadOnly}
+ markdownMode={useMarkdownSourceEditor}
+ onMarkdownModeChange={handleMarkdownModeChange}
+ />
+ )}
</header>
<div
@@ -2616,6 +2663,16 @@ const RichEditorPane = ({
</button>
</div>
</>
+ ) : useMarkdownSourceEditor ? (
+ <textarea
+ value={markdownSource}
+ onChange={(event) => handleMarkdownSourceChange(event.target.value)}
+ readOnly={effectiveReadOnly}
+ spellCheck={false}
+ aria-label="Markdown 源码"
+ className="block min-h-[300px] h-full w-full resize-none border-0 bg-slate-950 px-4 py-3 font-mono text-sm leading-6 text-slate-100 outline-none placeholder:text-slate-500 sm:px-7"
+ placeholder="# 开始记录"
+ />
) : (
<EditorContent editor={editor} />
)}
diff --git a/apps/web/src/components/EditorToolbar.tsx b/apps/web/src/components/EditorToolbar.tsx
index f9701a8a..9eaa4681 100644
--- a/apps/web/src/components/EditorToolbar.tsx
+++ b/apps/web/src/components/EditorToolbar.tsx
@@ -98,7 +98,17 @@ const toggleCodeBlock = (editor: Editor) => {
.run();
};
-export const EditorToolbar = ({ editor, readOnly }: { editor: Editor | null; readOnly: boolean }) => {
+export const EditorToolbar = ({
+ editor,
+ readOnly,
+ markdownMode = false,
+ onMarkdownModeChange,
+}: {
+ editor: Editor | null;
+ readOnly: boolean;
+ markdownMode?: boolean;
+ onMarkdownModeChange?: () => void;
+}) => {
const { t } = useTranslation();
const editorReady = isToolbarEditorReady(editor);
const disabled = readOnly || !editorReady;
@@ -179,6 +189,32 @@ export const EditorToolbar = ({ editor, readOnly }: { editor: Editor | null; rea
role="toolbar"
aria-label={t("editorToolbar.toolbar")}
>
+ {onMarkdownModeChange && (
+ <>
+ <button
+ className={cn(
+ "flex h-8 shrink-0 items-center rounded-md border px-2.5 text-xs font-medium transition disabled:pointer-events-none disabled:opacity-40",
+ markdownMode
+ ? "border-emerald-200 bg-emerald-50 text-emerald-800"
+ : "border-slate-200 bg-white text-slate-700 hover:bg-slate-50"
+ )}
+ type="button"
+ title={markdownMode ? t("editorToolbar.richText") : t("editorToolbar.markdown")}
+ aria-label={markdownMode ? t("editorToolbar.richText") : t("editorToolbar.markdown")}
+ aria-pressed={markdownMode}
+ disabled={readOnly}
+ onMouseDown={(event) => event.preventDefault()}
+ onClick={onMarkdownModeChange}
+ >
+ {markdownMode ? t("editorToolbar.switchToRichText") : t("editorToolbar.switchToMarkdown")}
+ </button>
+ <ToolbarDivider />
+ </>
+ )}
+ {markdownMode ? (
+ <span className="shrink-0 text-xs text-slate-500">{t("editorToolbar.markdownSource")}</span>
+ ) : (
+ <>
<Select
value={blockValue}
disabled={disabled}
@@ -308,6 +344,8 @@ export const EditorToolbar = ({ editor, readOnly }: { editor: Editor | null; rea
>
<Minus className="h-4 w-4" />
</EditorToolbarButton>
+ </>
+ )}
</div>
</div>
</TooltipProvider>
diff --git a/apps/web/src/i18n/resources/en-US.ts b/apps/web/src/i18n/resources/en-US.ts
index f6f8d500..e6dd8ce9 100644
--- a/apps/web/src/i18n/resources/en-US.ts
+++ b/apps/web/src/i18n/resources/en-US.ts
@@ -458,6 +458,11 @@ export const enUS = {
codeLanguage: "Code language",
plainText: "Plain text",
horizontalRule: "Divider",
+ markdown: "Switch to Markdown source",
+ richText: "Switch to rich text",
+ markdownSource: "Markdown source",
+ switchToMarkdown: "Switch to Markdown mode",
+ switchToRichText: "Switch to rich text mode",
},
mobileNotebookPicker: {
title: "Switch notebook",
diff --git a/apps/web/src/i18n/resources/zh-CN.ts b/apps/web/src/i18n/resources/zh-CN.ts
index 70b7c10c..0f90d0cc 100644
--- a/apps/web/src/i18n/resources/zh-CN.ts
+++ b/apps/web/src/i18n/resources/zh-CN.ts
@@ -458,6 +458,11 @@ export const zhCN = {
codeLanguage: "代码语言",
plainText: "纯文本",
horizontalRule: "分割线",
+ markdown: "切换到 Markdown 源码",
+ richText: "切换到富文本编辑",
+ markdownSource: "Markdown 源码",
+ switchToMarkdown: "切换到 Markdown 模式",
+ switchToRichText: "切换到富文本模式",
},
mobileNotebookPicker: {
title: "切换笔记本",
diff --git a/apps/web/src/lib/local-db.ts b/apps/web/src/lib/local-db.ts
index 92da3bea..e059d32f 100644
--- a/apps/web/src/lib/local-db.ts
+++ b/apps/web/src/lib/local-db.ts
@@ -17,6 +17,7 @@ export type MemoUpdateSyncPayload = {
editSessionId: string;
title: string;
contentJson: TiptapDoc;
+ contentMarkdown?: string;
tags: string[];
};
diff --git a/apps/web/src/lib/sync-queue.ts b/apps/web/src/lib/sync-queue.ts
index 7fa48c63..d83b2f95 100644
--- a/apps/web/src/lib/sync-queue.ts
+++ b/apps/web/src/lib/sync-queue.ts
@@ -142,6 +142,7 @@ const syncQueueItem = async (item: SyncQueueItem): Promise<MemoDetail> => {
editSessionId: editSession.id,
title: item.payload.title,
contentJson: item.payload.contentJson as TiptapDoc,
+ contentMarkdown: item.payload.contentMarkdown,
tags: item.payload.tags,
});