remove element argument from methods

Author: sprocketc

src/renderer/events.cljs

@@ -112,13 +112,13 @@
                                                    pointer-offset)
 
                         (not drag?)
-                        (-> (tool/drag-start e element)
+                        (-> (tool/drag-start e)
                             (assoc :drag? true))
 
                         :always
-                        (tool/drag e element))
+                        (tool/drag e))
                       db)
-                    (tool/pointer-move db e element))
+                    (tool/pointer-move db e))
                   (assoc :pointer-pos pointer-pos
                          :adjusted-pointer-pos adjusted-pointer-pos)))
 
@@ -129,17 +129,17 @@
                   (h/set-tool :pan))
 
               (and (= button :right) (not= (:key element) :bounding-box))
-              (tool/pointer-up e element)
+              (tool/pointer-up e)
 
               :always
-              (-> (tool/pointer-down e element)
+              (-> (tool/pointer-down e)
                   (assoc :pointer-offset pointer-pos
                          :adjusted-pointer-offset adjusted-pointer-pos)))
 
             :pointerup
             (cond-> (if drag?
-                      (tool/drag-end db e element)
-                      (cond-> db (not= button :right) (tool/pointer-up e element)))
+                      (tool/drag-end db e)
+                      (cond-> db (not= button :right) (tool/pointer-up e)))
               (and primary-tool (= button :middle))
               (-> (h/set-tool primary-tool)
                   (dissoc :primary-tool))
@@ -149,7 +149,7 @@
                   (update :snap dissoc :nearest-neighbor)))
 
             :dblclick
