From 507910b0ce4be20c75c4405a2250369fe63fceee Mon Sep 17 00:00:00 2001
From: SiriusXT <1160925501@qq.com>
Date: Tue, 28 Oct 2025 10:17:37 +0800
Subject: [PATCH 1/3] fix: import markdown to text note

---
 apps/client/src/components/app_context.ts     |  3 +-
 apps/client/src/services/glob.ts              |  3 --
 apps/client/src/types.d.ts                    |  1 -
 .../src/widgets/dialogs/markdown_import.tsx   | 38 +++++++------------
 .../src/widgets/type_widgets/editable_text.ts | 28 ++++++++++++++
 packages/ckeditor5/src/augmentation.ts        |  1 -
 .../ckeditor5/src/plugins/markdownimport.ts   |  5 ++-
 7 files changed, 47 insertions(+), 32 deletions(-)

diff --git a/apps/client/src/components/app_context.ts b/apps/client/src/components/app_context.ts
index ce33d1447..f52f2e498 100644
--- a/apps/client/src/components/app_context.ts
+++ b/apps/client/src/components/app_context.ts
@@ -218,7 +218,6 @@ export type CommandMappings = {
     /** Works only in the electron context menu. */
     replaceMisspelling: CommandData;
 
-    importMarkdownInline: CommandData;
     showPasswordNotSet: CommandData;
     showProtectedSessionPasswordDialog: CommandData;
     showUploadAttachmentsDialog: CommandData & { noteId: string };
@@ -306,7 +305,7 @@ export type CommandMappings = {
     addLinkToText: CommandData;
     followLinkUnderCursor: CommandData;
     insertDateTimeToText: CommandData;
-    pasteMarkdownIntoText: CommandData;
+    showMarkdownIntoTextDialog: CommandData & { textTypeWidget: EditableTextTypeWidget };
     cutIntoNote: CommandData;
     addIncludeNoteToText: CommandData;
     editReadOnlyNote: CommandData;
diff --git a/apps/client/src/services/glob.ts b/apps/client/src/services/glob.ts
index 48d0d29a7..44ce64309 100644
--- a/apps/client/src/services/glob.ts
+++ b/apps/client/src/services/glob.ts
@@ -20,9 +20,6 @@ function setupGlobs() {
     window.glob.froca = froca;
     window.glob.treeCache = froca; // compatibility for CKEditor builds for a while
 
-    // for CKEditor integration (button on block toolbar)
-    window.glob.importMarkdownInline = async () => appContext.triggerCommand("importMarkdownInline");
-
     window.onerror = function (msg, url, lineNo, columnNo, error) {
         const string = String(msg).toLowerCase();
 
diff --git a/apps/client/src/types.d.ts b/apps/client/src/types.d.ts
index c5a93bd0a..d283983b4 100644
--- a/apps/client/src/types.d.ts
+++ b/apps/client/src/types.d.ts
@@ -26,7 +26,6 @@ interface CustomGlobals {
     appContext: AppContext;
     froca: Froca;
     treeCache: Froca;
-    importMarkdownInline: () => Promise<unknown>;
     SEARCH_HELP_TEXT: string;
     activeDialog: JQuery<HTMLElement> | null;
     componentId: string;
diff --git a/apps/client/src/widgets/dialogs/markdown_import.tsx b/apps/client/src/widgets/dialogs/markdown_import.tsx
index d14d6fb11..5676d7298 100644
--- a/apps/client/src/widgets/dialogs/markdown_import.tsx
+++ b/apps/client/src/widgets/dialogs/markdown_import.tsx
@@ -7,6 +7,7 @@ import utils from "../../services/utils";
 import Modal from "../react/Modal";
 import Button from "../react/Button";
 import { useTriliumEvent } from "../react/hooks";
+import EditableTextTypeWidget from "../type_widgets/editable_text";
 
 interface RenderMarkdownResponse {
     htmlContent: string;
@@ -14,29 +15,27 @@ interface RenderMarkdownResponse {
 
 export default function MarkdownImportDialog() {
     const markdownImportTextArea = useRef<HTMLTextAreaElement>(null);
+    const [textTypeWidget, setTextTypeWidget] = useState<EditableTextTypeWidget>();
     const [ text, setText ] = useState("");
     const [ shown, setShown ] = useState(false);
 
-    const triggerImport = useCallback(() => {
-        if (appContext.tabManager.getActiveContextNoteType() !== "text") {
-            return;
-        }
-    
+    useTriliumEvent("showMarkdownIntoTextDialog", ({ textTypeWidget }) => {
+        setTextTypeWidget(textTypeWidget);
         if (utils.isElectron()) {
             const { clipboard } = utils.dynamicRequire("electron");
             const text = clipboard.readText();
     
-            convertMarkdownToHtml(text);
+            convertMarkdownToHtml(text, textTypeWidget);
         } else {
             setShown(true);
         }
-    }, []);
-
-    useTriliumEvent("importMarkdownInline", triggerImport);
-    useTriliumEvent("pasteMarkdownIntoText", triggerImport);
+    });
 
     async function sendForm() {
-        await convertMarkdownToHtml(text);
+        if (textTypeWidget) {
+            await convertMarkdownToHtml(text, textTypeWidget);
+        }
+        
         setText("");
         setShown(false);
     }
@@ -44,7 +43,7 @@ export default function MarkdownImportDialog() {
     return (
         <Modal
             className="markdown-import-dialog" title={t("markdown_import.dialog_title")} size="lg"
-            footer={<Button className="markdown-import-button" text={t("markdown_import.import_button")} onClick={sendForm} keyboardShortcut="Ctrl+Space" />}
+            footer={<Button className="markdown-import-button" text={t("markdown_import.import_button")} onClick={sendForm} keyboardShortcut="Ctrl+Enter" />}
             onShown={() => markdownImportTextArea.current?.focus()}
             onHidden={() => setShown(false) }
             show={shown}
@@ -63,19 +62,10 @@ export default function MarkdownImportDialog() {
     )
 }
 
-async function convertMarkdownToHtml(markdownContent: string) {
+async function convertMarkdownToHtml(markdownContent: string, textTypeWidget: EditableTextTypeWidget) {
     const { htmlContent } = await server.post<RenderMarkdownResponse>("other/render-markdown", { markdownContent });
 
-    const textEditor = await appContext.tabManager.getActiveContext()?.getTextEditor();
-    if (!textEditor) {
-        return;
-    }
-
-    const viewFragment = textEditor.data.processor.toView(htmlContent);
-    const modelFragment = textEditor.data.toModel(viewFragment);
-
-    textEditor.model.insertContent(modelFragment, textEditor.model.document.selection);
-    textEditor.editing.view.focus();
-
+    await textTypeWidget.addHtmlToEditor(htmlContent);
+    
     toast.showMessage(t("markdown_import.import_success"));
 }
\ No newline at end of file
diff --git a/apps/client/src/widgets/type_widgets/editable_text.ts b/apps/client/src/widgets/type_widgets/editable_text.ts
index 8a2103c1b..ee76a107c 100644
--- a/apps/client/src/widgets/type_widgets/editable_text.ts
+++ b/apps/client/src/widgets/type_widgets/editable_text.ts
@@ -329,6 +329,30 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget {
         });
     }
 
+    async addHtmlToEditor(html: string) {
+        await this.initialized;
+
+        const editor = this.watchdog.editor;
+        if (!editor) return;
+
+        editor.model.change((writer) => {
+            const viewFragment = editor.data.processor.toView(html); 
+            const modelFragment = editor.data.toModel(viewFragment); 
+            const insertPosition = editor.model.document.selection.getLastPosition();
+
+            if (insertPosition) {
+                const range = editor.model.insertContent(modelFragment, insertPosition);
+
+                if (range) {
+                    writer.setSelection(range.end);
+                }
+            }
+            
+        });
+        
+        editor.editing.view.focus();
+    }
+
     addTextToActiveEditorEvent({ text }: EventData<"addTextToActiveEditor">) {
         if (!this.isActive()) {
             return;
@@ -385,6 +409,10 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget {
         this.triggerCommand("showAddLinkDialog", { textTypeWidget: this, text: selectedText });
     }
 
+    pasteMarkdownIntoTextCommand() {
+        this.triggerCommand("showMarkdownIntoTextDialog", { textTypeWidget: this });
+    }
+
     getSelectedText() {
         const range = this.watchdog.editor?.model.document.selection.getFirstRange();
         let text = "";
diff --git a/packages/ckeditor5/src/augmentation.ts b/packages/ckeditor5/src/augmentation.ts
index c1018db37..6f05b9f2a 100644
--- a/packages/ckeditor5/src/augmentation.ts
+++ b/packages/ckeditor5/src/augmentation.ts
@@ -19,6 +19,5 @@ declare global {
         getHeaders(): Promise<Record<string, string>>;
         getReferenceLinkTitle(href: string): Promise<string>;
         getReferenceLinkTitleSync(href: string): string;
-        importMarkdownInline(): void;
     }
 }
diff --git a/packages/ckeditor5/src/plugins/markdownimport.ts b/packages/ckeditor5/src/plugins/markdownimport.ts
index c00b9f7f6..02f208e1d 100644
--- a/packages/ckeditor5/src/plugins/markdownimport.ts
+++ b/packages/ckeditor5/src/plugins/markdownimport.ts
@@ -31,7 +31,10 @@ export default class MarkdownImportPlugin extends Plugin {
 class ImportMarkdownCommand extends Command {
 
     execute() {
-        glob.importMarkdownInline();
+		const editorEl = this.editor.editing.view.getDomRoot();
+		const component = glob.getComponentByEl(editorEl);
+
+		component.triggerCommand('pasteMarkdownIntoText');
     }
 
 }

From 5025329e92065b33ac433ed294fa3ce6ede934ad Mon Sep 17 00:00:00 2001
From: SiriusXT <1160925501@qq.com>
Date: Tue, 28 Oct 2025 11:00:53 +0800
Subject: [PATCH 2/3] fix: restore editor focus after inserting markdown

---
 .../src/widgets/dialogs/markdown_import.tsx   | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/apps/client/src/widgets/dialogs/markdown_import.tsx b/apps/client/src/widgets/dialogs/markdown_import.tsx
index 5676d7298..07669b42c 100644
--- a/apps/client/src/widgets/dialogs/markdown_import.tsx
+++ b/apps/client/src/widgets/dialogs/markdown_import.tsx
@@ -31,21 +31,18 @@ export default function MarkdownImportDialog() {
         }
     });
 
-    async function sendForm() {
-        if (textTypeWidget) {
-            await convertMarkdownToHtml(text, textTypeWidget);
-        }
-        
-        setText("");
-        setShown(false);
-    }
-
     return (
         <Modal
             className="markdown-import-dialog" title={t("markdown_import.dialog_title")} size="lg"
-            footer={<Button className="markdown-import-button" text={t("markdown_import.import_button")} onClick={sendForm} keyboardShortcut="Ctrl+Enter" />}
+            footer={<Button className="markdown-import-button" text={t("markdown_import.import_button")} onClick={() => setShown(false)} keyboardShortcut="Ctrl+Enter" />}
             onShown={() => markdownImportTextArea.current?.focus()}
-            onHidden={() => setShown(false) }
+            onHidden={async () => {
+                if (textTypeWidget) {
+                    await convertMarkdownToHtml(text, textTypeWidget);
+                }
+                setShown(false);
+                setText("");
+            }}
             show={shown}
         >
             <p>{t("markdown_import.modal_body_text")}</p>
@@ -55,7 +52,7 @@ export default function MarkdownImportDialog() {
                 onKeyDown={(e) => {
                     if (e.key === "Enter" && e.ctrlKey) {
                         e.preventDefault();
-                        sendForm();
+                        setShown(false);
                     }
                 }}></textarea>
         </Modal>

From 8f8ea7adc3cec6a6b7a89fa37b4aea32a5c55f36 Mon Sep 17 00:00:00 2001
From: SiriusXT <1160925501@qq.com>
Date: Tue, 28 Oct 2025 14:10:11 +0800
Subject: [PATCH 3/3] fix(types): correct CommandMappings key for
 pasteMarkdownIntoText

---
 apps/client/src/components/app_context.ts             | 3 ++-
 apps/client/src/widgets/dialogs/markdown_import.tsx   | 2 +-
 apps/client/src/widgets/type_widgets/editable_text.ts | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/client/src/components/app_context.ts b/apps/client/src/components/app_context.ts
index f52f2e498..5727032e6 100644
--- a/apps/client/src/components/app_context.ts
+++ b/apps/client/src/components/app_context.ts
@@ -223,6 +223,7 @@ export type CommandMappings = {
     showUploadAttachmentsDialog: CommandData & { noteId: string };
     showIncludeNoteDialog: CommandData & { textTypeWidget: EditableTextTypeWidget };
     showAddLinkDialog: CommandData & { textTypeWidget: EditableTextTypeWidget, text: string };
+    showPasteMarkdownDialog: CommandData & { textTypeWidget: EditableTextTypeWidget };
     closeProtectedSessionPasswordDialog: CommandData;
     copyImageReferenceToClipboard: CommandData;
     copyImageToClipboard: CommandData;
@@ -305,7 +306,7 @@ export type CommandMappings = {
     addLinkToText: CommandData;
     followLinkUnderCursor: CommandData;
     insertDateTimeToText: CommandData;
-    showMarkdownIntoTextDialog: CommandData & { textTypeWidget: EditableTextTypeWidget };
+    pasteMarkdownIntoText: CommandData;
     cutIntoNote: CommandData;
     addIncludeNoteToText: CommandData;
     editReadOnlyNote: CommandData;
diff --git a/apps/client/src/widgets/dialogs/markdown_import.tsx b/apps/client/src/widgets/dialogs/markdown_import.tsx
index 07669b42c..43b20d378 100644
--- a/apps/client/src/widgets/dialogs/markdown_import.tsx
+++ b/apps/client/src/widgets/dialogs/markdown_import.tsx
@@ -19,7 +19,7 @@ export default function MarkdownImportDialog() {
     const [ text, setText ] = useState("");
     const [ shown, setShown ] = useState(false);
 
-    useTriliumEvent("showMarkdownIntoTextDialog", ({ textTypeWidget }) => {
+    useTriliumEvent("showPasteMarkdownDialog", ({ textTypeWidget }) => {
         setTextTypeWidget(textTypeWidget);
         if (utils.isElectron()) {
             const { clipboard } = utils.dynamicRequire("electron");
diff --git a/apps/client/src/widgets/type_widgets/editable_text.ts b/apps/client/src/widgets/type_widgets/editable_text.ts
index ee76a107c..cbc35832e 100644
--- a/apps/client/src/widgets/type_widgets/editable_text.ts
+++ b/apps/client/src/widgets/type_widgets/editable_text.ts
@@ -410,7 +410,7 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget {
     }
 
     pasteMarkdownIntoTextCommand() {
-        this.triggerCommand("showMarkdownIntoTextDialog", { textTypeWidget: this });
+        this.triggerCommand("showPasteMarkdownDialog", { textTypeWidget: this });
     }
 
     getSelectedText() {