Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-04-01 09:31:26 -05:00
Code Issues Activity

Merge pull request #3715 from penpot/niwinz-develop-bugfixes-14

Browse source 
🐛 Fix issues on importation version handling and bool shapes initialization
This commit is contained in:
Aitor Moreno 2023-10-19 17:09:22 +02:00 • committed by GitHub
commit a49bc07259
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
backend/src/app/rpc/commands/binfile.clj
View file

@ -680,12 +680,17 @@
(let [file-id' (lookup-index file-id)
data (-> (:data file)
(assoc :id file-id')
(assoc :id file-id'))
data (if (> (:version data) cfd/version)
(assoc data :version cfd/version)
data)
data (-> data
(cond-> migrate? (pmg/migrate-data))
(update :pages-index relink-shapes)
(update :components relink-shapes)
(update :media relink-media)
(assoc :version cfd/version)
(postprocess-file))
params {:id file-id'

2
common/src/app/common/files/defaults.cljc
View file

@ -6,4 +6,4 @@
(ns app.common.files.defaults)
(def version 33)
(def version 34)

14
common/src/app/common/files/migrations.cljc
View file

@ -624,3 +624,17 @@
(update container :objects update-vals update-object))]
(-> data
(update :pages-index update-vals update-container))))
(defmethod migrate 34
[data]
(letfn [(update-object [object]
(if (or (cph/path-shape? object)
(cph/bool-shape? object))
(dissoc object :x :y :width :height)
object))
(update-container [container]
(update container :objects update-vals update-object))]
(-> data
(update :pages-index update-vals update-container)
(update :components update-vals update-container))))

5
common/src/app/common/types/shape.cljc
View file

@ -433,7 +433,8 @@
attrs (get-minimal-shape type)]
(cond-> attrs
(not= :path type)
(and (not= :path type)
(not= :bool type))
(-> (assoc :x 0)
(assoc :y 0)
(assoc :width 0.01)
@ -481,7 +482,7 @@
(let [shape (make-minimal-shape type)
shape (merge shape (d/without-nils props))
shape (case (:type shape)
:path (setup-path shape)
(:bool :path) (setup-path shape)
:image (-> shape setup-rect setup-image)
(setup-rect shape))]
(-> shape