github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-06-15 20:02:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix problem when adding a variant children

Browse Source
This commit is contained in:
alonso.torres 2026-06-11 15:19:07 +02:00
parent 9670140448
commit d39a724130
2 changed files with 38 additions and 1 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

@ -339,7 +339,10 @@
;; We must avoid that destiny frame is inside the component frame
(nil? (get component-children (:id %)))
;; We must avoid that destiny frame is inside a copy
(not (ctk/in-component-copy? %)))}))
(not (ctk/in-component-copy? %))
;; We must avoid that destiny frame is a variant container,
;; because their children must be variant mains
(not (ctk/is-variant-container? %)))}))
frame (get-shape page frame-id)
component-frame (get-component-shape objects frame {:allow-main? true})

34
common/test/common_tests/logic/variants_test.cljc
View File

@ -303,3 +303,37 @@
(t/is (not (nil? container)))
;; The variant containew is nil after the deletion
(t/is (nil? container'))))
(t/deftest test-instantiate-component-over-variant-container
;; When a component is instantiated at a position over a variant container,
;; the new copy must not become a child of the container (its children can
;; only be variant mains)
(let [;; ==== Setup
file (-> (thf/sample-file :file1)
(thv/add-variant :v01 :c01 :m01 :c02 :m02))
container (ths/get-shape file :v01)
page (thf/current-page file)
;; ==== Action
;; Instantiate at a position inside the variant container, without
;; an explicit parent, so the destiny frame is chosen by position
[new-shape changes]
(cll/generate-instantiate-component (-> (pcb/empty-changes nil (:id page))
(pcb/with-objects (:objects page)))
(:objects page)
(:id file)
(thi/id :c01)
(gpt/point (:x container) (:y container))
page
{(:id file) file})
file' (thf/apply-changes file changes)
;; ==== Get
new-shape' (ths/get-shape-by-id file' (:id new-shape))]
;; ==== Check
(thf/validate-file! file')
(t/is (some? new-shape'))
(t/is (not= (:parent-id new-shape') (:id container)))))