refactor

sprocketc · sprocketc · commit cc3650cf250e · 2024-12-02T00:30:29.000+02:00
diff --git a/src/renderer/app/db.cljs b/src/renderer/app/db.cljs
@@ -7,13 +7,12 @@
    [renderer.document.db :refer [Document]]
    [renderer.element.db :refer [Element]]
    [renderer.frame.db :refer [DomRect]]
-   [renderer.handle.db :refer [Handle]]
    [renderer.notification.db :refer [Notification]]
    [renderer.ruler.db :refer [Ruler]]
    [renderer.snap.db :refer [Snap NearestNeighbor]]
    [renderer.theme.db :refer [Theme]]
    [renderer.timeline.db :refer [Timeline]]
-   [renderer.tool.db :refer [Tool State Cursor]]
+   [renderer.tool.db :refer [Handle Tool State Cursor]]
    [renderer.utils.bounds :refer [Bounds]]
    [renderer.utils.i18n :as i18n]
    [renderer.utils.math :refer [Vec2]]
diff --git a/src/renderer/element/impl/box.cljs b/src/renderer/element/impl/box.cljs
@@ -4,7 +4,7 @@
   (:require
    [clojure.core.matrix :as mat]
    [renderer.element.hierarchy :as hierarchy]
-   [renderer.handle.views :as handle.v]
+   [renderer.tool.views :as tool.v]
    [renderer.utils.bounds :as bounds]
    [renderer.utils.element :as element]
    [renderer.utils.length :as length]))
@@ -51,7 +51,7 @@
                                    :cursor "move"
                                    :element (:id el)})]
          ^{:key (:id handle)}
-         [handle.v/square handle
+         [tool.v/square-handle handle
           ^{:key (str (:id handle) "-title")}
           [:title (name (:id handle))]]))]))
 
diff --git a/src/renderer/element/impl/custom/blob.cljs b/src/renderer/element/impl/custom/blob.cljs
@@ -11,7 +11,7 @@
    [renderer.element.events :as-alias element.e]
    [renderer.element.hierarchy :as hierarchy]
    [renderer.element.subs :as-alias element.s]
-   [renderer.handle.views :as handle.v]
+   [renderer.tool.views :as tool.v]
    [renderer.ui :as ui]
    [renderer.utils.element :as element]
    [renderer.utils.length :as length]
@@ -159,7 +159,7 @@
         [x2 y2] (mat/add [x1 y1] size)]
     [:<>
      [overlay/line [x1 y1] [x2 y2]]
-     [handle.v/square
+     [tool.v/square-handle
       {:type :handle
        :cursor "move"
        :action :edit
diff --git a/src/renderer/element/impl/custom/brush.cljs b/src/renderer/element/impl/custom/brush.cljs
@@ -9,7 +9,7 @@
    [renderer.attribute.impl.range :as attr.range]
    [renderer.attribute.views :as attr.v]
    [renderer.element.hierarchy :as hierarchy]
-   [renderer.handle.views :as handle.v]
+   [renderer.tool.views :as tool.v]
    [renderer.utils.attribute :as attr]
    [renderer.utils.element :as element]
    [renderer.utils.length :as length]
@@ -175,10 +175,10 @@
                      (let [[x y] (mapv length/unit->px [x y])
                            [x y] (mat/add (element/offset el) [x y])]
                        ^{:key index}
-                       [handle.v/square {:id (keyword (str index))
-                                         :x x
-                                         :y y
-                                         :type :handle
-                                         :action :edit
-                                         :element (:id el)}]))
+                       [tool.v/square-handle {:id (keyword (str index))
+                                              :x x
+                                              :y y
+                                              :type :handle
+                                              :action :edit
+                                              :element (:id el)}]))
                    (-> el :attrs :points points->vec))])
diff --git a/src/renderer/element/impl/shape/circle.cljs b/src/renderer/element/impl/shape/circle.cljs
@@ -5,7 +5,7 @@
    [clojure.string :as str]
    [renderer.attribute.hierarchy :as attr.hierarchy]
    [renderer.element.hierarchy :as hierarchy]
-   [renderer.handle.views :as handle.v]
+   [renderer.tool.views :as tool.v]
    [renderer.utils.bounds :as bounds]
    [renderer.utils.element :as element]
    [renderer.utils.length :as length]
