3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-06-04 06:41:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Add a fix for component heads that are not groups or frames

Browse source
This commit is contained in:
Andrés Moya 2024-02-01 14:50:38 +01:00 • committed by Andrey Antukh
parent 04fd4e12d7
commit 750ea4fe3f
1 changed files with 54 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

55
backend/src/app/features/components_v2.clj
View file

@ -667,6 +667,7 @@
(if (some? (:id component)) (if (some? (:id component))
component component
(assoc component :id id)))] (assoc component :id id)))]
(-> file-data (-> file-data
(d/update-when :components #(d/mapm fix-component %))))) (d/update-when :components #(d/mapm fix-component %)))))
@ -730,9 +731,59 @@
(update :pages-index update-vals fix-container) (update :pages-index update-vals fix-container)
(d/update-when :components update-vals fix-container)))) (d/update-when :components update-vals fix-container))))
wrap-non-group-component-roots
(fn [file-data]
;; Some components have a root that is not a group nor a frame
;; (e.g. a path or a svg-raw). We need to wrap them in a frame
;; for this one to became the root.
(letfn [(fix-component [component]
(let [root-shape (ctst/get-shape component (:id component))]
(if (or (cfh/group-shape? root-shape)
(cfh/frame-shape? root-shape))
component
(let [new-id (uuid/next)
frame (-> (cts/setup-shape
{:type :frame
:id (:id component)
:x (:x (:selrect root-shape))
:y (:y (:selrect root-shape))
:width (:width (:selrect root-shape))
:height (:height (:selrect root-shape))
:name (:name component)
:shapes [new-id]})
(assoc :frame-id nil
:parent-id nil))
root-shape' (assoc root-shape
:id new-id
:parent-id (:id frame)
:frame-id (:id frame))]
(update component :objects assoc
(:id frame) frame
(:id root-shape') root-shape')))))]
(-> file-data
(d/update-when :components update-vals fix-component))))
detach-non-group-instance-roots
(fn [file-data]
;; If there is a copy instance whose root is not a frame or a group, it cannot
;; be easily repaired, and anyway it's not working in production, so detach it.
(letfn [(fix-container [container]
(reduce fix-shape container (ctn/shapes-seq container)))
(fix-shape [container shape]
(if (and (ctk/instance-head? shape)
(not (#{:group :frame} (:type shape))))
(detach-shape container shape)
container))]
(-> file-data
(update :pages-index update-vals fix-container)
(d/update-when :components update-vals fix-container))))
transform-to-frames transform-to-frames
(fn [file-data] (fn [file-data]
;; Transform component and copy heads to frames, and set the ;; Transform component and copy heads fron group to frames, and set the
;; frame-id of its childrens ;; frame-id of its childrens
(letfn [(fix-container [container] (letfn [(fix-container [container]
(d/update-when container :objects update-vals fix-shape)) (d/update-when container :objects update-vals fix-shape))
@ -882,6 +933,8 @@
(fix-components-without-id) (fix-components-without-id)
(remap-refs) (remap-refs)
(fix-converted-copies) (fix-converted-copies)
(wrap-non-group-component-roots)
(detach-non-group-instance-roots)
(transform-to-frames) (transform-to-frames)
(remap-frame-ids) (remap-frame-ids)
(fix-frame-ids) (fix-frame-ids)