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

✨ Add minor events props normalization (#6836)

Browse source
This commit is contained in:
Andrey Antukh 2025-07-02 14:41:48 +02:00 • committed by GitHub
parent e03c822b51
commit 898182e3d5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
frontend/src/app/main/data/workspace/clipboard.cljs
View file

@ -909,16 +909,17 @@
(ev/event {::ev/name "use-library-component" (ev/event {::ev/name "use-library-component"
::ev/origin origin ::ev/origin origin
:is-external-library external-lib? :is-external-library external-lib?
:parent-shape-type parent-type}) :type (get shape :type)
:parent-type parent-type})
(if (cfh/has-layout? objects (:parent-id shape)) (if (cfh/has-layout? objects (:parent-id shape))
(ev/event {::ev/name "layout-add-element" (ev/event {::ev/name "layout-add-element"
::ev/origin origin ::ev/origin origin
:element-type (get shape :type) :type (get shape :type)
:parent-type parent-type}) :parent-type parent-type})
(ev/event {::ev/name "create-shape" (ev/event {::ev/name "create-shape"
::ev/origin origin ::ev/origin origin
:shape-type (get shape :type) :type (get shape :type)
:parent-shape-type parent-type}))))))) :parent-type parent-type})))))))
(rx/of (dwu/start-undo-transaction undo-id) (rx/of (dwu/start-undo-transaction undo-id)
(dch/commit-changes changes) (dch/commit-changes changes)

9
frontend/src/app/main/data/workspace/selection.cljs
View file

@ -493,16 +493,17 @@
(ev/event {::ev/name "use-library-component" (ev/event {::ev/name "use-library-component"
::ev/origin origin ::ev/origin origin
:is-external-library external-lib? :is-external-library external-lib?
:parent-shape-type parent-type}) :type (get shape :type)
:parent-type parent-type})
(if (cfh/has-layout? objects (:parent-id shape)) (if (cfh/has-layout? objects (:parent-id shape))
(ev/event {::ev/name "layout-add-element" (ev/event {::ev/name "layout-add-element"
::ev/origin origin ::ev/origin origin
:element-type (get shape :type) :type (get shape :type)
:parent-type parent-type}) :parent-type parent-type})
(ev/event {::ev/name "create-shape" (ev/event {::ev/name "create-shape"
::ev/origin origin ::ev/origin origin
:shape-type (get shape :type) :type (get shape :type)
:parent-shape-type parent-type}))))))) :parent-type parent-type})))))))
;; Warning: This order is important for the focus mode. ;; Warning: This order is important for the focus mode.
(->> (rx/of (->> (rx/of

10
frontend/src/app/main/data/workspace/shapes.cljs
View file

@ -129,7 +129,10 @@
(pcb/set-undo-group (:id shape))) (pcb/set-undo-group (:id shape)))
undo-id undo-id
(js/Symbol)] (js/Symbol)
parent-type
(cfh/get-shape-type objects (:parent-id shape))]
(rx/concat (rx/concat
(rx/of (dwu/start-undo-transaction undo-id) (rx/of (dwu/start-undo-transaction undo-id)
@ -146,12 +149,13 @@
(rx/of (ev/event {::ev/name "create-shape" (rx/of (ev/event {::ev/name "create-shape"
::ev/origin "workspace:add-shape" ::ev/origin "workspace:add-shape"
:type (get shape :type) :type (get shape :type)
:parent-type (cfh/get-shape-type objects (:parent-id shape))})) :parent-type parent-type}))
(when (cfh/has-layout? objects (:parent-id shape)) (when (cfh/has-layout? objects (:parent-id shape))
(rx/of (ev/event {::ev/name "layout-add-element" (rx/of (ev/event {::ev/name "layout-add-element"
::ev/origin "workspace:add-shape" ::ev/origin "workspace:add-shape"
:element-type (get shape :type)}))))))))) :type (get shape :type)
:parent-type parent-type})))))))))
(defn move-shapes-into-frame (defn move-shapes-into-frame
[frame-id shapes] [frame-id shapes]