Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-03 21:09:00 -05:00
Code Issues Activity

🐛 Fix creation of a copy inside a board

Browse source
This commit is contained in:
Andrés Moya 2023-11-22 16:14:50 +01:00
parent 51e50ac301
commit 8d5af748da
3 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common/src/app/common/types/container.cljc
View file

@ -345,13 +345,10 @@
force-id force-id
keep-ids?) keep-ids?)
;; If frame-id points to a shape inside the component, remap it to the ;; Fix empty parent-id and remap all grid cells to the new ids.
;; corresponding new frame shape. If not, set it to the destination frame.
;; Also fix empty parent-id.
remap-ids remap-ids
(fn [shape] (fn [shape]
(as-> shape $ (as-> shape $
(update $ :frame-id #(get @ids-map % frame-id))
(update $ :parent-id #(or % (:frame-id $))) (update $ :parent-id #(or % (:frame-id $)))
(cond-> $ (cond-> $
(ctl/grid-layout? shape) (ctl/grid-layout? shape)

29
common/src/app/common/types/shape_tree.cljc
View file

@ -354,21 +354,21 @@
the order of the children of each parent." the order of the children of each parent."
([object parent-id objects] ([object parent-id objects]
(clone-object object parent-id objects (fn [object _] object) (fn [object _] object) nil false true)) (clone-object object parent-id objects (fn [object _] object) (fn [object _] object) nil false nil))
([object parent-id objects update-new-object] ([object parent-id objects update-new-object]
(clone-object object parent-id objects update-new-object (fn [object _] object) nil false true)) (clone-object object parent-id objects update-new-object (fn [object _] object) nil false nil))
([object parent-id objects update-new-object update-original-object] ([object parent-id objects update-new-object update-original-object]
(clone-object object parent-id objects update-new-object update-original-object nil false true)) (clone-object object parent-id objects update-new-object update-original-object nil false nil))
([object parent-id objects update-new-object update-original-object force-id] ([object parent-id objects update-new-object update-original-object force-id]
(clone-object object parent-id objects update-new-object update-original-object force-id false true)) (clone-object object parent-id objects update-new-object update-original-object force-id false nil))
([object parent-id objects update-new-object update-original-object force-id keep-ids?] ([object parent-id objects update-new-object update-original-object force-id keep-ids?]
(clone-object object parent-id objects update-new-object update-original-object force-id keep-ids? true)) (clone-object object parent-id objects update-new-object update-original-object force-id keep-ids? nil))
([object parent-id objects update-new-object update-original-object force-id keep-ids? calc-frame?] ([object parent-id objects update-new-object update-original-object force-id keep-ids? frame-id]
(let [new-id (cond (let [new-id (cond
(some? force-id) force-id (some? force-id) force-id
keep-ids? (:id object) keep-ids? (:id object)
@ -378,14 +378,14 @@
;; or the parent's frame-id otherwise. Only for the first cloned shapes. In recursive calls ;; or the parent's frame-id otherwise. Only for the first cloned shapes. In recursive calls
;; this is not needed. ;; this is not needed.
frame-id (cond frame-id (cond
(and calc-frame? (cfh/frame-shape? objects parent-id)) (and (nil? frame-id) (cfh/frame-shape? objects parent-id))
parent-id parent-id
calc-frame? (nil? frame-id)
(dm/get-in objects [parent-id :frame-id]) (dm/get-in objects [parent-id :frame-id])
:else :else
(:frame-id object))] frame-id)]
(loop [child-ids (seq (:shapes object)) (loop [child-ids (seq (:shapes object))
new-direct-children [] new-direct-children []
@ -412,12 +412,15 @@
[new-object new-objects updated-objects]) [new-object new-objects updated-objects])
(let [child-id (first child-ids) (let [child-id (first child-ids)
child (get objects child-id) child (get objects child-id)
_ (dm/assert! (some? child)) _ (dm/assert! (some? child))
frame-id-child (if (cfh/frame-shape? object)
new-id
(:frame-id object))
[new-child new-child-objects updated-child-objects] [new-child new-child-objects updated-child-objects]
(clone-object child new-id objects update-new-object update-original-object nil keep-ids? false)] (clone-object child new-id objects update-new-object update-original-object nil keep-ids? frame-id-child)]
(recur (recur
(next child-ids) (next child-ids)

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

@ -904,7 +904,7 @@
root-main root-main
root-instance)] root-instance)]
(cond-> new-shape (cond-> new-shape
:always (= (:id original-shape) (:id component-shape))
(assoc :frame-id (if (= (:type parent-shape) :frame) (assoc :frame-id (if (= (:type parent-shape) :frame)
(:id parent-shape) (:id parent-shape)
(:frame-id parent-shape))) (:frame-id parent-shape)))