From fb02c557f2ebd08a5e1b63c4bbf1972febd5552a Mon Sep 17 00:00:00 2001 From: Andelf Date: Mon, 20 Feb 2023 01:33:08 +0800 Subject: [PATCH] Revert "fix: electron menu handler(Redo, Undo, Copy) (#8466)" This reverts commit 29da7386cbaf6e13ed6616490a03ded3cf09155c. --- src/electron/electron/core.cljs | 37 +-------------------------------- src/main/electron/listener.cljs | 13 +----------- 2 files changed, 2 insertions(+), 48 deletions(-) diff --git a/src/electron/electron/core.cljs b/src/electron/electron/core.cljs index 3b99218d4f..8b357cb68e 100644 --- a/src/electron/electron/core.cljs +++ b/src/electron/electron/core.cljs @@ -228,42 +228,7 @@ (if mac? {:role "close"} {:role "quit"})]} - {:role "editMenu" - ;; https://github.com/electron/electron/blob/85f41d59aceabbdeee1fdec75770249c6335e73a/lib/browser/api/menu-item-roles.ts#L239-L276 - :submenu (concat - [{:label "Undo" - :click (fn [] - (let [browser-window ^js/BrowserWindow @*win - web-contents (.-webContents browser-window)] - (.send web-contents "invokeEditorHandler" "undo"))) - :accelerator "CommandOrControl+Z"} - {:label "Redo" - :click (fn [] - (let [browser-window ^js/BrowserWindow @*win - web-contents (.-webContents browser-window)] - (.send web-contents "invokeEditorHandler" "redo"))) - :accelerator "Shift+CommandOrControl+Z"} - {:type "separator"} - {:role "cut"} - {:label "Copy" - :click (fn [] - (let [browser-window ^js/BrowserWindow @*win - web-contents (.-webContents browser-window)] - (.send web-contents "invokeEditorHandler" "copy"))) - :accelerator "CommandOrControl+C"} - {:role "paste"}] - - (if mac? - [{:role "pasteAndMatchStyle"} - {:role "delete"} - {:role "selectAll"} ;; FIXME not work as expected - {:type "separator"} - {:label "Speech" - :submenu [{:role "startSpeaking"}, - {:role "stopSpeaking"}]}] - [{:role "delete"} - {:type "separator"} - {:role "selectAll"}]))} + {:role "editMenu"} {:role "viewMenu"} {:role "windowMenu"}) ;; Windows has no about role diff --git a/src/main/electron/listener.cljs b/src/main/electron/listener.cljs index 9f48feb088..45fa95a38d 100644 --- a/src/main/electron/listener.cljs +++ b/src/main/electron/listener.cljs @@ -12,7 +12,6 @@ [frontend.fs.watcher-handler :as watcher-handler] [frontend.handler.editor :as editor-handler] [frontend.handler.file-sync :as file-sync-handler] - [frontend.handler.history :as history] [frontend.handler.notification :as notification] [frontend.handler.repo :as repo-handler] [frontend.handler.route :as route-handler] @@ -182,17 +181,7 @@ (js/window.apis.on "syncAPIServerState" (fn [^js data] - (state/set-state! :electron/server (bean/->clj data)))) - - (js/window.apis.on "invokeEditorHandler" - (fn [action] - (println "invokeEditorHandler with action:" action) - (case action - "undo" (history/undo! nil) - "redo" (history/redo! nil) - "copy" (editor-handler/shortcut-copy nil) - "cut" (editor-handler/shortcut-cut nil) ;; FIXME this handler relies on arg Event - )))) + (state/set-state! :electron/server (bean/->clj data))))) (defn listen! []