clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-02 09:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: use keycode instead of key for autopair

Browse Source 
close #752
close #2944
This commit is contained in:
Tienson Qin
2021-11-22 13:21:19 +08:00
parent 961f6e9a19
commit db1a6c7c37
4 changed files with 59 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/main/frontend/handler/editor.cljs
View File

@@ -52,7 +52,8 @@
[goog.object :as gobj]
[lambdaisland.glogi :as log]
[medley.core :as medley]
[promesa.core :as p]))
[promesa.core :as p]
[frontend.util.keycode :as keycode]))
;; FIXME: should support multiple images concurrently uploading
@@ -2787,21 +2788,20 @@
(and (autopair-when-selected key) (string/blank? (util/get-selected-text)))
nil
(and (not (string/blank? (util/get-selected-text))) (= key-code keycode/left-square-bracket))
(do
(util/stop e)
(autopair input-id "[" format nil))
(and (not (string/blank? (util/get-selected-text))) (= key-code keycode/left-paren))
(do
(util/stop e)
(autopair input-id "(" format nil))
(contains? (set (keys autopair-map)) key)
(do
(util/stop e)
(autopair input-id key format nil)
(cond
(surround-by? input "[[" "]]")
(do
(commands/handle-step [:editor/search-page])
(reset! commands/*slash-caret-pos (cursor/get-caret-pos input)))
(surround-by? input "((" "))")
(do
(commands/handle-step [:editor/search-block :reference])
(reset! commands/*slash-caret-pos (cursor/get-caret-pos input)))
:else
(reset! commands/*show-commands false)))
(autopair input-id key format nil))
(or
(surround-by? input "#" " ")
@@ -2843,18 +2843,11 @@
format (:format (get-state))
current-pos (cursor/pos input)
value (gobj/get input "value")
c (util/nth-safe value (dec current-pos))]
c (util/nth-safe value (dec current-pos))
last-key-code (state/get-last-key-code)
blank-selected? (string/blank? (util/get-selected-text))]
(when-not (state/get-editor-show-input)
(cond
(and (= "【" c (util/nth-safe value (dec (dec current-pos))))
(> current-pos 0))
(do
(commands/handle-step [:editor/input "[[]]" {:last-pattern "【【"
:backward-pos 2}])
(commands/handle-step [:editor/search-page])
(reset! commands/*slash-caret-pos (cursor/get-caret-pos input)))
(and (not (contains? #{"ArrowDown" "ArrowLeft" "ArrowRight" "ArrowUp"} k))
(not (:editor/show-page-search? @state/state))
(not (:editor/show-page-search-hashtag? @state/state))
@@ -2871,10 +2864,22 @@
(commands/handle-step [command-step])
(reset! commands/*slash-caret-pos pos))
(and (= "（" c (util/nth-safe value (dec (dec current-pos))))
(and blank-selected?
(= keycode/left-square-bracket key-code last-key-code)
(not= k "[")
(> current-pos 0))
(do
(commands/handle-step [:editor/input "(())" {:last-pattern "（（"
(commands/handle-step [:editor/input "[[]]" {:backward-truncate-number 2
:backward-pos 2}])
(commands/handle-step [:editor/search-page])
(reset! commands/*slash-caret-pos (cursor/get-caret-pos input)))
(and blank-selected?
(= keycode/left-paren key-code last-key-code)
(not= k "(")
(> current-pos 0))
(do
(commands/handle-step [:editor/input "(())" {:backward-truncate-number 2
:backward-pos 2}])
(commands/handle-step [:editor/search-block :reference])
(reset! commands/*slash-caret-pos (cursor/get-caret-pos input)))
@@ -2923,7 +2928,8 @@
(close-autocomplete-if-outside input)
:else
nil)))))
nil)))
(state/set-last-key-code! key-code)))
(defn editor-on-click!
[id]