Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-10 09:08:31 -05:00
Code Issues Activity

Move the shape initialization out of add-shape event.

Browse source
This commit is contained in:
Andrey Antukh 2016-01-28 20:22:09 +02:00
parent 3ae0306632
commit bc756337cd
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/uxbox/data/workspace.cljs
View file

@ -14,12 +14,6 @@
;; Schemas
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(def ^:static +shape-props-schema+
{:x [v/integer]
:y [v/integer]
:width [v/integer]
:height [v/integer]})
(def ^:static +shape-schema+
{:x [v/integer]
:y [v/integer]
@ -41,8 +35,10 @@
:opacity [v/number]})
(def ^:static +shape-update-position-schema+
{:x [v/integer]
:y [v/integer]})
{:x1 [v/integer]
:y1 [v/integer]
:x2 [v/integer]
:y2 [v/integer]})
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Events (explicit)
@ -125,16 +121,14 @@
(defn add-shape
"Create and add shape to the current selected page."
[shape props]
[shape]
(sc/validate! +shape-schema+ shape)
(sc/validate! +shape-props-schema+ props)
(reify
rs/UpdateEvent
(-apply-update [_ state]
(let [sid (random-uuid)
pid (get-in state [:workspace :page])
shape (merge (sh/-initialize shape props)
shape {:id sid :page pid})]
shape (merge shape {:id sid :page pid})]
(as-> state $
(update-in $ [:pages-by-id pid :shapes] conj sid)
(assoc-in $ [:shapes-by-id sid] shape))))))