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

🐛 Fix touched on adding shapes to a component copy and undo

Browse source
This commit is contained in:
Andrés Moya 2023-06-21 14:38:09 +02:00 • committed by Andrey Antukh
parent d4fe810813
commit d8121364ad
7 changed files with 41 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
frontend/src/app/main/data/workspace/libraries.cljs
View file

@ -485,7 +485,8 @@
(let [page (wsh/lookup-page state)
libraries (wsh/get-libraries state)
changes (pcb/empty-changes it (:id page))
changes (-> (pcb/empty-changes it (:id page))
(pcb/with-objects (:objects page)))
[new-shape changes]
(dwlh/generate-instantiate-component changes

1
frontend/src/app/main/data/workspace/libraries_helpers.cljs
View file

@ -228,6 +228,7 @@
(assoc :parent-id parent-id))
changes (-> (or changes (pcb/empty-changes it))
(pcb/with-page page)
(pcb/with-objects (:objects page))
(pcb/with-library-data library-data))
changes (cond-> (pcb/add-object changes first-shape {:ignore-touched true})
(some? old-id) (pcb/amend-last-change #(assoc % :old-id old-id))) ; on copy/paste old id is used later to reorder the paster layers

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

@ -433,7 +433,7 @@
(gsh/move delta)
(d/update-when :interactions #(ctsi/remap-interactions % ids-map objects)))
changes (-> (pcb/add-object changes new-obj {:ignore-touched true})
changes (-> (pcb/add-object changes new-obj)
(pcb/amend-last-change #(assoc % :old-id (:id obj))))
changes (cond-> changes

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

@ -108,7 +108,8 @@
objects (wsh/lookup-page-objects state page-id)
selected (wsh/lookup-selected state)
changes (pcb/empty-changes it page-id)
changes (-> (pcb/empty-changes it page-id)
(pcb/with-objects objects))
[shape changes]
(prepare-add-shape changes attrs objects selected)
@ -433,7 +434,8 @@
selected (wsh/lookup-selected state)
selected (cph/clean-loops objects selected)
changes (pcb/empty-changes it page-id)
changes (-> (pcb/empty-changes it page-id)
(pcb/with-objects objects))
[frame-shape changes]
(prepare-create-artboard-from-selection changes