@@ -77,11 +77,11 @@
      [overlay/line [cx cy] [(+ cx r) cy]]
      [overlay/label (str (.toFixed r 2)) [(+ cx (/ r 2)) cy]]
      [overlay/times [cx cy]]
-     [handle.v/square {:x (+ cx r)
-                       :y cy
-                       :id :r
-                       :type :handle
-                       :action :edit
-                       :cursor "move"
-                       :element (:id el)}
+     [tool.v/square-handle {:x (+ cx r)
+                              :y cy
+                              :id :r
+                              :type :handle
+                              :action :edit
+                              :cursor "move"
+                              :element (:id el)}
       [:title {:key "r-title"} "r"]]]))
diff --git a/src/renderer/element/impl/shape/ellipse.cljs b/src/renderer/element/impl/shape/ellipse.cljs
@@ -5,7 +5,7 @@
    [clojure.string :as str]
    [renderer.attribute.hierarchy :as attr.hierarchy]
    [renderer.element.hierarchy :as hierarchy]
-   [renderer.handle.views :as handle.v]
+   [renderer.tool.views :as tool.v]
    [renderer.utils.bounds :as bounds]
    [renderer.utils.element :as element]
    [renderer.utils.length :as length]
@@ -74,7 +74,7 @@
      [overlay/label (str (.toFixed ry 2)) [cx (- cy (/ ry 2))]]
      (map (fn [handle]
             ^{:key (:id handle)}
-            [handle.v/square
+            [tool.v/square-handle
              (merge handle {:type :handle
                             :action :edit
                             :cursor "move"
diff --git a/src/renderer/element/impl/shape/line.cljs b/src/renderer/element/impl/shape/line.cljs
@@ -4,7 +4,7 @@
    [clojure.core.matrix :as mat]
    [clojure.string :as str]
    [renderer.element.hierarchy :as hierarchy]
-   [renderer.handle.views :as handle.v]
+   [renderer.tool.views :as tool.v]
    [renderer.utils.bounds :as bounds]
    [renderer.utils.element :as element]
    [renderer.utils.length :as length]))
@@ -56,7 +56,7 @@
      {:key ::edit-handles}
      (map (fn [handle]
             ^{:key (:id handle)}
-            [handle.v/square handle
+            [tool.v/square-handle handle
              [:title {:key (str (:id handle) "-title")} (name (:id handle))]])
           [{:x x1
             :y y1
diff --git a/src/renderer/element/impl/shape/path.cljs b/src/renderer/element/impl/shape/path.cljs
@@ -6,7 +6,7 @@
    [clojure.core.matrix :as mat]
    [clojure.string :as str]
    [renderer.element.hierarchy :as hierarchy]
-   [renderer.handle.views :as handle.v]
+   [renderer.tool.views :as tool.v]
    [renderer.utils.element :as element]
    [renderer.utils.length :as length]))
 
@@ -53,12 +53,12 @@
         segments (-> el :attrs :d svgpath .-segments)
         square-handle (fn [i [x y]]
                         ^{:key i}
-                        [handle.v/square {:id (keyword (str i))
-                                          :x x
-                                          :y y
-                                          :type :handle
-                                          :action :edit
-                                          :element (:id el)}])]
+                        [tool.v/square-handle {:id (keyword (str i))
+                                               :x x
+                                               :y y
+                                               :type :handle
+                                               :action :edit
+                                               :element (:id el)}])]
     [:g {:key ::edit-handles}
      (map-indexed (fn [i segment]
                     (case (-> segment first str/lower-case)
diff --git a/src/renderer/element/impl/shape/polyshape.cljs b/src/renderer/element/impl/shape/polyshape.cljs
@@ -5,7 +5,7 @@
    [clojure.core.matrix :as mat]
    [clojure.string :as str]
    [renderer.element.hierarchy :as hierarchy]
-   [renderer.handle.views :as handle.v]
+   [renderer.tool.views :as tool.v]
    [renderer.utils.attribute :as attr]
    [renderer.utils.element :as element]
    [renderer.utils.length :as length]))
@@ -58,14 +58,14 @@
                      (let [[x y] (mapv length/unit->px [x y])
                            [x y] (mat/add (element/offset el) [x y])]
                        ^{:key index}
-                       [handle.v/square {:id (keyword (str index))
-                                         :x x
-                                         :y y
-                                         :label "point"
-                                         :type :handle
-                                         :cursor "move"
-                                         :action :edit
-                                         :element (:id el)}]))
+                       [tool.v/square-handle {:id (keyword (str index))
+                                              :x x
+                                              :y y
+                                              :label "point"
+                                              :type :handle
+                                              :cursor "move"
+                                              :action :edit
+                                              :element (:id el)}]))
                    (attr/points->vec (-> el :attrs :points)))])
 
 (defmethod hierarchy/edit ::hierarchy/polyshape
diff --git a/src/renderer/handle/db.cljs b/src/renderer/handle/db.cljs
diff --git a/src/renderer/tool/db.cljs b/src/renderer/tool/db.cljs
@@ -49,3 +49,19 @@
    "all-scroll"
    "zoom-in"
    "zoom-out"])
