rename tools

Author: sprocketc

src/renderer/attribute/views.cljs

@@ -9,7 +9,7 @@
    [re-frame.core :as rf]
    [renderer.attribute.hierarchy :as hierarchy]
    [renderer.components :as comp]
-   [renderer.tools.base :as tools]
+   [renderer.tool.base :as tool]
    [renderer.utils.keyboard :as keyb]
    [renderer.utils.spec :as spec]))
 
@@ -52,7 +52,7 @@
   [{:keys [tag attr]}]
   (let [data (if attr (spec/compat-data tag attr) (spec/compat-data tag))
         support-data (:support data)
-        animation? (isa? tag ::tools/animation)]
+        animation? (isa? tag ::tool/animation)]
     (when (or support-data animation?)
       [:div.flex.flex-col
        (when (some :version_added (vals support-data))
@@ -235,10 +235,10 @@
        :align "end"}
       [:div.p-6
        [:h2.mb-4.text-lg tag]
-       (when-let [description (:description (tools/properties tag))]
+       (when-let [description (:description (tool/properties tag))]
          [:p description])
        [caniusethis {:tag tag}]
-       (when-let [url (:url (tools/properties tag))]
+       (when-let [url (:url (tool/properties tag))]
          [:a.button.px-3.bg-primary.w-full
           {:href url
            :target "_blank"}

src/renderer/core.cljs

@@ -30,7 +30,7 @@
    [renderer.subs]
    [renderer.theme.core]
    [renderer.timeline.core]
-   [renderer.tools.core]
+   [renderer.tool.core]
    [renderer.utils.dom :as dom]
    [renderer.utils.error :as error]
    [renderer.utils.keyboard :as keyb]

src/renderer/element/handlers.cljs

@@ -10,8 +10,8 @@
    [reagent.dom.server :as dom.server]
    [renderer.attribute.hierarchy :as hierarchy]
    [renderer.document.handlers :as document.h]
-   [renderer.tools.base :as tools]
-   [renderer.tools.shape.path :as path]
+   [renderer.tool.base :as tool]
+   [renderer.tool.shape.path :as path]
    [renderer.utils.bounds :as bounds]
    [renderer.utils.element :as element]
    [renderer.utils.map :as map]
@@ -420,7 +420,7 @@
   (let [svgs (reverse (root-svgs db))
         pointer-pos (:adjusted-pointer-pos db)]
     (or
-     (some #(when (bounds/contain-point? (tools/bounds %) pointer-pos) %) svgs)
+     (some #(when (bounds/contain-point? (tool/bounds %) pointer-pos) %) svgs)
      (element db :canvas))))
 
 (defn translate
@@ -442,24 +442,24 @@
   ([db el offset]
    (cond-> db
      (not (:locked? el))
-     (update-el el tools/translate offset))))
+     (update-el el tool/translate offset))))
 
 (defn position
   ([db pos]
    (reduce #(position %1 %2 pos) db (top-selected-ancestors db)))
   ([db el pos]
    (cond-> db
      (not (:locked? el))
-     (update-el el tools/position pos))))
+     (update-el el tool/position pos))))
 
 (defn scale
   ([db ratio pivot-point]
    (reduce #(scale %1 %2 ratio pivot-point) db (selected db)))
   ([db el ratio pivot-point]
    (cond-> db
      (not (:locked? el))
-     (update-el el tools/scale ratio (let [[x1 y1] (:bounds el)]
-                                       (mat/sub pivot-point [x1 y1]))))))
+     (update-el el tool/scale ratio (let [[x1 y1] (:bounds el)]
+                                      (mat/sub pivot-point [x1 y1]))))))
 
 (defn align
   ([db direction]
@@ -502,10 +502,10 @@
 (defn overlapping-svg
   [db el]
   (let [svgs (reverse (root-svgs db)) ; Reverse to select top svgs first.
-        el-bounds (tools/bounds el)]
+        el-bounds (tool/bounds el)]
     (or
-     (some #(when (bounds/contained? el-bounds (tools/bounds %)) %) svgs)
-     (some #(when (bounds/intersected? el-bounds (tools/bounds %)) %) svgs)
+     (some #(when (bounds/contained? el-bounds (tool/bounds %)) %) svgs)
+     (some #(when (bounds/intersected? el-bounds (tool/bounds %)) %) svgs)
      (element db :canvas))))
 
 (defn create
@@ -515,7 +515,7 @@
           page (overlapping-svg db el)
           parent (or (:parent el) (if (element/svg? el) :canvas (:key page)))
           children (vals (select-keys (elements db) (:children el)))
-          [x1 y1] (tools/bounds (element db parent))
+          [x1 y1] (tool/bounds (element db parent))
           children (concat children (:content el))
           new-el (map/deep-merge el default-props {:key key :parent parent})
           add-children (fn [db children]
@@ -587,7 +587,7 @@
          offset (mat/sub el-center center)
          el (dissoc el :bounds)
          svg (hovered-svg db)
-         [s-x1 s-y1] (tools/bounds svg)
+         [s-x1 s-y1] (tool/bounds svg)
          pointer-pos (:adjusted-pointer-pos db)
          selected (selected-keys db)]
      (reduce
@@ -686,7 +686,7 @@
 
 (defn ->string
   [elements]
-  (reduce #(-> (tools/render-to-string %2)
+  (reduce #(-> (tool/render-to-string %2)
                dom.server/render-to-static-markup
                (str "\n" %)) "" elements))
 

src/renderer/element/subs.cljs

@@ -4,7 +4,7 @@
    [kdtree]
    [re-frame.core :as rf]
    [renderer.attribute.utils :as attr.utils]
-   [renderer.tools.base :as tools]
+   [renderer.tool.base :as tool]
    [renderer.utils.element :as utils.el]
    [renderer.utils.map :as map]
    [renderer.element.handlers :as h]))
@@ -102,7 +102,7 @@
                  (sort-by (fn [[k _]]
                             (-> (first selected-elements)
                                 :tag
-                                tools/properties
+                                tool/properties
                                 :attrs
                                 (.indexOf k)))
                           attrs))]
@@ -118,7 +118,7 @@
  :element/area
  :<- [:element/selected]
  (fn [selected-elements _]
-   (reduce  #(+ %1 (tools/area %2)) 0 selected-elements)))
+   (reduce  #(+ %1 (tool/area %2)) 0 selected-elements)))
 
 (rf/reg-sub
  :element/ancestor-keys

src/renderer/events.cljs

@@ -5,7 +5,7 @@
    [re-frame.core :as rf]
    [renderer.db :as db]
    [renderer.frame.handlers :as frame-h]
-   [renderer.tools.base :as tools]
+   [renderer.tool.base :as tool]
    [renderer.utils.drop :as drop]
    [renderer.utils.local-storage :as local-storage]
    [renderer.utils.pointer :as pointer]))
@@ -51,7 +51,7 @@
 (rf/reg-event-db
  :set-tool
  (fn [db [_ tool]]
-   (tools/set-tool db tool)))
+   (tool/set-tool db tool)))
 
 (rf/reg-event-db
  :clear-restored
@@ -116,44 +116,44 @@
                                                    pointer-offset)
 
                         (not drag?)
-                        (-> (tools/drag-start e element)
+                        (-> (tool/drag-start e element)
                             (assoc :drag? true))
 
                         :always
-                        (tools/drag e element))
+                        (tool/drag e element))
                       db)
-                    (tools/pointer-move db e element))
+                    (tool/pointer-move db e element))
                   (assoc :pointer-pos pointer-pos
                          :adjusted-pointer-pos adjusted-pointer-pos)))
 
             :pointerdown
             (cond-> db
               (= button :middle)
               (-> (assoc :primary-tool tool)
-                  (tools/set-tool :pan))
+                  (tool/set-tool :pan))
 
               (and (= button :right) (not= (:key element) :bounding-box))
