CalvinBackup/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-03-11 21:06:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix parent touched detecion when duplicating or copy&paste

Browse Source
This commit is contained in:
Andrés Moya
2023-09-11 13:15:05 +02:00
parent bc45b15b79
commit 2f3ae1d520
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/app/main/data/workspace/selection.cljs
View File

@@ -412,9 +412,9 @@
(defn- prepare-duplicate-shape-change
([changes objects page unames update-unames! ids-map obj delta libraries library-data it file-id]
(prepare-duplicate-shape-change changes objects page unames update-unames! ids-map obj delta libraries library-data it file-id (:frame-id obj) (:parent-id obj) false))
(prepare-duplicate-shape-change changes objects page unames update-unames! ids-map obj delta libraries library-data it file-id (:frame-id obj) (:parent-id obj) false false))
([changes objects page unames update-unames! ids-map obj delta libraries library-data it file-id frame-id parent-id duplicating-component?]
([changes objects page unames update-unames! ids-map obj delta libraries library-data it file-id frame-id parent-id duplicating-component? child?]
(cond
(nil? obj)
changes
@@ -466,7 +466,8 @@
(not duplicating-component?)
(dissoc :shape-ref))
changes (-> (pcb/add-object changes new-obj {:ignore-touched duplicating-component?})
; We want the first added object to touch it's parent, but not subsequent children
changes (-> (pcb/add-object changes new-obj {:ignore-touched (and duplicating-component? child?)})
(pcb/amend-last-change #(assoc % :old-id (:id obj))))
changes (cond-> changes
@@ -488,7 +489,8 @@
file-id
(if frame? new-id frame-id)
new-id
duplicating-component?))
duplicating-component?
true))
changes
(map (d/getf objects) (:shapes obj)))))))