Minor refactor on shapes data events.

Adding more asserts and more specs.

frontend/src/uxbox/main/data/shapes.cljs

@@ -49,6 +49,8 @@
 (s/def ::hidden boolean?)
 (s/def ::blocked boolean?)
 (s/def ::locked boolean?)
+(s/def ::width number?)
+(s/def ::height number?)
 (s/def ::x1 number?)
 (s/def ::y1 number?)
 (s/def ::x2 number?)
@@ -103,11 +105,12 @@
   ptk/UpdateEvent
   (update [_ state]
     (let [shape (geom/setup-proportions data)
-          page (l/focus ul/selected-page state)]
+          page (get-in state [:workspace :page])]
       (impl/assoc-shape-to-page state shape page))))
 
 (defn add-shape
   [data]
+  {:pre [(us/valid? ::shape data)]}
   (AddShape. data))
 
 ;; --- Delete Shape
@@ -125,14 +128,18 @@
   {:pre [(uuid? id)]}
   (DeleteShape. id))
 
-(defn update-shape
+;; --- Rename Shape
-  "Just updates in place the shape."
+
-  [{:keys [id] :as shape}]
+(deftype RenameShape [id name]
-  (reify
   udp/IPageUpdate
   ptk/UpdateEvent
   (update [_ state]
-      (update-in state [:shapes id] merge shape))))
+    (assoc-in state [:shapes id :name] name)))
+
+(defn rename-shape
+  [id name]
+  {:pre [(uuid? id) (string? name)]}
+  (RenameShape. id name))
 
 ;; --- Shape Transformations
 
@@ -142,7 +149,6 @@
 
 (declare apply-temporal-displacement)
 
-
 (deftype InitialShapeAlign [id]
   ptk/WatchEvent
   (watch [_ state s]
@@ -160,29 +166,40 @@
   {:pre [(uuid? id)]}
   (InitialShapeAlign. id))
 
-(defn update-rotation
+;; --- Update Rotation
-  [sid rotation]
+
-  {:pre [(number? rotation)
+(deftype UpdateShapeRotation [id rotation]
-         (>= rotation 0)
-         (>= 360 rotation)]}
-  (reify
   udp/IPageUpdate
   ptk/UpdateEvent
   (update [_ state]
-      (update-in state [:shapes sid]
+    (assoc-in state [:shapes id :rotation] rotation)))
-                 geom/rotate rotation))))
 
-(defn update-size
+(defn update-rotation
+  [id rotation]
+  {:pre [(uuid? id)
+         (number? rotation)
+         (>= rotation 0)
+         (>= 360 rotation)]}
+  (UpdateShapeRotation. id rotation))
+
+;; --- Update Dimensions
+
+(deftype UpdateDimensions [id dimensions]
+  udp/IPageUpdate
+  ptk/UpdateEvent
+  (update [_ state]
+    (update-in state [:shapes id] geom/resize-dim dimensions)))
+
+(s/def ::update-dimensions-opts
+  (s/keys :opt-un [::width ::height]))
+
+(defn update-dimensions
   "A helper event just for update the position
   of the shape using the width and height attrs
   instread final point of coordinates."
-  [sid opts]
+  [id opts]
-  {:pre [(uuid? sid)]}
+  {:pre [(uuid? id) (us/valid? ::update-dimensions-opts opts)]}
-  (reify
+  (UpdateDimensions. id opts))
-    udp/IPageUpdate
-    ptk/UpdateEvent
-    (update [_ state]
-      (update-in state [:shapes sid] geom/resize-dim opts))))
 
 ;; --- Apply Temporal Displacement
 
@@ -246,22 +263,32 @@
   {:pre [(uuid? id)]}
   (ApplyResize. id))
 
-(defn update-position
+;; --- Update Shape Position
-  "Update the start position coordenate of the shape."
-  [sid {:keys [x y] :as opts}]
-  (reify
-    ptk/UpdateEvent
-    (update [_ state]
-      (update-in state [:shapes sid] geom/absolute-move opts))))
 
