github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-05-05 16:18:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix problem with duplicate in main component

Browse Source
This commit is contained in:
alonso.torres 2024-03-12 11:55:40 +01:00
parent 3bbf97fde9
commit 786513863b
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -240,3 +240,13 @@
(distinct)
(filter #(not (eq % (get comp1 %) (get comp2 %))))
set)))
(defn allow-duplicate?
[objects shape]
(let [parent (get objects (:parent-id shape))]
;; We don't want to change the structure of component copies
(and (not (in-component-copy-not-head? shape))
;; Non instance, non copy. We allow
(or (not (instance-head? shape))
(not (in-component-copy? parent))))))

4
frontend/src/app/main/data/workspace/selection.cljs
View File

@ -709,8 +709,8 @@
(let [page (wsh/lookup-page state)
objects (:objects page)
selected (->> (wsh/lookup-selected state)
(map #(get objects %))
(remove #(ctk/in-component-copy-not-root? %)) ;; We don't want to change the structure of component copies
(map (d/getf objects))
(filter #(ctk/allow-duplicate? objects %))
(map :id)
set)]
(when (seq selected)