greatbody
/
logseq
mirror of https://github.com/logseq/logseq
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

enhance(editor): optimize global keystrokes effect

pull/3068/head
charlie 2021-11-04 14:03:06 +08:00 committed by Tienson Qin
parent 179a8de37e
commit 52c65e8d21
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/frontend/page.cljs
View File

@ -17,9 +17,7 @@
(ui/inject-document-devices-envs!)
(ui/inject-dynamic-style-node!)
(plugin-handler/host-mounted!)
(let [td-fns [(ui/setup-active-keystroke!)
(ui/setup-active-keystroke!)]
teardown-fn #(mapv (fn [f] (f)) td-fns)]
(let [teardown-fn (comp (ui/setup-active-keystroke!))]
(assoc state ::teardown teardown-fn)))
:will-unmount (fn [state]
(let [teardown (::teardown state)]

7
src/main/frontend/ui.cljs
View File

@ -18,7 +18,8 @@
["react-tippy" :as react-tippy]
["react-transition-group" :refer [CSSTransition TransitionGroup]]
["react-tweet-embed" :as react-tweet-embed]
[rum.core :as rum]))
[rum.core :as rum]
[clojure.string :as str]))
(defonce transition-group (r/adapt-class TransitionGroup))
(defonce css-transition (r/adapt-class CSSTransition))
@ -303,11 +304,13 @@
(defn setup-active-keystroke! []
(let [active-keystroke (atom #{})
heads #{:shift :alt :meta :control}
handle-global-keystroke (fn [down? e]
(let [handler (if down? conj disj)
keystroke e.key]
(swap! active-keystroke handler keystroke))
(set-global-active-keystroke (apply str (interpose "+" (vec @active-keystroke)))))
(when (contains? heads (keyword (util/safe-lower-case e.key)))
(set-global-active-keystroke (str/join "+" @active-keystroke))))
keydown-handler (partial handle-global-keystroke true)
keyup-handler (partial handle-global-keystroke false)
clear-all #(do (set-global-active-keystroke "")