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

fix: selection for virtualized blocks

Browse Source
This commit is contained in:
Tienson Qin
2024-07-25 21:35:40 +08:00
parent 5c8190e5e4
commit 0eaf10cacc
3 changed files with 58 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/main/frontend/state.cljs
View File

@@ -161,9 +161,9 @@
;; Warning: blocks order is determined when setting this attribute
:selection/blocks (atom [])
:selection/start-block (atom nil)
;; either :up or :down, defaults to down
;; nil, :up or :down
;; used to determine selection direction when two or more blocks are selected
:selection/direction (atom :down)
:selection/direction (atom nil)
:selection/selected-all? (atom false)
:custom-context-menu/show? false
:custom-context-menu/links nil
@@ -1137,9 +1137,21 @@ Similar to re-frame subscriptions"
[start-block]
(set-state! :selection/start-block start-block))
(defn get-selection-direction
[]
@(:selection/direction @state))
(defn get-unsorted-selection-blocks
[]
@(:selection/blocks @state))
(defn get-selection-blocks
[]
(util/sort-by-height @(:selection/blocks @state)))
(let [result (get-unsorted-selection-blocks)
direction (get-selection-direction)]
(if (= direction :up)
(vec (reverse result))
result)))
(defn get-selection-block-ids
[]
@@ -1172,13 +1184,13 @@ Similar to re-frame subscriptions"
(defn set-selection-blocks!
([blocks]
(set-selection-blocks! blocks :down))
(set-selection-blocks! blocks nil))
([blocks direction]
(when (seq blocks)
(let [blocks (vec (util/sort-by-height (remove nil? blocks)))]
(let [blocks (vec (remove nil? blocks))]
(set-state! :selection/mode true)
(set-selection-blocks-aux! blocks)
(set-state! :selection/direction direction)))))
(when direction (set-state! :selection/direction direction))))))
(defn into-selection-mode!
[]
@@ -1188,7 +1200,7 @@ Similar to re-frame subscriptions"
[]
(set-state! :selection/mode false)
(set-state! :selection/blocks nil)
(set-state! :selection/direction :down)
(set-state! :selection/direction nil)
(set-state! :selection/start-block nil)
(set-state! :selection/selected-all? false))
@@ -1214,9 +1226,9 @@ Similar to re-frame subscriptions"
(defn conj-selection-block!
[block-or-blocks direction]
(let [selection-blocks (get-selection-blocks)
(let [selection-blocks (get-unsorted-selection-blocks)
blocks (-> (if (sequential? block-or-blocks)
(apply conj selection-blocks block-or-blocks)
(concat selection-blocks block-or-blocks)
(conj selection-blocks block-or-blocks))
distinct)]
(set-selection-blocks! blocks direction)))
@@ -1224,10 +1236,18 @@ Similar to re-frame subscriptions"
(defn drop-selection-block!
[block]
(set-state! :selection/mode true)
(set-selection-blocks-aux! (-> (remove #(= block %) (get-selection-blocks))
util/sort-by-height
(set-selection-blocks-aux! (-> (remove #(= block %) (get-unsorted-selection-blocks))
vec)))
(defn drop-selection-blocks-starts-with!
[block]
(set-state! :selection/mode true)
(let [blocks (get-unsorted-selection-blocks)
blocks' (-> (take-while (fn [b] (not= (.-id b) (.-id block))) blocks)
vec
(conj block))]
(set-selection-blocks-aux! blocks')))
(defn drop-last-selection-block!
[]
(let [direction @(:selection/direction @state)
@@ -1239,16 +1259,11 @@ Similar to re-frame subscriptions"
blocks' (-> (if up?
(rest blocks)
(pop (vec blocks)))
util/sort-by-height
vec)]
(set-state! :selection/mode true)
(set-selection-blocks-aux! blocks')
last-block))
(defn get-selection-direction
[]
@(:selection/direction @state))
(defn hide-custom-context-menu!
[]
(swap! state assoc
@@ -2010,7 +2025,7 @@ Similar to re-frame subscriptions"
(defn exit-editing-and-set-selected-blocks!
([blocks]
(exit-editing-and-set-selected-blocks! blocks :down))
(exit-editing-and-set-selected-blocks! blocks nil))
([blocks direction]
(clear-edit!)
(set-selection-blocks! blocks direction)))