3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-07 21:15:55 +02:00
Code Issues Projects Releases Packages Wiki Activity

Improved shape component for proper handle shapes in groups.

Browse source
This commit is contained in:
Andrey Antukh 2016-01-22 19:38:44 +02:00
parent 84d87dcc4f
commit 42073077ee
1 changed files with 49 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
src/uxbox/ui/workspace/canvas.cljs
View file

@ -8,7 +8,7 @@
[uxbox.rstore :as rs] [uxbox.rstore :as rs]
[uxbox.state :as st] [uxbox.state :as st]
[uxbox.xforms :as xf] [uxbox.xforms :as xf]
[uxbox.shapes :as shapes] [uxbox.shapes :as sh]
[uxbox.util.lens :as ul] [uxbox.util.lens :as ul]
[uxbox.library.icons :as _icons] [uxbox.library.icons :as _icons]
[uxbox.data.projects :as dp] [uxbox.data.projects :as dp]
@ -49,35 +49,60 @@
;; Shape ;; Shape
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(declare shape)
(defn shape-render (defn shape-render
[own shape selected] [own item selected]
(let [{:keys [id x y width height] :as shape} shape (let [{:keys [id x y width height group] :as item} item
selected? (contains? selected id)] selected? (contains? selected id)
local (:rum/local own)]
(letfn [(on-mouse-down [event] (letfn [(on-mouse-down [event]
(when-not (:blocked shape) (when-not (:blocked item)
(let [local (:rum/local own)] ;; (let [local (:rum/local own)]
;; (swap! local assoc :init-coords [x y])
;; (reset! wb/shapes-dragging? true))
(cond
(and group (:locked (sh/resolve-parent item)))
nil
(and (not selected?) (empty? selected))
(do
(dom/stop-propagation event) (dom/stop-propagation event)
(swap! local assoc :init-coords [x y]) (swap! local assoc :init-coords [x y])
(reset! wb/shapes-dragging? true)) (reset! wb/shapes-dragging? true)
(cond
(and (not selected?)
(empty? selected))
(rs/emit! (dw/select-shape id))
(and (not selected?) (rs/emit! (dw/select-shape id)))
(not (empty? selected)))
(and (not selected?) (not (empty? selected)))
(do
(dom/stop-propagation event)
(swap! local assoc :init-coords [x y])
(reset! wb/shapes-dragging? true)
(if (.-ctrlKey event) (if (.-ctrlKey event)
(rs/emit! (dw/select-shape id)) (rs/emit! (dw/select-shape id))
(rs/emit! (dw/deselect-all) (rs/emit! (dw/deselect-all)
(dw/select-shape id)))))) (dw/select-shape id))))
(on-mouse-up [event]
:else
(do
(dom/stop-propagation event) (dom/stop-propagation event)
(reset! wb/shapes-dragging? false))] (swap! local assoc :init-coords [x y])
(reset! wb/shapes-dragging? true)))))
(on-mouse-up [event]
(cond
(and group (:locked (sh/resolve-parent item)))
nil
:else
(do
(dom/stop-propagation event)
(reset! wb/shapes-dragging? false))))]
(html (html
[:g.shape {:class (when selected? "selected") [:g.shape {:class (when selected? "selected")
:on-mouse-down on-mouse-down :on-mouse-down on-mouse-down
:on-mouse-up on-mouse-up} :on-mouse-up on-mouse-up}
(shapes/-render shape nil)])))) (sh/-render item #(shape % selected))]))))
(def ^:static shape (def ^:static shape
(mx/component (mx/component