-(defn update-text
+(deftype UpdateShapePosition [id point]
-  [sid {:keys [content]}]
-  {:pre [(string? content)]}
-  (reify
   udp/IPageUpdate
   ptk/UpdateEvent
   (update [_ state]
-      (assoc-in state [:shapes sid :content] content))))
+    (update-in state [:shapes id] geom/absolute-move point)))
+
+(defn update-position
+  "Update the start position coordenate of the shape."
+  [id point]
+  {:pre [(uuid? id) (gpt/point? point)]}
+  (UpdateShapePosition. id point))
+
+;; --- Update Shape Text
+
+(deftype UpdateShapeTextContent [id text]
+  udp/IPageUpdate
+  ptk/UpdateEvent
+  (update [_ state]
+    (assoc-in state [:shapes id :content] text)))
+
+(defn update-text
+  [id text]
+  {:pre [(uuid? id) (string? text)]}
+  (UpdateShapeTextContent. id text))
 
 ;; --- Update Shape Attrs
 
@@ -283,173 +310,206 @@
 
 ;; --- Shape Proportions
 
-(defn lock-proportions
+(deftype LockShapeProportions [id]
-  "Mark proportions of the shape locked and save the current
-  proportion as additional precalculated property."
-  [sid]
-  {:pre [(uuid? sid)]}
-  (reify
   udp/IPageUpdate
   ptk/UpdateEvent
   (update [_ state]
-      (let [[width height] (-> (get-in state [:shapes sid])
+    (let [[width height] (-> (get-in state [:shapes id])
                              (geom/size)
                              (keep [:width :height]))
           proportion (/ width height)]
-        (update-in state [:shapes sid] assoc
+      (update-in state [:shapes id] assoc
                  :proportion proportion
-                   :proportion-lock true)))))
+                 :proportion-lock true))))
 
-(defn unlock-proportions
+(defn lock-proportions
-  [sid]
+  "Mark proportions of the shape locked and save the current
-  {:pre [(uuid? sid)]}
+  proportion as additional precalculated property."
-  (reify
+  [id]
+  {:pre [(uuid? id)]}
+  (LockShapeProportions. id))
+
+(deftype UnlockShapeProportions [id]
   udp/IPageUpdate
   ptk/UpdateEvent
   (update [_ state]
-      (update-in state [:shapes sid] assoc
+    (assoc-in state [:shapes id :proportion-lock] true)))
-                 :proportion-lock false))))
+
+(defn unlock-proportions
+  [id]
+  {:pre [(uuid? id)]}
+  (UnlockShapeProportions. id))
 
 ;; --- Group Collapsing
 
+(deftype CollapseGroupShape [id]
+  udp/IPageUpdate
+  ptk/UpdateEvent
+  (update [_ state]
+    (update-in state [:shapes id] assoc :collapsed true)))
+
 (defn collapse-shape
   [id]
   {:pre [(uuid? id)]}
-  (reify
+  (CollapseGroupShape. id))
+
+(deftype UncollapseGroupShape [id]
   udp/IPageUpdate
   ptk/UpdateEvent
   (update [_ state]
-      (update-in state [:shapes id] assoc :collapsed true))))
+    (update-in state [:shapes id] assoc :collapsed false)))
 
 (defn uncollapse-shape
   [id]
   {:pre [(uuid? id)]}
-  (reify
+  (UncollapseGroupShape. id))
-    udp/IPageUpdate
-    ptk/UpdateEvent
-    (update [_ state]
-      (update-in state [:shapes id] assoc :collapsed false))))
 
 ;; --- Shape Visibility
 
