3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-08-07 14:38:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

✨ Reusable shape container refactor

Browse source
This commit is contained in:
alonso.torres 2020-10-16 11:40:49 +02:00
parent 5e299551b7
commit 57c93f80e2
7 changed files with 123 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

45
frontend/src/app/main/ui/viewer/shapes.cljs
View file

@ -30,9 +30,7 @@
[app.common.geom.matrix :as gmt]
[app.common.geom.point :as gpt]
[app.common.geom.shapes :as geom]
[app.common.uuid :as uuid]
[app.main.ui.shapes.gradients :as grad]
[app.main.ui.context :as muc]))
[app.main.ui.shapes.shape :refer [shape-container]]))
(defn on-mouse-down
[event {:keys [interactions] :as shape}]
@ -57,31 +55,24 @@
on-mouse-down (mf/use-callback
(mf/deps shape)
#(on-mouse-down % shape))
#(on-mouse-down % shape))]
render-id (mf/use-memo #(str (uuid/next)))]
[:& (mf/provider muc/render-ctx) {:value render-id}
[:g.shape {:on-mouse-down on-mouse-down
:cursor (when (:interactions shape) "pointer")
:filter (filters/filter-str (str "filter_" render-id) shape)}
[:defs
[:& filters/filters {:shape shape}]
[:& grad/gradient {:shape shape :attr :fill-color-gradient}]
[:& grad/gradient {:shape shape :attr :stroke-color-gradient}]]
[:& component {:shape shape
:frame frame
:childs childs
:is-child-selected? true}]
(when (and (:interactions shape) show-interactions?)
[:rect {:x (- x 1)
:y (- y 1)
:width (+ width 2)
:height (+ height 2)
:fill "#31EFB8"
:stroke "#31EFB8"
:stroke-width 1
:fill-opacity 0.2}])]])))
[:> shape-container {:shape shape
:on-mouse-down on-mouse-down
:cursor (when (:interactions shape) "pointer")}
[:& component {:shape shape
:frame frame
:childs childs
:is-child-selected? true}]
(when (and (:interactions shape) show-interactions?)
[:rect {:x (- x 1)
:y (- y 1)
:width (+ width 2)
:height (+ height 2)
:fill "#31EFB8"
:stroke "#31EFB8"
:stroke-width 1
:fill-opacity 0.2}])])))
(defn frame-wrapper
[shape-container show-interactions?]