+
+(def HandleAction
+  [:enum :translate :scale :edit])
+
+(def Handle
+  [:map {:closed true}
+   [:id keyword?]
+   [:label {:optional true} string?]
+   [:action HandleAction]
+   [:type [:= :handle]]
+   [:cursor {:optional true} string?]
+   [:x {:optional true} number?]
+   [:y {:optional true} number?]
+   [:size {:optional true} number?]
+   [:stroke-width {:optional true} number?]
+   [:element {:optional true} uuid?]])
diff --git a/src/renderer/tool/impl/base/transform.cljs b/src/renderer/tool/impl/base/transform.cljs
@@ -5,18 +5,20 @@
    [re-frame.core :as rf]
    [renderer.app.db :refer [App]]
    [renderer.app.effects :as-alias app.fx]
+   [renderer.document.subs :as-alias document.s]
    [renderer.element.db :refer [Element]]
    [renderer.element.handlers :as element.h]
    [renderer.element.hierarchy :as element.hierarchy]
    [renderer.element.subs :as-alias element.s]
-   [renderer.handle.db :refer [Handle]]
-   [renderer.handle.views :as handle.v]
    [renderer.history.handlers :as history.h]
    [renderer.ruler.db :refer [Orientation]]
    [renderer.snap.handlers :as snap.h]
+   [renderer.theme.db :as theme.db]
+   [renderer.tool.db :refer [Handle]]
    [renderer.tool.handlers :as h]
    [renderer.tool.hierarchy :as hierarchy]
    [renderer.tool.subs :as-alias s]
+   [renderer.tool.views :as tool.v]
    [renderer.utils.bounds :as bounds :refer [Bounds]]
    [renderer.utils.element :as element]
    [renderer.utils.math :refer [Vec2]]
@@ -368,6 +370,28 @@
         non-selected (select-keys (element.h/entities db) (vec non-selected-ids))]
     (filter :visible (vals non-selected))))
 
+(m/=> size-label [:-> Bounds any?])
+(defn size-label
+  [bounds]
+  (let [zoom @(rf/subscribe [::document.s/zoom])
+        [x1 _ x2 y2] bounds
+        x (+ x1 (/ (- x2 x1) 2))
+        y (+ y2 (/ (+ (/ theme.db/handle-size 2) 15) zoom))
+        [width height] (bounds/->dimensions bounds)
+        text (str (.toFixed width 2) " x " (.toFixed height 2))]
+    [overlay/label text [x y]]))
+
+(m/=> area-label [:-> number? Bounds any?])
+(defn area-label
+  [area bounds]
+  (when area
+    (let [zoom @(rf/subscribe [::document.s/zoom])
+          [x1 y1 x2 _y2] bounds
+          x (+ x1 (/ (- x2 x1) 2))
+          y (+ y1 (/ (- -15 (/ theme.db/handle-size 2)) zoom))
+          text (str (.toFixed area 2) " px²")]
+      [overlay/label text [x y]])))
+
 (defmethod hierarchy/render :transform
   []
   (let [state @(rf/subscribe [::s/state])
@@ -388,14 +412,14 @@
          [overlay/bounding-box (:bounds el) true]))
 
      (when (and (pos? elements-area) (= state :scale) (seq bounds))
-       [overlay/area-label elements-area bounds])
+       [area-label elements-area bounds])
 
      (when (seq bounds)
        [:<>
-        [handle.v/wrapping-bounding-box bounds]
+        [tool.v/wrapping-bounding-box bounds]
         (case state
-          :scale [overlay/size-label bounds]
-          :idle [handle.v/bounding-corners bounds]
+          :scale [size-label bounds]
+          :idle [tool.v/bounding-corners bounds]
           nil)])
 
      (when pivot-point
diff --git a/src/renderer/tool/views.cljs b/src/renderer/tool/views.cljs
@@ -1,4 +1,4 @@
-(ns renderer.handle.views
+(ns renderer.tool.views
   (:require
    [clojure.core.matrix :as mat]
    [malli.core :as m]
@@ -11,7 +11,7 @@
    [renderer.utils.bounds :as bounds :refer [Bounds]]
    [renderer.utils.pointer :as pointer]))
 
-#_(defn circle
+#_(defn circle-handle
     [el & children]
     (let [{:keys [x y id]} el
           zoom @(rf/subscribe [::document.s/zoom])
@@ -31,7 +31,7 @@
                       :on-pointer-down pointer-handler
                       :on-pointer-move pointer-handler}] children)))
 
