From e8a02c26d074a4ab5f694d7a521de78bf673ec02 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Fri, 4 Jun 2021 13:34:30 +0200 Subject: [PATCH] Desktop: Fixed: Ctrl+Clicking links in Rich Text editor was broken (regression) --- .../gui/NoteEditor/utils/useMessageHandler.ts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/app-desktop/gui/NoteEditor/utils/useMessageHandler.ts b/packages/app-desktop/gui/NoteEditor/utils/useMessageHandler.ts index d31cc0175fc..e66717be0a5 100644 --- a/packages/app-desktop/gui/NoteEditor/utils/useMessageHandler.ts +++ b/packages/app-desktop/gui/NoteEditor/utils/useMessageHandler.ts @@ -9,6 +9,7 @@ const { urlDecode } = require('@joplin/lib/string-utils'); const urlUtils = require('@joplin/lib/urlUtils'); import ResourceFetcher from '@joplin/lib/services/ResourceFetcher'; import { reg } from '@joplin/lib/registry'; +const uri2path = require('file-uri-to-path'); export default function useMessageHandler(scrollWhenReady: any, setScrollWhenReady: Function, editorRef: any, setLocalSearchResultCount: Function, dispatch: Function, formNote: FormNote) { return useCallback(async (event: any) => { @@ -51,8 +52,14 @@ export default function useMessageHandler(scrollWhenReady: any, setScrollWhenRea } else if (urlUtils.urlProtocol(msg)) { if (msg.indexOf('file://') === 0) { - // When using the file:// protocol, openPath doesn't work (does nothing) with URL-encoded paths - require('electron').shell.openPath(urlDecode(msg)); + // When using the file:// protocol, openPath doesn't work (does + // nothing) with URL-encoded paths. + // + // shell.openPath seems to work with file:// urls on Windows, + // but doesn't on macOS, so we need to convert it to a path + // before passing it to openPath. + const decodedPath = uri2path(urlDecode(msg)); + require('electron').shell.openPath(decodedPath); } else { require('electron').shell.openExternal(msg); }