From 1f4b32a24135a366a372cc15fd06044bc1afe38e Mon Sep 17 00:00:00 2001 From: Henry Heino <46334387+personalizedrefrigerator@users.noreply.github.com> Date: Wed, 6 Aug 2025 02:50:17 -0700 Subject: [PATCH] Desktop: Fixes #12235: Fix switching to the Markdown editor after pasting links (#12241) --- .../gui/NoteEditor/NoteBody/TinyMCE/utils/useLinkTooltips.ts | 1 + .../gui/NoteEditor/utils/useScheduleSaveCallbacks.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/useLinkTooltips.ts b/packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/useLinkTooltips.ts index 168a69d33f..7d1458be4e 100644 --- a/packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/useLinkTooltips.ts +++ b/packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/useLinkTooltips.ts @@ -5,6 +5,7 @@ import shim from '@joplin/lib/shim'; const useLinkTooltips = (editor: Editor|null) => { const resetModifiedTitles = useCallback(() => { + if (!editor) return; for (const element of editor.getDoc().querySelectorAll('a[data-joplin-original-title]')) { element.setAttribute('title', element.getAttribute('data-joplin-original-title') ?? ''); element.removeAttribute('data-joplin-original-title'); diff --git a/packages/app-desktop/gui/NoteEditor/utils/useScheduleSaveCallbacks.ts b/packages/app-desktop/gui/NoteEditor/utils/useScheduleSaveCallbacks.ts index 38a3e54b3d..139192dd49 100644 --- a/packages/app-desktop/gui/NoteEditor/utils/useScheduleSaveCallbacks.ts +++ b/packages/app-desktop/gui/NoteEditor/utils/useScheduleSaveCallbacks.ts @@ -49,7 +49,7 @@ const useScheduleSaveCallbacks = (props: Props) => { }, [props.dispatch, props.editorId, props.setFormNote]); const saveNoteIfWillChange = useCallback(async (formNote: FormNote) => { - if (!formNote.id || !formNote.bodyWillChangeId) return; + if (!formNote.id || !formNote.bodyWillChangeId || !props.editorRef.current) return; const body = await props.editorRef.current.content();