-(defn hide-shape
+(deftype HideShape [id]
-  [sid]
-  (reify
   udp/IPageUpdate
   ptk/UpdateEvent
   (update [_ state]
-      (assoc-in state [:shapes sid :hidden] true))
+    (letfn [(mark-hidden [state id]
+              (let [shape (get-in state [:shapes id])]
+                (if (= :group (:type shape))
+                  (as-> state $
+                    (assoc-in $ [:shapes id :hidden] true)
+                    (reduce mark-hidden $ (:items shape)))
+                  (assoc-in state [:shapes id :hidden] true))))]
+      (mark-hidden state id))))
 
-    ptk/WatchEvent
+(defn hide-shape
-    (watch [_ state s]
+  [id]
-      (let [shape (get-in state [:shapes sid])]
+  {:pre [(uuid? id)]}
-        (if-not (= (:type shape) :group)
+  (HideShape. id))
-          (rx/empty)
+
-          (rx/from-coll
+(deftype ShowShape [id]
-           (map hide-shape (:items shape))))))))
+  udp/IPageUpdate
+  ptk/UpdateEvent
+  (update [_ state]
+    (letfn [(mark-visible [state id]
+              (let [shape (get-in state [:shapes id])]
+                (if (= :group (:type shape))
+                  (as-> state $
+                    (assoc-in $ [:shapes id :hidden] false)
+                    (reduce mark-visible $ (:items shape)))
+                  (assoc-in state [:shapes id :hidden] false))))]
+      (mark-visible state id))))
 
 (defn show-shape
-  [sid]
+  [id]
-  (reify
+  {:pre [(uuid? id)]}
+  (ShowShape. id))
+
+;; --- Shape Blocking
+
+(deftype BlockShape [id]
   udp/IPageUpdate
   ptk/UpdateEvent
   (update [_ state]
-      (assoc-in state [:shapes sid :hidden] false))
+    (letfn [(mark-blocked [state id]
-
+              (let [shape (get-in state [:shapes id])]
-    ptk/WatchEvent
+                (if (= :group (:type shape))
-    (watch [_ state s]
+                  (as-> state $
-      (let [shape (get-in state [:shapes sid])]
+                    (assoc-in $ [:shapes id :blocked] true)
-        (if-not (= (:type shape) :group)
+                    (reduce mark-blocked $ (:items shape)))
-          (rx/empty)
+                  (assoc-in state [:shapes id :blocked] true))))]
-          (rx/from-coll
+      (mark-blocked state id))))
-           (map show-shape (:items shape))))))))
 
 (defn block-shape
-  [sid]
+  [id]
-  (reify
+  {:pre [(uuid? id)]}
+  (BlockShape. id))
+
+(deftype UnblockShape [id]
   udp/IPageUpdate
   ptk/UpdateEvent
   (update [_ state]
-      (assoc-in state [:shapes sid :blocked] true))
+    (letfn [(mark-unblocked [state id]
-
+              (let [shape (get-in state [:shapes id])]
-    ptk/WatchEvent
+                (if (= :group (:type shape))
-    (watch [_ state s]
+                  (as-> state $
-      (let [shape (get-in state [:shapes sid])]
+                    (assoc-in $ [:shapes id :blocked] false)
-        (if-not (= (:type shape) :group)
+                    (reduce mark-unblocked $ (:items shape)))
-          (rx/empty)
+                  (assoc-in state [:shapes id :blocked] false))))]
-          (rx/from-coll
+      (mark-unblocked state id))))
-           (map block-shape (:items shape))))))))
 
 (defn unblock-shape
-  [sid]
+  [id]
-  (reify
+  {:pre [(uuid? id)]}
+  (UnblockShape. id))
+
+;; --- Shape Locking
+
+(deftype LockShape [id]
   udp/IPageUpdate
   ptk/UpdateEvent
   (update [_ state]
-      (assoc-in state [:shapes sid :blocked] false))
+    (letfn [(mark-locked [state id]
-
+              (let [shape (get-in state [:shapes id])]
-    ptk/WatchEvent
+                (if (= :group (:type shape))
-    (watch [_ state s]
+                  (as-> state $
-      (let [shape (get-in state [:shapes sid])]
+                    (assoc-in $ [:shapes id :locked] true)
-        (if-not (= (:type shape) :group)
+                    (reduce mark-locked $ (:items shape)))
-          (rx/empty)
+                  (assoc-in state [:shapes id :locked] true))))]
-          (rx/from-coll
+      (mark-locked state id))))
-           (map unblock-shape (:items shape))))))))
 
 (defn lock-shape
-  [sid]
+  [id]
-  (reify
+  {:pre [(uuid? id)]}
+  (LockShape. id))
+
+(deftype UnlockShape [id]
   udp/IPageUpdate
   ptk/UpdateEvent
   (update [_ state]
-      (assoc-in state [:shapes sid :locked] true))
+    (letfn [(mark-unlocked [state id]
-
+              (let [shape (get-in state [:shapes id])]
-    ptk/WatchEvent
+                (if (= :group (:type shape))
-    (watch [_ state s]
+                  (as-> state $
-      (let [shape (get-in state [:shapes sid])]
+                    (assoc-in $ [:shapes id :locked] false)
-        (if-not (= (:type shape) :group)
+                    (reduce mark-unlocked $ (:items shape)))
-          (rx/empty)
+                  (assoc-in state [:shapes id :locked] false))))]
-          (rx/from-coll
+      (mark-unlocked state id))))
-           (map lock-shape (:items shape))))))))
 
 (defn unlock-shape
-  [sid]
+  [id]
-  (reify
+  {:pre [(uuid? id)]}
+  (UnlockShape. id))
+
+;; --- Drop Shape
+
+(deftype DropShape [sid tid loc]
   udp/IPageUpdate
   ptk/UpdateEvent
   (update [_ state]
-      (assoc-in state [:shapes sid :locked] false))
+    (impl/drop-shape state sid tid loc)))
-
-    ptk/WatchEvent
-    (watch [_ state s]
-      (let [shape (get-in state [:shapes sid])]
-        (if-not (= (:type shape) :group)
-          (rx/empty)
-          (rx/from-coll
-           (map unlock-shape (:items shape))))))))
 
 (defn drop-shape
   "Event used in drag and drop for transfer shape
   from one position to an other."
   [sid tid loc]
-  {:pre [(not (nil? tid))
+  {:pre [(uuid? sid)
-         (not (nil? sid))]}
+         (uuid? tid)
-  (reify
+         (keyword? loc)]}
-    udp/IPageUpdate
+  (DropShape. sid tid loc))
-    ptk/UpdateEvent
-    (update [_ state]
-      (impl/drop-shape state sid tid loc))))
 
