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

fix: Unexpected behavior of Ctrl + b 

close #2667
pull/3068/head
Tienson Qin 2021-11-04 21:31:03 +08:00
parent bd8b858675
commit 7c0e596185
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,10 +75,17 @@
:edit-id edit-id :edit-id edit-id
:input input}))))) :input input})))))
(defn- format-new-selection
[{:keys [selection-start selection-end format value edit-id input]}]
(let [selected (subs value selection-start selection-end)]
[(+ selection-start (count (take-while #(= " " %) selected)))
(- selection-end (count (take-while #(= " " %) (reverse selected))))]))
(defn- format-text! (defn- format-text!
[pattern-fn] [pattern-fn]
(when-let [m (get-selection-and-format)] (when-let [m (get-selection-and-format)]
(let [{:keys [selection-start selection-end format value edit-id input]} m (let [{:keys [selection-start selection-end format value edit-id input]} m
[selection-start selection-end] (format-new-selection m)
empty-selection? (= selection-start selection-end) empty-selection? (= selection-start selection-end)
pattern (pattern-fn format) pattern (pattern-fn format)
pattern-count (count pattern) pattern-count (count pattern)
@ -92,7 +99,8 @@
(subs value (+ selection-end pattern-count)) (subs value (+ selection-end pattern-count))
(subs value selection-end)) (subs value selection-end))
inner-value (cond-> (subs value selection-start selection-end) inner-value (cond-> (subs value selection-start selection-end)
(not already-wrapped?) (#(str pattern % pattern))) (not already-wrapped?)
(#(str pattern % pattern)))
new-value (str prefix inner-value postfix)] new-value (str prefix inner-value postfix)]
(state/set-edit-content! edit-id new-value) (state/set-edit-content! edit-id new-value)
(cond (cond