-            (tool/double-click db e element)
+            (tool/double-click db e)
 
             :wheel
             (if (some modifiers [:ctrl :alt])

src/renderer/tool/base.cljs

@@ -14,45 +14,43 @@
 (derive :metadata ::descriptive)
 (derive :title ::descriptive)
 
-(defmulti attrs keyword)
-(defmulti properties keyword)
-
-(defmulti pointer-down #(:tool %))
-(defmulti pointer-move #(:tool %))
-(defmulti pointer-up #(:tool %))
-(defmulti double-click #(:tool %))
-(defmulti drag #(:tool %))
-(defmulti drag-start #(:tool %))
-(defmulti drag-end #(:tool %))
-(defmulti key-up #(:tool %))
-(defmulti key-down #(:tool %))
+(defmulti pointer-down (fn [db _e] (:tool db)))
+(defmulti pointer-move (fn [db _e] (:tool db)))
+(defmulti pointer-up (fn [db _e] (:tool db)))
+(defmulti double-click (fn [db _e] (:tool db)))
+(defmulti drag (fn [db _e] (:tool db)))
+(defmulti drag-start (fn [db _e] (:tool db)))
+(defmulti drag-end (fn [db _e] (:tool db)))
+(defmulti key-up (fn [db _e] (:tool db)))
+(defmulti key-down (fn [db _e] (:tool db)))
 (defmulti activate :tool)
 (defmulti deactivate :tool)
+(defmulti properties keyword)
 
 (defmulti render :tag)
 (defmulti render-to-string :tag)
 (defmulti path :tag)
 (defmulti area :tag)
 (defmulti centroid :tag)
 (defmulti snapping-points :tag)
-(defmulti render-edit #(:tag %))
-(defmulti bounds #(:tag %))
-(defmulti translate #(:tag %))
-(defmulti position #(:tag %))
-(defmulti scale #(:tag %))
-(defmulti edit #(:tag %))
+(defmulti render-edit :tag)
+(defmulti bounds (fn [el _elements] (:tag el))) ; REVIEW
+(defmulti translate (fn [el _offset] (:tag el)))
+(defmulti position (fn [el _position] (:tag el)))
+(defmulti scale (fn [el _ration _pivot-point] (:tag el)))
+(defmulti edit (fn [el _offset _handle] (:tag el)))
 
-(defmethod pointer-down :default [db] db)
-(defmethod pointer-up :default [db] db)
-(defmethod pointer-move :default [db] db)
-(defmethod drag-start :default [db] db)
-(defmethod double-click :default [db] db)
-(defmethod key-up :default [db] db)
-(defmethod key-down :default [db] db)
+(defmethod pointer-down :default [db _e] db)
+(defmethod pointer-up :default [db _e] db)
+(defmethod pointer-move :default [db _e] db)
+(defmethod drag-start :default [db _e] db)
+(defmethod double-click :default [db _e] db)
+(defmethod key-up :default [db _e] db)
+(defmethod key-down :default [db _e] db)
+(defmethod drag :default [db e] (pointer-move db e))
+(defmethod drag-end :default [db e] (pointer-up db e))
 (defmethod activate :default [db] (assoc db :cursor "default"))
 (defmethod deactivate :default [db] (assoc db :cursor "default"))
-(defmethod drag :default [db event element] (pointer-move db event element))
-(defmethod drag-end :default [db event element] (pointer-up db event element))
 (defmethod properties :default [])
 
 (defmethod render :default [])
@@ -62,8 +60,8 @@
 (defmethod area :default [])
 (defmethod centroid :default [])
 (defmethod snapping-points :default [])
-(defmethod attrs :default [])
 (defmethod path :default [element] element)
 (defmethod scale :default [element] element)
 (defmethod translate :default [element] element)
 (defmethod position :default [element] element)
+(defmethod edit :default [element] element)

src/renderer/tool/container/group.cljs

@@ -20,12 +20,10 @@
   el) ; TODO
 
 (defmethod tool/render :g
-  [{:keys [attrs children] :as element}]
+  [{:keys [attrs children bounds] :as element}]
   (let [child-elements @(rf/subscribe [:element/filter-visible children])
-        elements @(rf/subscribe [:document/elements])
         ignored-keys @(rf/subscribe [:document/ignored-keys])
         ignored? (contains? ignored-keys (:key element))
-        bounds (tool/bounds element elements)
         [x1 y1 _x2 _y2] bounds
         [width height] (bounds/->dimensions bounds)
         pointer-handler #(pointer/event-handler % element)]

src/renderer/tool/misc/fill.cljs

@@ -20,12 +20,12 @@
 (defmethod tool/translate :fill [])
 
 (defmethod tool/pointer-up :fill
-  [{active-document :active-document :as db} _e el]
+  [{active-document :active-document :as db} {:keys [element]}]
   (let [color (get-in db [:documents active-document :fill])]
     (-> db
-        (element.h/set-attr (:key el) :fill color)
+        (element.h/set-attr (:key element) :fill color)
         (history/finalize "Fill " color))))
 
 (defmethod tool/drag-end :fill
-  [db e el]
-  (tool/pointer-up db e el))
+  [db e]
+  (tool/pointer-up db e))

src/renderer/tool/shape/text.cljs

@@ -54,8 +54,8 @@
         (h/set-state :edit)))) ; FIXME: Merge create and edit history action.
 
 (defmethod tool/drag-end :text
-  [db]
-  (tool/pointer-up db))
+  [db e]
+  (tool/pointer-up db e))
 
 (defmethod tool/translate :text
   [el [x y]]

src/renderer/tool/transform/edit.cljs

@@ -26,25 +26,25 @@
         [:div "Hold " [:strong "Ctrl"] " to restrict direction."]])))
 
 (defmethod tool/pointer-down :edit
-  [db _ el]
-  (assoc db :clicked-element el))
+  [db {:keys [element]}]
+  (assoc db :clicked-element element))
 
 (defmethod tool/pointer-up :edit
-  [db e el]
+  [db {:keys [element] :as e}]
   (if-not (and (= (:button e) :right)
-               (:selected? el))
+               (:selected? element))
     (-> db
         element.h/clear-ignored
         (dissoc :clicked-element)
-        (element.h/select (:key el) (pointer/shift? e))
+        (element.h/select (:key element) (pointer/shift? e))
         (history.h/finalize "Select element"))
     (dissoc db :clicked-element)))
 
 (defmethod tool/pointer-move :edit
-  [db _ el]
+  [db {:keys [element]}]
   (-> db
       element.h/clear-hovered
-      (element.h/hover (:key el))))
+      (element.h/hover (:key element))))
 
 (defmethod tool/drag-start :edit
   [db]

src/renderer/tool/transform/pan.cljs

@@ -33,7 +33,7 @@
   (assoc db :cursor "grabbing"))
 
 (defmethod tool/drag :pan
-  [db e _]
+  [db e]
   (frame/pan db (mat/sub (:pointer-pos db) (:pointer-pos e))))
 
 (defmethod tool/drag-end :pan

src/renderer/tool/transform/select.cljs

@@ -85,15 +85,15 @@
               (f (:key el)))) db (filter :visible? (vals (element.h/elements db)))))
 
 (defmethod tool/pointer-move :select
-  [db e el]
+  [db {:keys [element] :as e}]
   (cond-> db
     (not (pointer/shift? e))
     element.h/clear-ignored
 
     :always
     (-> element.h/clear-hovered
-        (element.h/hover (:key el))
-        (assoc :cursor (if el "move" "default")))))
+        (element.h/hover (:key element))
+        (assoc :cursor (if element "move" "default")))))
 
 (defmethod tool/key-down :select
   [db e]
@@ -109,28 +109,28 @@
     element.h/clear-ignored))
 
 (defmethod tool/pointer-down :select
-  [db _e el]
+  [db {:keys [element]}]
   (-> db
-      (assoc :clicked-element el)
+      (assoc :clicked-element element)
       (element.h/ignore :bounding-box)))
 
 (defmethod tool/pointer-up :select
-  [db e el]
+  [db {:keys [element] :as e}]
   (if-not (and (= (:button e) :right)
-               (:selected? el))
+               (:selected? element))
     (-> db
         element.h/clear-ignored
         (dissoc :clicked-element)
-        (element.h/select (:key el) (pointer/shift? e))
+        (element.h/select (:key element) (pointer/shift? e))
         (history.h/finalize "Select element"))
     (dissoc db :clicked-element)))
 
 (defmethod tool/double-click :select
-  [db _e el]
-  (if (= (:tag el) :g)
+  [db {:keys [element]}]
+  (if (= (:tag element) :g)
     (-> db
-        (element.h/ignore (:key el))
-        (element.h/deselect (:key el)))
+        (element.h/ignore (:key element))
+        (element.h/deselect (:key element)))
     (h/set-tool db :edit)))
 
 (defmethod tool/activate :select