clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-04-30 17:06:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

enhance: ESC on code back to raw editor

Browse Source 
Also, removed :editor/pending-type-block.
This commit is contained in:
Tienson Qin
2024-10-03 17:16:41 +08:00
parent 5aaa3c111d
commit ccb6ee48e4
8 changed files with 232 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -154,11 +154,6 @@
;; export CodeMirror to global scope
(set! js/window -CodeMirror CodeMirror)
(defn- block-render-type-is-code?
[block]
(some-> block :logseq.property.node/display-type
(= :code)))
(defn- all-tokens-by-cursor
"All tokens from the beginning of the document to the cursor(inclusive)."
[cm]
@@ -392,16 +387,13 @@
mode)))))
(defn- save-editor!
[^js cm config]
[config]
(p/do!
(code-handler/save-code-editor!)
(when-let [block-id (:block/uuid config)]
(let [block (db/entity [:block/uuid block-id])]
(if (block-render-type-is-code? block)
(let [block-node (some-> cm (.getTextArea) (.closest ".ls-block"))]
;; select block
(util/schedule #(.focus (aget js/window "root-container")))
(state/exit-editing-and-set-selected-blocks! [block-node]))
(state/set-state! :editor/raw-mode-block block)
(when-not (= (:db/id block) (:db/id (state/get-edit-block)))
(editor-handler/edit-block! block :max))))))
(defn ^:large-vars/cleanup-todo render!
@@ -438,7 +430,7 @@
:extraKeys (merge {"Esc" (fn [cm]
;; Avoid reentrancy
(gobj/set cm "escPressed" true)
(save-editor! cm config))}
(save-editor! config))}
(when config-edit?
{"':'" complete-after
"Ctrl-Space" "autocomplete"}))}
@@ -481,6 +473,8 @@
(vreset! *cursor-curr nil)
(vreset! *cursor-prev nil)))
(.on editor "focus" (fn [_e]
(when-not (= (:block/uuid edit-block) (:block/uuid (state/get-edit-block)))
(editor-handler/edit-block! edit-block :max))
(state/set-editing-block-dom-id! (:block-parent-id config))
(state/set-block-component-editing-mode! true)
(state/set-state! :editor/code-block-context