3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-29 11:56:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

✨ Review improvements

Browse source
This commit is contained in:
alonso.torres 2020-09-25 09:13:50 +02:00
parent 7950cc07c1
commit f6870a2fee
5 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
frontend/src/app/main/ui/shapes/filters.cljs
View file

@ -133,13 +133,13 @@
drop-shadow-filters (->> filters (filter #(= :drop-shadow (:style %)))) drop-shadow-filters (->> filters (filter #(= :drop-shadow (:style %))))
drop-shadow-filters (->> drop-shadow-filters drop-shadow-filters (->> drop-shadow-filters
(map #(str "filter" (:id %))) (map #(str "filter" (:id %)))
(concat ["BackgroundImageFix"]) (cons "BackgroundImageFix")
(map add-in-filter drop-shadow-filters)) (map add-in-filter drop-shadow-filters))
inner-shadow-filters (->> filters (filter #(= :inner-shadow (:style %)))) inner-shadow-filters (->> filters (filter #(= :inner-shadow (:style %))))
inner-shadow-filters (->> inner-shadow-filters inner-shadow-filters (->> inner-shadow-filters
(map #(str "filter" (:id %))) (map #(str "filter" (:id %)))
(concat ["shape"]) (cons "shape")
(map add-in-filter inner-shadow-filters))] (map add-in-filter inner-shadow-filters))]
[:* [:*

1
frontend/src/app/main/ui/workspace/colorpalette.cljs
View file

@ -53,7 +53,6 @@
file-id (:file-id color) file-id (:file-id color)
select-color select-color
(fn [event] (fn [event]
(println "item" id file-id)
(let [ids (get-in @st/state [:workspace-local :selected])] (let [ids (get-in @st/state [:workspace-local :selected])]
(if (kbd/shift? event) (if (kbd/shift? event)
(st/emit! (mdc/change-stroke ids (:value color) id file-id)) (st/emit! (mdc/change-stroke ids (:value color) id file-id))

6
frontend/src/app/main/ui/workspace/shapes/common.cljs
View file

@ -71,11 +71,11 @@
on-context-menu (mf/use-callback on-context-menu (mf/use-callback
(mf/deps shape) (mf/deps shape)
#(on-context-menu % shape)) #(on-context-menu % shape))
filter-id (mf/use-var (filters/get-filter-id))] filter-id (mf/use-memo filters/get-filter-id)]
[:g.shape {:on-mouse-down on-mouse-down [:g.shape {:on-mouse-down on-mouse-down
:on-context-menu on-context-menu :on-context-menu on-context-menu
:filter (filters/filter-str @filter-id shape)} :filter (filters/filter-str filter-id shape)}
[:& filters/filters {:filter-id @filter-id :shape shape}] [:& filters/filters {:filter-id filter-id :shape shape}]
[:& component {:shape shape}]]))) [:& component {:shape shape}]])))

6
frontend/src/app/main/ui/workspace/shapes/frame.cljs
View file

@ -99,7 +99,7 @@
(fn [] (fn []
(st/emit! (dws/change-hover-state (:id shape) false)))) (st/emit! (dws/change-hover-state (:id shape) false))))
filter-id (mf/use-var (filters/get-filter-id))] filter-id (mf/use-memo filters/get-filter-id)]
(when-not (:hidden shape) (when-not (:hidden shape)
[:g {:class (when selected? "selected") [:g {:class (when selected? "selected")
@ -124,8 +124,8 @@
:on-mouse-over on-mouse-over :on-mouse-over on-mouse-over
:on-mouse-out on-mouse-out} :on-mouse-out on-mouse-out}
(:name shape)] (:name shape)]
[:g.frame {:filter (filters/filter-str @filter-id shape)} [:g.frame {:filter (filters/filter-str filter-id shape)}
[:& filters/filters {:filter-id @filter-id :shape shape}] [:& filters/filters {:filter-id filter-id :shape shape}]
[:& frame-shape [:& frame-shape
{:shape shape {:shape shape
:childs children}]]]))))) :childs children}]]])))))

6
frontend/src/app/main/ui/workspace/shapes/path.cljs
View file

@ -43,12 +43,12 @@
(dom/stop-propagation event) (dom/stop-propagation event)
(dom/prevent-default event) (dom/prevent-default event)
(st/emit! (dw/start-edition-mode (:id shape))))))) (st/emit! (dw/start-edition-mode (:id shape)))))))
filter-id (mf/use-var (filters/get-filter-id))] filter-id (mf/use-memo filters/get-filter-id)]
[:g.shape {:on-double-click on-double-click [:g.shape {:on-double-click on-double-click
:on-mouse-down on-mouse-down :on-mouse-down on-mouse-down
:on-context-menu on-context-menu :on-context-menu on-context-menu
:filter (filters/filter-str @filter-id shape)} :filter (filters/filter-str filter-id shape)}
[:& filters/filters {:filter-id @filter-id :shape shape}] [:& filters/filters {:filter-id filter-id :shape shape}]
[:& path/path-shape {:shape shape :background? true}]])) [:& path/path-shape {:shape shape :background? true}]]))