-              (tools/pointer-up e element)
+              (tool/pointer-up e element)
 
               :always
-              (-> (tools/pointer-down e element)
+              (-> (tool/pointer-down e element)
                   (assoc :pointer-offset pointer-pos
                          :adjusted-pointer-offset adjusted-pointer-pos)))
 
             :pointerup
             (cond-> (if drag?
-                      (tools/drag-end db e element)
-                      (cond-> db (not= button :right) (tools/pointer-up e element)))
+                      (tool/drag-end db e element)
+                      (cond-> db (not= button :right) (tool/pointer-up e element)))
               (and primary-tool (= button :middle))
-              (-> (tools/set-tool primary-tool)
+              (-> (tool/set-tool primary-tool)
                   (dissoc :primary-tool))
 
               :always
               (-> (dissoc :pointer-offset :drag?)
                   (update :snap dissoc :nearest-neighbor)))
 
             :dblclick
-            (tools/double-click db e element)
+            (tool/double-click db e element)
 
             :wheel
             (if (some modifiers [:ctrl :alt])
@@ -176,20 +176,20 @@
        (and (= code "Space")
             (not= tool :pan))
        (-> (assoc :primary-tool tool)
-           (tools/set-tool :pan))
+           (tool/set-tool :pan))
 
        :always
-       (tools/key-down e))
+       (tool/key-down e))
 
      :keyup
      (cond-> db
        (and (= code "Space")
             (:primary-tool db))
-       (-> (tools/set-tool (:primary-tool db))
+       (-> (tool/set-tool (:primary-tool db))
            (dissoc :primary-tool))
 
        :always
-       (tools/key-up e))
+       (tool/key-up e))
 
      db)))
 

src/renderer/frame/views.cljs

@@ -7,7 +7,7 @@
    [reagent.core :as ra]
    [reagent.dom.server :as server]
    [renderer.components :as comp]
