clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-29 23:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(editor): add nearest-scrollable-container util fn

Browse Source
This commit is contained in:
Andelf
2023-05-16 12:53:35 +08:00
committed by Tienson Qin
parent 5a0ceea018
commit 4eccfdfdad
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/frontend/commands.cljs
View File

@@ -414,10 +414,11 @@
(state/set-edit-content! (state/get-edit-input-id)
(str prefix value))
;; HACK: save scroll-pos of current pos, then add trailing content
(let [scroll-pos (.-scrollTop (gdom/getElement "main-content-container"))]
(let [scroll-container (util/nearest-scrollable-container input)
scroll-pos (.-scrollTop scroll-container)]
(state/set-block-content-and-last-pos! id new-value new-pos)
(cursor/move-cursor-to input new-pos)
(set! (.-scrollTop (gdom/getElement "main-content-container")) scroll-pos)
(set! (.-scrollTop scroll-container) scroll-pos)
(when check-fn
(check-fn new-value (dec (count prefix)) new-pos)))))

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

@@ -2226,11 +2226,12 @@
(state/set-edit-content! (state/get-edit-input-id)
(str s1 insertion))
;; HACK: save scroll-pos of current pos, then add trailing content
(let [scroll-pos (.-scrollTop (gdom/getElement "main-content-container"))]
(let [scroll-container (util/nearest-scrollable-container input)
scroll-pos (.-scrollTop scroll-container)]
(state/set-edit-content! (state/get-edit-input-id)
(str s1 insertion s2))
(cursor/move-cursor-to input (+ selected-start (count insertion)))
(set! (.-scrollTop (gdom/getElement "main-content-container")) scroll-pos))))))
(set! (.-scrollTop scroll-container) scroll-pos))))))
(defn- keydown-new-line
"Insert newline to current cursor position"

7
src/main/frontend/util.cljc
View File

@@ -398,6 +398,13 @@
(defn stop-propagation [e]
(when e (.stopPropagation e))))
#?(:cljs
(defn nearest-scrollable-container [^js/HTMLElement element]
(some #(when-let [overflow-y (.-overflowY (js/window.getComputedStyle %))]
(when (contains? #{"auto" "scroll" "overlay"} overflow-y)
%))
(take-while (complement nil?) (iterate #(.-parentElement %) element)))))
#?(:cljs
(defn element-top [elem top]
(when elem