Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-11 01:28:30 -05:00
Code Issues Activity

Add handlers for position attributes.

Browse source 
With additional refactor of other handlers for
remove duplicated code.
This commit is contained in:
Andrey Antukh 2016-01-07 02:19:33 +02:00
parent 7c802f1885
commit cba11ae053
2 changed files with 29 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
frontend/uxbox/data/workspace.cljs
View file

@ -33,6 +33,10 @@
{:fill [sc/color]
:opacity [v/number]})
(def ^:static +shape-update-position-schema+
{:x [v/integer]
:y [v/integer]})
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Events
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -206,6 +210,17 @@
(update-in state [:shapes-by-id sid]
shapes/-resize size)))))
(defn update-shape-position
[sid {:keys [x y] :as opts}]
(sc/validate! +shape-update-position-schema+ opts)
(reify
rs/UpdateEvent
(-apply-update [_ state]
(update-in state [:shapes-by-id sid]
merge
(when x {:x x})
(when y {:y y})))))
(defn update-shape-fill
[sid {:keys [fill opacity] :as opts}]
(sc/validate! +shape-update-fill-schema+ opts)

28
frontend/uxbox/ui/workspace/options.cljs
View file

@ -91,23 +91,23 @@
(defmethod -render-menu :menu/measures
[menu own shape]
(letfn [(on-width-change [event]
(letfn [(on-size-change [attr event]
(let [value (dom/event->value event)
value (parse-int value 0)
sid (:id shape)]
(-> (dw/update-shape-size sid {:width value})
(rs/emit!))))
(on-height-change [event]
(let [value (dom/event->value event)
value (parse-int value 0)
sid (:id shape)]
(-> (dw/update-shape-size sid {:height value})
(-> (dw/update-shape-size sid {attr value})
(rs/emit!))))
(on-rotation-change [event]
(let [value (dom/event->value event)
value (parse-int value 0)
sid (:id shape)]
(-> (dw/update-shape-rotation sid value)
(rs/emit!))))
(on-pos-change [attr event]
(let [value (dom/event->value event)
value (parse-int value nil)
sid (:id shape)]
(-> (dw/update-shape-position sid {attr value})
(rs/emit!))))]
(html
[:div.element-set {:key (str (:id menu))}
@ -121,27 +121,27 @@
:type "number"
:min "0"
:value (:width shape)
:on-change on-width-change}]
:on-change (partial on-size-change :width)}]
[:div.lock-size i/lock]
[:input#width.input-text
{:placeholder "Height"
:type "number"
:min "0"
:value (:height shape)
:on-change on-height-change}]]
:on-change (partial on-size-change :height)}]]
[:span "Position"]
[:div.row-flex
[:input#width.input-text
{:placeholder "x"
:type "number"
:value (:x shape)
:on-change (constantly nil)}]
:value (:x shape "")
:on-change (partial on-pos-change :x)}]
[:input#width.input-text
{:placeholder "y"
:type "number"
:value (:x shape)
:on-change (constantly nil)}]]
:value (:y shape "")
:on-change (partial on-pos-change :y)}]]
[:span "Rotation"]
[:div.row-flex