-   [renderer.tools.base :as tools]
+   [renderer.tool.base :as tool]
    [renderer.utils.pointer :as pointer]))
 
 (defn pointer-handler
@@ -98,7 +98,7 @@
            [:f> inner-component]
            [:> ContextMenu/Root
             [:> ContextMenu/Trigger
-             [tools/render canvas]]
+             [tool/render canvas]]
             [:> ContextMenu/Portal
              (into [:> ContextMenu/Content
                     {:class "menu-content context-menu-content"

src/renderer/history/events.cljs

@@ -3,7 +3,7 @@
    [re-frame.core :as rf]
    [renderer.element.handlers :as element.h]
    [renderer.history.handlers :as h]
-   [renderer.tools.base :as tools]))
+   [renderer.tool.base :as tool]))
 
 (rf/reg-event-db
  :history/undo
@@ -70,7 +70,7 @@
      (element.h/clear-hovered)
 
      (= (:state db) :default)
-     (tools/set-tool :select)))) ; FIXME
+     (tool/set-tool :select)))) ; FIXME
 
 (rf/reg-event-fx
  :history/restore
@@ -82,7 +82,7 @@
               (dissoc :restored?))
           (-> db
               element.h/clear-hovered
-              (tools/set-tool :select)
+              (tool/set-tool :select)
               (dissoc :pointer-offset)
               (dissoc :clicked-element)
               (dissoc :drag?)

src/renderer/timeline/subs.cljs

@@ -2,13 +2,13 @@
   (:require
    [clojure.string :as str]
    [re-frame.core :as rf]
-   [renderer.tools.base :as tools]))
+   [renderer.tool.base :as tool]))
 
 (rf/reg-sub
  :animations
  :<- [:document/elements]
  (fn [elements]
-   (filter #(contains? (descendants ::tools/animation) (:tag %)) (vals elements))))
+   (filter #(contains? (descendants ::tool/animation) (:tag %)) (vals elements))))
 
 (defn effect-id
   [el]

src/renderer/tool/animation/animate.cljs

@@ -1,11 +1,11 @@
-(ns renderer.tools.animation.animate
+(ns renderer.tool.animation.animate
   "https://svgwg.org/specs/animations/#AnimateElement"
   (:require
-   [renderer.tools.base :as tools]))
+   [renderer.tool.base :as tool]))
 
-(derive :animate ::tools/animation)
+(derive :animate ::tool/animation)
 
-(defmethod tools/properties :animate
+(defmethod tool/properties :animate
   []
   {:description "The SVG <animate> element provides a way to animate an 
                  attribute of an element over time."

src/renderer/tool/animation/animate_motion.cljs

@@ -1,11 +1,11 @@
-(ns renderer.tools.animation.animate-motion
+(ns renderer.tool.animation.animate-motion
   "https://svgwg.org/specs/animations/#AnimateMotionElement"
   (:require
-   [renderer.tools.base :as tools]))
+   [renderer.tool.base :as tool]))
 
-(derive :animateMotion ::tools/animation)
+(derive :animateMotion ::tool/animation)
 
-(defmethod tools/properties :animateMotion
+(defmethod tool/properties :animateMotion
   []
   {:description "The SVG <animateMotion> element let define how an element 
                  moves along a motion path."

src/renderer/tool/animation/animate_transform.cljs

@@ -1,11 +1,11 @@
-(ns renderer.tools.animation.animate-transform
+(ns renderer.tool.animation.animate-transform
   "https://svgwg.org/specs/animations/#AnimateTransformElement"
   (:require
-   [renderer.tools.base :as tools]))
+   [renderer.tool.base :as tool]))
 
-(derive :animateTransform ::tools/animation)
+(derive :animateTransform ::tool/animation)
 
-(defmethod tools/properties :animateTransform
+(defmethod tool/properties :animateTransform
   []
   {:description "The animateTransform element animates a transformation 
                  attribute on its target element, thereby allowing animations 

src/renderer/tool/animation/animation.cljs

@@ -1,17 +1,17 @@
-(ns renderer.tools.animation.animation
+(ns renderer.tool.animation.animation
   "https://svgwg.org/specs/animations/#AnimationElements"
   (:require
    [re-frame.core :as rf]
-   [renderer.tools.base :as tools]))
+   [renderer.tool.base :as tool]))
 
-(derive ::tools/animation ::tools/descriptive)
+(derive ::tool/animation ::tool/descriptive)
 
-(defmethod tools/render ::tools/animation
+(defmethod tool/render ::tool/animation
   [{:keys [children tag attrs]}]
   (let [child-elements @(rf/subscribe [:element/filter-visible children])]
     [tag
      attrs
      (for [el child-elements]
-       ^{:key (:key el)} [tools/render el])]))
+       ^{:key (:key el)} [tool/render el])]))
 
-(defmethod tools/bounds ::tools/animation [] nil)
+(defmethod tool/bounds ::tool/animation [] nil)

src/renderer/tool/base.cljs

@@ -1,4 +1,5 @@
-(ns renderer.tools.base)
+(ns renderer.tool.base)
+
 (derive ::renderable ::element)
 (derive ::shape ::renderable)
 (derive ::graphics ::renderable)