CalvinBackup/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-03-22 02:13:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Remove the swap slot on some operations with copies

Browse Source
This commit is contained in:
Pablo Alba
2024-03-21 17:36:43 +01:00
committed by Andrés Moya
parent ad3e44258a
commit 065d481cb5
6 changed files with 82 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/src/app/common/types/component.cljc
View File

@@ -197,6 +197,12 @@
(or (= slot-main slot-inst)
(= (:id shape-main) slot-inst)))))
(defn remove-swap-slot
[shape]
(update shape :touched
(fn [touched]
(into #{} (remove #(str/starts-with? (name %) "swap-slot-") touched)))))
(defn get-component-root
[component]
(if (true? (:main-instance-id component))

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

@@ -211,20 +211,33 @@
:else
(get-instance-root objects (get objects (:parent-id shape)))))
(defn find-component-main
"If the shape is a component main instance or is inside one, return that instance"
([objects shape]
(find-component-main objects shape true))
([objects shape only-direct-child?]
(cond
(or (nil? shape) (cfh/root? shape))
nil
(nil? (:parent-id shape)) ; This occurs in the root of components v1
shape
(ctk/main-instance? shape)
shape
(and only-direct-child? ;; If we are asking only for direct childs of a component-main,
(ctk/instance-head? shape)) ;; stop when we found a instance-head that isn't main-instance
nil
(and (not only-direct-child?)
(ctk/instance-root? shape))
nil
:else
(find-component-main objects (get objects (:parent-id shape))))))
(defn inside-component-main?
"Check if the shape is a component main instance or is inside one."
[objects shape]
(cond
(or (nil? shape) (cfh/root? shape))
false
(nil? (:parent-id shape)) ; This occurs in the root of components v1
true
(ctk/main-instance? shape)
true
(ctk/instance-head? shape)
false
:else
(inside-component-main? objects (get objects (:parent-id shape)))))
([objects shape]
(inside-component-main? objects shape true))
([objects shape only-direct-child?]
(some? (find-component-main objects shape only-direct-child?))))
(defn in-any-component?
"Check if the shape is part of any component (main or copy), wether it's