refactor

Author: sprocketc

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

@@ -13,7 +13,7 @@
    [renderer.snap.db :refer [Snap]]
    [renderer.theme.db :refer [Theme]]
    [renderer.timeline.db :refer [Timeline]]
-   [renderer.tool.db :refer [Tool]]
+   [renderer.tool.db :refer [Tool State Cursor]]
    [renderer.utils.bounds :refer [Bounds]]
    [renderer.utils.i18n :as i18n]
    [renderer.utils.math :refer [Vec2D]]
@@ -32,10 +32,6 @@
   [:fn {:error/fn (fn [{:keys [value]} _] (str value " is not a supported language"))}
    i18n/lang?])
 
-(def State [:enum :idle :translate :clone :scale :select :create :edit])
-
-(def Cursor [:enum "auto" "default" "none" "context-menu" "help" "pointer" "progress" "wait" "cell" "crosshair" "text" "vertical-text" "alias" "copy" "move" "no-drop" "not-allowed" "grab" "grabbing" "e-resize" "n-resize" "ne-resize" "nw-resize" "s-resize" "se-resize" "sw-resize" "w-resize" "ew-resize" "ns-resize" "nesw-resize" "nwse-resize" "col-resize" "row-resize" "all-scroll" "zoom-in" "zoom-out"])
-
 (def App
   [:map {:closed true}
    [:tool {:default :transform} Tool]
@@ -53,7 +49,7 @@
    [:ruler {:persist true} Ruler]
    [:snap {:persist true} Snap]
    [:active-document {:optional true :persist true} [:maybe uuid?]]
-   [:cursor {:default "default"} string?]
+   [:cursor {:default "default"} Cursor]
    [:dom-rect {:optional true} DomRect]
    [:dialogs {:default []} [:vector Dialog]]
    [:documents {:default {} :persist true} [:map-of uuid? Document]]

src/renderer/app/db.cljs

@@ -30,18 +30,6 @@
               (persist! data))
             context)))
 
-(def custom-fx
-  (rf/->interceptor
-   :id ::custom-fx
-   :after (fn [context]
-            (let [db (rf/get-effect context :db ::not-found)]
-              (cond-> context
-                (not= db ::not-found)
-                (-> (rf/assoc-effect :fx (apply conj (or (:fx (rf/get-effect context)) []) (:fx db)))
-                    (rf/assoc-effect :db (assoc db :fx []))))))))
-
-(rf/reg-global-interceptor custom-fx)
-
 (rf/reg-cofx
  ::guid
  (fn [coeffects _]
@@ -58,16 +46,6 @@
    (drop/items! position (.-items data-transfer))
    (drop/files! position (.-files data-transfer))))
 
-(rf/reg-fx
- ::set-pointer-capture
- (fn [pointer-id]
-   (.setPointerCapture (dom/canvas-element!) pointer-id)))
-
-(rf/reg-fx
- ::release-pointer-capture
- (fn [pointer-id]
-   (.releasePointerCapture (dom/canvas-element!) pointer-id)))
-
 (rf/reg-fx
  ::persist
  (fn [data]

src/renderer/app/effects.cljs

@@ -5,9 +5,6 @@
    [re-frame.core :as rf]
    [renderer.app.db :as db]
    [renderer.app.effects :as fx :refer [persist]]
-   [renderer.app.handlers :as h]
-   [renderer.frame.handlers :as frame.h]
-   [renderer.history.handlers :as history.h :refer [finalize]]
    [renderer.notification.events :as-alias notification.e]
    [renderer.notification.handlers :as notification.h]
    [renderer.notification.views :as notification.v]
@@ -44,12 +41,6 @@
  (fn [db [_ fonts]]
    (assoc db :system-fonts fonts)))
 
-(rf/reg-event-fx
- ::set-tool
- (fn [{:keys [db]} [_ tool]]
-   {:db (h/set-tool db tool)
-    ::fx/focus nil}))
-
 (rf/reg-event-db
  ::set-lang
  (fn [db [_ lang]]
@@ -85,29 +76,6 @@
  (fn [db [_ k]]
    (update-in db [k :visible] not)))
 
-(rf/reg-event-fx
- ::pointer-event
- [(rf/inject-cofx ::fx/now)
-  (finalize nil)]
- (fn [{:keys [db now]} [_ e]]
-   {:db (h/pointer-handler db e now)}))
-
-(rf/reg-event-db
- ::wheel-event
- (fn [db [_ e]]
-   (h/wheel-handler db e)))
-
-(rf/reg-event-fx
- ::drag-event
- (fn [{:keys [db]} [_ {:keys [data-transfer pointer-pos] :as e}]]
-   (when (= (:type e) "drop")
-     {::fx/data-transfer [(frame.h/adjust-pointer-pos db pointer-pos) data-transfer]})))
-
-(rf/reg-event-db
- ::keyboard-event
- (fn [db [_ e]]
-   (h/key-handler db e)))
-
 (rf/reg-event-fx
  ::focus
  (fn [_ [_ id]]

src/renderer/app/events.cljs

@@ -1,15 +1,6 @@
 (ns renderer.app.subs
   (:require
-   [re-frame.core :as rf]
-   [renderer.tool.hierarchy :as tool.hierarchy]))
-
-(rf/reg-sub
- ::tool
- :-> :tool)
-
-(rf/reg-sub
- ::primary-tool
- :-> :primary-tool)
+   [re-frame.core :as rf]))
 
 (rf/reg-sub
  ::pointer-pos
@@ -27,32 +18,6 @@
  ::adjusted-pointer-offset
  :-> :adjusted-pointer-offset)
 
-(rf/reg-sub
- ::pivot-point
- :-> :pivot-point)
-
-(rf/reg-sub
- ::drag
- :-> :drag)
-
-(rf/reg-sub
- ::cursor
- :-> :cursor)
-
-(rf/reg-sub
- ::state
- :-> :state)
-
-(rf/reg-sub
- ::help
- :<- [::tool]
- :<- [::state]
- (fn [[tool state] _]
-   (let [dispatch-state (if (contains? (methods tool.hierarchy/help) [tool state])
-                          state
-                          :idle)]
-     (tool.hierarchy/help tool dispatch-state))))
-
 (rf/reg-sub
  ::dom-rect
  :-> :dom-rect)