refactor select box

Author: sprocketc

.clj-kondo/metosin/malli-types-cljs/config.edn

@@ -273,6 +273,7 @@
                                         renderer.app.handlers {set-state {:arities {2 {:args [:any :keyword], :ret :any}}},
                                                                set-cursor {:arities {2 {:args [:any :string], :ret :any}}},
                                                                set-tool {:arities {2 {:args [:any :any], :ret :any}}},
+                                                               pointer-delta {:arities {1 {:args [:any], :ret :any}}},
                                                                pointer-handler {:arities {3 {:args [:any
                                                                                                     {:op :keys,
                                                                                                      :req {:buttons :nilable/keyword,
@@ -306,8 +307,7 @@
                                                                                                        :key-code :number,
                                                                                                        :key :string,
                                                                                                        :modifiers :set}}],
-                                                                                         :ret :any}}},
-                                                               pointer-delta {:arities {1 {:args [:any], :ret :any}}}},
+                                                                                         :ret :any}}}},
                                         renderer.utils.math {clamp {:arities {3 {:args [:number :number :number],
                                                                                  :ret :number}}},
                                                              angle-dx {:arities {2 {:args [:number :number],

src/renderer/tool/impl/transform/select.cljs

@@ -141,10 +141,9 @@
 
 (defn select-rect
   [db intersecting?]
-  (let [zoom (get-in db [:documents (:active-document db) :zoom])]
-    (cond-> (overlay/select-box (:adjusted-pointer-pos db) (:adjusted-pointer-offset db) zoom)
-      (not intersecting?)
-      (assoc-in [:attrs :fill] "transparent"))))
+  (cond-> (overlay/select-box db)
+    (not intersecting?)
+    (assoc-in [:attrs :fill] "transparent")))
 
 (defmethod hierarchy/drag-start :select
   [db _e]

src/renderer/tool/impl/transform/zoom.cljs

@@ -42,10 +42,7 @@
 
 (defmethod hierarchy/drag :zoom
   [db]
-  (element.h/assoc-temp db (overlay/select-box
-                            (:adjusted-pointer-pos db)
-                            (:adjusted-pointer-offset db)
-                            (get-in db [:documents (:active-document db) :zoom]))))
+  (element.h/assoc-temp db (overlay/select-box db)))
 
 (defmethod hierarchy/drag-end :zoom
   [db e]

src/renderer/utils/overlay.cljs

@@ -150,17 +150,21 @@
                             :stroke-dasharray stroke-dasharray})])]))
 
 (defn select-box
-  [[pos-x pos-y] [offset-x offset-y] zoom]
-  {:tag :rect :attrs {:x (min pos-x offset-x)
-                      :y (min pos-y offset-y)
-                      :width (abs (- pos-x offset-x))
-                      :height (abs (- pos-y offset-y))
-                      :shape-rendering "crispEdges"
-                      :fill-opacity ".1"
-                      :fill theme.db/accent
-                      :stroke theme.db/accent
-                      :stroke-opacity ".5"
-                      :stroke-width (/ 1 zoom)}})
+  [db]
+  (let [zoom (get-in db [:documents (:active-document db) :zoom])
+        [pos-x pos-y] (:adjusted-pointer-pos db)
+        [offset-x offset-y] (:adjusted-pointer-offset db)]
+    {:tag :rect
+     :attrs {:x (min pos-x offset-x)
+             :y (min pos-y offset-y)
+             :width (abs (- pos-x offset-x))
+             :height (abs (- pos-y offset-y))
+             :shape-rendering "crispEdges"
+             :fill-opacity ".1"
+             :fill theme.db/accent
+             :stroke theme.db/accent
+             :stroke-opacity ".5"
+             :stroke-width (/ 1 zoom)}}))
 
 (defn centroid
   [el]