Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-02 12:28:54 -05:00
Code Issues Activity

🐛 Fix you can move a shape outside of a copy

Browse source
This commit is contained in:
Pablo Alba 2023-11-30 11:57:21 +01:00 • committed by Andrés Moya
parent 20a86ad65a
commit 76ec610d44
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
common/src/app/common/files/changes.cljc
View file

@ -477,12 +477,16 @@
;; or inside its main component if it's in a copy, ;; or inside its main component if it's in a copy,
;; or inside a copy ;; or inside a copy
(is-valid-move? [objects shape-id] (is-valid-move? [objects shape-id]
(let [invalid-targets (calculate-invalid-targets objects shape-id)] (let [invalid-targets (calculate-invalid-targets objects shape-id)
(and (contains? objects shape-id) shape (get objects shape-id)
_ (prn "is-valid-move?")]
(and shape
(not (invalid-targets parent-id)) (not (invalid-targets parent-id))
(not (cfh/components-nesting-loop? objects shape-id parent-id)) (not (cfh/components-nesting-loop? objects shape-id parent-id))
(or component-swap (or component-swap
(not (ctk/in-component-copy? (get objects parent-id))))))) ;; We don't want to change the structure of component copies (and
(not (ctk/in-component-copy? (get objects (:parent-id shape)))) ;; We don't want to change the structure of component copies
(not (ctk/in-component-copy? (get objects parent-id)))))))) ;; We need to check the origin and target frames
(insert-items [prev-shapes index shapes] (insert-items [prev-shapes index shapes]
(let [prev-shapes (or prev-shapes [])] (let [prev-shapes (or prev-shapes [])]