-(defn select-first-shape
+;; --- Select First Shape
-  "Mark a shape selected for drawing in the canvas."
+
-  []
+(deftype SelectFirstShape []
-  (reify
   ptk/UpdateEvent
   (update [_ state]
     (let [page (get-in state [:workspace :page])
           id (first (get-in state [:pages page :shapes]))]
-        (assoc-in state [:workspace :selected] #{id})))))
+      (assoc-in state [:workspace :selected] #{id}))))
 
+(defn select-first-shape
+  "Mark a shape selected for drawing in the canvas."
+  []
+  (SelectFirstShape.))
+
+;; --- Mark Shape Selected
 
 (deftype SelectShape [id]
   ptk/UpdateEvent
@@ -466,7 +526,7 @@
   {:pre [(uuid? id)]}
   (SelectShape. id))
 
-;; --- Select Shapes
+;; --- Select Shapes (By selrect)
 
 (deftype SelectShapesBySelrect [selrect]
   ptk/UpdateEvent
@@ -578,25 +638,37 @@
   []
   (DeselectAll.))
 
+;; --- Group Selected Shapes
+
+(deftype GroupSelectedShapes []
+  udp/IPageUpdate
+  ptk/UpdateEvent
+  (update [_ state]
+    (let [id (get-in state [:workspace :page])
+          selected (get-in state [:workspace :selected])]
+      (assert (not (empty? selected)) "selected set is empty")
+      (assert (uuid? id) "selected page is not an uuid")
+      (impl/group-shapes state selected id))))
+
 (defn group-selected
   []
-  (reify
+  (GroupSelectedShapes.))
-    udp/IPageUpdate
-    ptk/UpdateEvent
-    (update [_ state]
-      (let [pid (get-in state [:workspace :page])
-            selected (get-in state [:workspace :selected])]
-        (impl/group-shapes state selected pid)))))
 
-(defn degroup-selected
+;; --- Ungroup Selected Shapes
-  []
+
-  (reify
+(deftype UngroupSelectedShapes []
   udp/IPageUpdate
   ptk/UpdateEvent
   (update [_ state]
-      (let [pid (get-in state [:workspace :page])
+    (let [id (get-in state [:workspace :page])
           selected (get-in state [:workspace :selected])]
-        (impl/degroup-shapes state selected pid)))))
+      (assert (not (empty? selected)) "selected set is empty")
+      (assert (uuid? id) "selected page is not an uuid")
+      (impl/degroup-shapes state selected id))))
+
+(defn ungroup-selected
+  []
+  (UngroupSelectedShapes.))
 
 ;; --- Duplicate Selected
 

frontend/src/uxbox/main/geom.cljs

@@ -108,6 +108,7 @@
 
 ;; TODO: maybe we can consider apply the rotation
 ;;       directly to the shape coordinates?
+;; FIXME: deprecated, should be removed
 
 (defn rotate
   "Apply the rotation to the shape."

frontend/src/uxbox/main/ui/shapes/text.cljs

@@ -121,7 +121,7 @@
         props {:x x1 :y y1 :width width :height height}]
     (letfn [(on-input [ev]
               (let [content (dom/event->inner-text ev)]
-                (st/emit! (uds/update-text id {:content content}))))]
+                (st/emit! (uds/update-text id content))))]
       [:foreignObject props
        [:div {:style style
               :ref "container"

frontend/src/uxbox/main/ui/workspace/shortcuts.cljs

@@ -28,7 +28,7 @@
 (defonce +shortcuts+
   {:shift+g #(st/emit! (dw/toggle-flag :grid))
    :ctrl+g #(st/emit! (uds/group-selected))
-   :ctrl+shift+g #(st/emit! (uds/degroup-selected))
+   :ctrl+shift+g #(st/emit! (uds/ungroup-selected))
    :ctrl+shift+m #(st/emit! (dw/toggle-flag :sitemap))
    :ctrl+shift+f #(st/emit! (dw/toggle-flag :drawtools))
    :ctrl+shift+i #(st/emit! (dw/toggle-flag :icons))

frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs

@@ -92,14 +92,13 @@
   "A generic component that displays the shape name
   if it is available and allows inline edition of it."
   {:mixins [mx/static (mx/local)]}
-  [{:keys [rum/local]} shape]
+  [{:keys [rum/local]} {:keys [id] :as shape}]
   (letfn [(on-blur [event]
             (let [target (dom/event->target event)
                   parent (.-parentNode target)
-                  data {:id (:id shape)
+                  name (dom/get-value target)]
-                        :name (dom/get-value target)}]
               (set! (.-draggable parent) true)
-              (st/emit! (uds/update-shape data))
+              (st/emit! (uds/rename-shape id name))
               (swap! local assoc :edition false)))
           (on-key-down [event]
             (js/console.log event)
@@ -295,8 +294,8 @@
         groups (into #{} xform selected)]
     (= 1 (count groups))))
 
-(defn- allow-degrouping?
+(defn- allow-ungrouping?
-  "Check if the current situation allows degrouping
+  "Check if the current situation allows ungrouping
   of the currently selected shapes."
   [selected shapes-map]
   (let [xform (comp (map shapes-map)
@@ -310,11 +309,11 @@
   [selected shapes-map]
   (let [duplicate #(st/emit! (uds/duplicate-selected))
         group #(st/emit! (uds/group-selected))
-        degroup #(st/emit! (uds/degroup-selected))
+        ungroup #(st/emit! (uds/ungroup-selected))
         delete #(st/emit! (uds/delete-selected))
 
         allow-grouping? (allow-grouping? selected shapes-map)
-        allow-degrouping? (allow-degrouping? selected shapes-map)
+        allow-ungrouping? (allow-ungrouping? selected shapes-map)
         allow-duplicate? (= 1 (count selected))
         allow-deletion? (pos? (count selected))]
     [:div.layers-tools
@@ -331,8 +330,8 @@
        i/folder]
       [:li.degroup-layer.tooltip.tooltip-top
        {:alt "Ungroup"
-        :class (when-not allow-degrouping? "disable")
+        :class (when-not allow-ungrouping? "disable")
-        :on-click degroup}
+        :on-click ungroup}
        i/ungroup]
       [:li.delete-layer.tooltip.tooltip-top
        {:alt "Delete"

frontend/src/uxbox/main/ui/workspace/sidebar/options/circle_measures.cljs

@@ -19,8 +19,9 @@
             [uxbox.util.mixins :as mx :include-macros true]
             [uxbox.main.geom :as geom]
             [uxbox.util.dom :as dom]
-            [uxbox.util.math :refer (precision-or-0)]
+            [uxbox.util.geom.point :as gpt]
-            [uxbox.util.data :refer (parse-int parse-float read-string)]))
+            [uxbox.util.data :refer (parse-int parse-float read-string)]
+            [uxbox.util.math :refer (precision-or-0)]))
 
 (mx/defc circle-measures-menu
   {:mixins [mx/static]}
@@ -30,7 +31,7 @@
                   value (parse-int value 0)
                   sid (:id shape)
                   props {attr value}]
-              (st/emit! (uds/update-size sid props))))
+              (st/emit! (uds/update-dimensions sid props))))
           (on-rotation-change [event]
             (let [value (dom/event->value event)
                   value (parse-int value 0)
@@ -40,8 +41,8 @@
             (let [value (dom/event->value event)
                   value (parse-int value nil)
                   sid (:id shape)
-                  props {attr value}]
+                  point (gpt/point {attr value})]
-              (st/emit! (uds/update-position sid props))))
+              (st/emit! (uds/update-position sid point))))
           (on-proportion-lock-change [event]
             (if (:proportion-lock shape)
               (st/emit! (uds/unlock-proportions id))

frontend/src/uxbox/main/ui/workspace/sidebar/options/icon_measures.cljs

@@ -19,8 +19,9 @@
             [uxbox.util.mixins :as mx :include-macros true]
             [uxbox.main.geom :as geom]
             [uxbox.util.dom :as dom]
-            [uxbox.util.math :refer (precision-or-0)]
+            [uxbox.util.geom.point :as gpt]
-            [uxbox.util.data :refer (parse-int parse-float read-string)]))
+            [uxbox.util.data :refer (parse-int parse-float read-string)]
+            [uxbox.util.math :refer (precision-or-0)]))
 
 (defn- icon-measures-menu-render
   [own menu shape]
@@ -29,7 +30,7 @@
                   value (parse-int value 0)
                   sid (:id shape)
                   props {attr value}]
-              (st/emit! (uds/update-size sid props))))
+              (st/emit! (uds/update-dimensions sid props))))
           (on-rotation-change [event]
             (let [value (dom/event->value event)
                   value (parse-int value 0)
@@ -39,8 +40,8 @@
             (let [value (dom/event->value event)
                   value (parse-int value nil)
                   sid (:id shape)
-                  props {attr value}]
+                  point (gpt/point {attr value})]
-              (st/emit! (uds/update-position sid props))))
+              (st/emit! (uds/update-position sid point))))
           (on-proportion-lock-change [event]
             (if (:proportion-lock shape)
               (st/emit! (uds/unlock-proportions (:id shape)))

frontend/src/uxbox/main/ui/workspace/sidebar/options/rect_measures.cljs

@@ -7,7 +7,7 @@
 
 (ns uxbox.main.ui.workspace.sidebar.options.rect-measures
   (:require [lentes.core :as l]
-            [uxbox.util.i18n :refer (tr)]
+            [uxbox.util.i18n :refer [tr]]
             [uxbox.util.router :as r]
             [potok.core :as ptk]
             [uxbox.main.store :as st]
@@ -17,8 +17,9 @@
             [uxbox.util.mixins :as mx :include-macros true]
             [uxbox.main.geom :as geom]
             [uxbox.util.dom :as dom]
-            [uxbox.util.math :refer (precision-or-0)]
+            [uxbox.util.geom.point :as gpt]
-            [uxbox.util.data :refer (parse-int parse-float read-string)]))
+            [uxbox.util.data :refer [parse-int parse-float read-string]]
+            [uxbox.util.math :refer [precision-or-0]]))
 
 (mx/defc rect-measures-menu
   {:mixins [mx/static]}
@@ -26,15 +27,16 @@
   (letfn [(on-size-change [event attr]
             (let [value (-> (dom/event->value event)
                             (parse-int 0))]
-              (st/emit! (uds/update-size id {attr value}))))
+              (st/emit! (uds/update-dimensions id {attr value}))))
           (on-rotation-change [event]
             (let [value (-> (dom/event->value event)
                             (parse-int 0))]
               (st/emit! (uds/update-rotation id value))))
           (on-pos-change [event attr]
             (let [value (-> (dom/event->value event)
-                            (parse-int nil))]
+                            (parse-int nil))
-              (st/emit! (uds/update-position id {attr value}))))
+                  point (gpt/point {attr value})]
+              (st/emit! (uds/update-position id point))))
           (on-proportion-lock-change [event]
             (if (:proportion-lock shape)
               (st/emit! (uds/unlock-proportions id))