-(defn square
+(defn square-handle
   [el & children]
   (let [{:keys [x y id cursor element]} el
         zoom @(rf/subscribe [::document.s/zoom])
@@ -53,11 +53,11 @@
                   :on-pointer-down pointer-handler
                   :on-pointer-move pointer-handler}] children)))
 
-(defn scale
+(defn scale-handle
   [props]
   ^{:key (:id props)}
-  [square (merge props {:type :handle
-                        :action :scale})])
+  [square-handle (merge props {:type :handle
+                               :action :scale})])
 
 (defn wrapping-bounding-box
   [bounds]
@@ -103,7 +103,7 @@
         [x1 y1 x2 y2] bounds
         [w h] (bounds/->dimensions bounds)]
     [:g {:key :bounding-corners}
-     (map scale
+     (map scale-handle
           [{:x x1 :y y1 :id :top-left :cursor "nwse-resize"}
            {:x x2 :y y1 :id :top-right :cursor "nesw-resize"}
            {:x x1 :y y2 :id :bottom-left :cursor "nesw-resize"}
diff --git a/src/renderer/utils/overlay.cljs b/src/renderer/utils/overlay.cljs
@@ -138,17 +138,6 @@
               :font-family theme.db/font-mono
               :font-size font-size} text]])))
 
-(m/=> size-label [:-> Bounds any?])
-(defn size-label
-  [bounds]
-  (let [zoom @(rf/subscribe [::document.s/zoom])
-        [x1 _ x2 y2] bounds
-        x (+ x1 (/ (- x2 x1) 2))
-        y (+ y2 (/ (+ (/ theme.db/handle-size 2) 15) zoom))
-        [width height] (bounds/->dimensions bounds)
-        text (str (.toFixed width 2) " x " (.toFixed height 2))]
-    [label text [x y]]))
-
 (m/=> bounding-box [:-> Bounds boolean? any?])
 (defn bounding-box
   [bounds dashed?]
@@ -197,14 +186,3 @@
           pos (mat/add offset pos)]
       [point-of-interest pos
        [:title "Centroid"]])))
-
-(m/=> area-label [:-> number? Bounds any?])
-(defn area-label
-  [area bounds]
-  (when area
-    (let [zoom @(rf/subscribe [::document.s/zoom])
-          [x1 y1 x2 _y2] bounds
-          x (+ x1 (/ (- x2 x1) 2))
-          y (+ y1 (/ (- -15 (/ theme.db/handle-size 2)) zoom))
-          text (str (.toFixed area 2) " px²")]
-      [label text [x y]])))
diff --git a/src/renderer/utils/pointer.cljs b/src/renderer/utils/pointer.cljs
@@ -5,7 +5,7 @@
    [re-frame.core :as rf]
    [renderer.document.db :refer [ZoomFactor]]
    [renderer.element.db :refer [Element]]
-   [renderer.handle.db :refer [Handle]]
+   [renderer.tool.db :refer [Handle]]
    [renderer.tool.events :as-alias tool.e]
    [renderer.utils.keyboard :refer [ModifierKey modifiers]]
    [renderer.utils.math :refer [Vec2]]))
