Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-03-13 00:01:51 -05:00
Code Issues Activity

🐛 Repair shape points if it is possible on comp-v2 migration

Browse source
This commit is contained in:
Andrey Antukh 2024-01-29 18:34:56 +01:00
parent 3ea737deb1
commit 03eca0d9a2
1 changed files with 42 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -332,6 +332,47 @@
(some? (:main-instance shape)) (some? (:main-instance shape))
(dissoc shape :main-instance) (dissoc shape :main-instance)
(and (cfh/text-shape? shape)
(valid-text-content? (:content shape))
(not (valid-shape-points? (:points shape)))
(seq (:position-data shape)))
(as-> shape
(let [selrect (->> (:position-data shape)
(map (juxt :x :y :width :height))
(map #(apply grc/make-rect %))
(grc/join-rects))
points (grc/rect->points selrect)]
(assoc shape
:x (:x selrect)
:y (:y selrect)
:width (:width selrect)
:height (:height selrect)
:selrect selrect
:points points)))
(and (or (cfh/rect-shape? shape)
(cfh/svg-raw-shape? shape))
(not (valid-shape-points? (:points shape)))
(grc/valid-rect? (:selrect shape)))
(as-> shape
(let [selrect (if (grc/valid-rect? (:svg-viewbox shape))
(:svg-viewbox shape)
(:selrect shape))
points (grc/rect->points selrect)]
(assoc shape
:x (:x selrect)
:y (:y selrect)
:width (:width selrect)
:height (:height selrect)
:selrect selrect
:points points)))
(and (cfh/group-shape? shape)
(grc/valid-rect? (:selrect shape))
(not (valid-shape-points? (:points shape))))
(assoc :points (grc/rect->points (:selrect shape)))
;; Fix broken fills ;; Fix broken fills
(seq (:fills shape)) (seq (:fills shape))
(update :fills (fn [fills] (filterv valid-fill? fills))) (update :fills (fn [fills] (filterv valid-fill? fills)))
@ -736,7 +777,6 @@
(-> file-data (-> file-data
(fix-file-data) (fix-file-data)
(fix-page-invalid-options) (fix-page-invalid-options)
(fix-completly-broken-shapes)
(fix-bad-children) (fix-bad-children)
(fix-misc-shape-issues) (fix-misc-shape-issues)
(fix-recent-colors) (fix-recent-colors)
@ -744,6 +784,7 @@
(fix-text-shapes-converted-to-path) (fix-text-shapes-converted-to-path)
(fix-broken-paths) (fix-broken-paths)
(delete-big-geometry-shapes) (delete-big-geometry-shapes)
(fix-completly-broken-shapes)
(fix-broken-parents) (fix-broken-parents)
(fix-orphan-shapes) (fix-orphan-shapes)
(fix-orphan-copies) (fix-orphan-copies)