Skip to content

Commit d921807

Browse files
Copilottiensonqin
authored andcommitted
refactor: rename pointer-down state APIs
1 parent 0596129 commit d921807

4 files changed

Lines changed: 17 additions & 17 deletions

File tree

src/main/frontend/components/block.cljs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2605,7 +2605,7 @@
26052605
mobile-range (when mobile? (get-cursor-range))]
26062606
(when (and (not forbidden-edit?) (contains? #{1 0} button))
26072607
(when (= 1 button)
2608-
(block-selection/set-pointer-down-block! block-dom-element))
2608+
(block-selection/set-pointer-down!))
26092609
(cond
26102610
(and meta? shift?)
26112611
(when-not (empty? selection-blocks)

src/main/frontend/components/block/selection.cljs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
(ns frontend.components.block.selection)
22

3-
(defonce *pointer-down? (atom false))
3+
(defonce *pointer-is-down? (atom false))
44

5-
(defn set-pointer-down-block!
6-
[_block]
7-
(reset! *pointer-down? true))
5+
(defn set-pointer-down!
6+
[]
7+
(reset! *pointer-is-down? true))
88

9-
(defn clear-pointer-down-block!
9+
(defn clear-pointer-down!
1010
([]
11-
(reset! *pointer-down? false))
11+
(reset! *pointer-is-down? false))
1212
([_]
13-
(clear-pointer-down-block!)))
13+
(clear-pointer-down!)))
1414

1515
(defn pointer-down?
1616
[]
17-
(true? @*pointer-down?))
17+
(true? @*pointer-is-down?))
1818

1919
(defn select-on-hover?
2020
[{:keys [last-client-y client-y dragging? editing-same-block? active-selection?]}]

src/main/frontend/components/container.cljs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -383,9 +383,9 @@
383383
(mixins/event-mixin
384384
(fn [state]
385385
(mixins/listen state js/window "pointerdown" hide-context-menu-and-clear-selection)
386-
(mixins/listen state js/window "pointerup" block-selection/clear-pointer-down-block!)
387-
(mixins/listen state js/window "pointercancel" block-selection/clear-pointer-down-block!)
388-
(mixins/listen state js/window "blur" block-selection/clear-pointer-down-block!)
386+
(mixins/listen state js/window "pointerup" block-selection/clear-pointer-down!)
387+
(mixins/listen state js/window "pointercancel" block-selection/clear-pointer-down!)
388+
(mixins/listen state js/window "blur" block-selection/clear-pointer-down!)
389389
(mixins/listen state js/window "keydown"
390390
(fn [e]
391391
(cond

src/test/frontend/components/block/selection_test.cljs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
[frontend.components.block.selection :as selection]))
44

55
(deftest pointer-down-state-lifecycle
6-
(selection/clear-pointer-down-block!)
6+
(selection/clear-pointer-down!)
77
(is (false? (selection/pointer-down?)))
8-
(selection/set-pointer-down-block! :block)
8+
(selection/set-pointer-down!)
99
(is (true? (selection/pointer-down?)))
10-
(selection/clear-pointer-down-block!)
10+
(selection/clear-pointer-down!)
1111
(is (false? (selection/pointer-down?)))
12-
(selection/set-pointer-down-block! :block)
13-
(selection/clear-pointer-down-block! #js {:type "pointerup"})
12+
(selection/set-pointer-down!)
13+
(selection/clear-pointer-down! #js {:type "pointerup"})
1414
(is (false? (selection/pointer-down?))))
1515

1616
(deftest select-on-hover-keeps-active-selection-while-scroll-moves-block-under-pointer

0 commit comments

Comments
 (0)