github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-09-14 07:59:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix detection of root in a particular case (affects many places)

Browse Source
This commit is contained in:
Andrés Moya 2024-02-05 17:08:19 +01:00 committed by Andrey Antukh
parent 42a0152c3a
commit 836781be42
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
common/src/app/common/types/container.cljc
View File

@ -110,21 +110,25 @@
"Get the parent top shape linked to a component for this shape, if any" "Get the parent top shape linked to a component for this shape, if any"
([objects shape] (get-component-shape objects shape nil)) ([objects shape] (get-component-shape objects shape nil))
([objects shape {:keys [allow-main?] :or {allow-main? false} :as options}] ([objects shape {:keys [allow-main?] :or {allow-main? false} :as options}]
(cond (let [parent (get objects (:parent-id shape))]
(nil? shape) (cond
nil (nil? shape)
nil
(cfh/root? shape) (cfh/root? shape)
nil nil
(ctk/instance-root? shape) (ctk/instance-root? shape)
shape shape
(and (not (ctk/in-component-copy? shape)) (not allow-main?)) (and (not (ctk/in-component-copy? shape)) (not allow-main?))
nil nil
:else (and (ctk/instance-head? shape) (not (ctk/in-component-copy? parent)))
(get-component-shape objects (get objects (:parent-id shape)) options)))) shape ; This case is a copy root inside a main component
:else
(get-component-shape objects parent options)))))
(defn get-head-shape (defn get-head-shape
"Get the parent top or nested shape linked to a component for this shape, if any" "Get the parent top or nested shape linked to a component for this shape, if any"