clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-04-26 07:05:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: avoid reentrancy when pressing ESC to quit codemirror

Browse Source
This commit is contained in:
Tienson Qin
2022-03-31 21:40:47 +08:00
parent 019160f32a
commit 1682dc3c7e
3 changed files with 8 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/frontend/extensions/code.cljs
View File

@@ -188,14 +188,10 @@
:else
nil))))
;; Avoid reentrancy
(def *code-saving (atom false))
(defn save-file-or-block-when-blur-or-esc!
(defn- save-file-or-block-when-blur-or-esc!
[editor textarea config state]
(when-not @*code-saving
(reset! *code-saving true)
(save-file-or-block! editor textarea config state)
(reset! *code-saving false)))
(state/set-block-component-editing-mode! false)
(save-file-or-block! editor textarea config state))
(defn- text->cm-mode
([text]
@@ -237,6 +233,8 @@
{:mode mode
:readOnly (if ui-config/publishing? "nocursor" false)
:extraKeys #js {"Esc" (fn [cm]
;; Avoid reentrancy
(gobj/set cm "escPressed" true)
(save-file-or-block-when-blur-or-esc! cm textarea config state)
(when-let [block-id (:block/uuid config)]
(let [block (db/pull [:block/uuid block-id])]
@@ -251,10 +249,10 @@
(.on editor "change" (fn [_cm _e]
(let [new-code (.getValue editor)]
(reset! (:calc-atom state) (calc/eval-lines new-code))))))
(.on editor "blur" (fn [_cm e]
(.on editor "blur" (fn [cm e]
(when e (util/stop e))
(state/set-block-component-editing-mode! false)
(save-file-or-block-when-blur-or-esc! editor textarea config state)))
(when-not (gobj/get cm "escPressed")
(save-file-or-block-when-blur-or-esc! editor textarea config state))))
(.addEventListener element "mousedown"
(fn [e]
(state/clear-selection!)