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

🐛 Fix import/export with SVG edge cases

Browse source
This commit is contained in:
alonso.torres 2022-01-13 18:24:55 +01:00
parent 5f3c381f88
commit 045eec072b
6 changed files with 40 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

34
frontend/src/app/util/import/parser.cljs
View file

@ -22,6 +22,9 @@
(def uuid-regex
#"\w{8}-\w{4}-\w{4}-\w{4}-\w{12}")
(def uuid-regex-prefix
#"\w{8}-\w{4}-\w{4}-\w{4}-\w{12}-")
(defn valid?
[root]
(contains? (:attrs root) :xmlns:penpot))
@ -554,20 +557,31 @@
(defn remove-prefix [s]
(cond-> s
(string? s)
(str/replace (re-pattern (str uuid-regex "-")) "")))
(str/replace uuid-regex-prefix "")))
(defn get-svg-attrs
[svg-data svg-attrs]
(let [assoc-key
[svg-import svg-data svg-attrs]
(let [process-attr
(fn [acc prop]
(let [key (keyword prop)]
(if-let [v (or (get svg-data key)
(get-in svg-data [:attrs key]))]
(assoc acc key (remove-prefix v))
acc)))]
(cond
(and (= prop "style")
(contains? (:attrs svg-import) :penpot:svg-style))
(let [style (get-in svg-import [:attrs :penpot:svg-style])]
(assoc acc :style (parse-style style)))
(and (= prop "filter")
(contains? (:attrs svg-import) :penpot:svg-filter))
(let [style (get-in svg-import [:attrs :penpot:svg-filter])]
(assoc acc :filter (parse-style style)))
:else
(let [key (keyword prop)]
(if-let [v (or (get svg-data key)
(get-in svg-data [:attrs key]))]
(assoc acc key (remove-prefix v))
acc))))]
(->> (str/split svg-attrs ",")
(reduce assoc-key {}))))
(reduce process-attr {}))))
(defn get-svg-defs
[node]
@ -595,7 +609,7 @@
(cond-> props
:true
(assoc :svg-attrs (get-svg-attrs svg-data svg-attrs))
(assoc :svg-attrs (get-svg-attrs svg-import svg-data svg-attrs))
(some? viewbox-x)
(assoc :svg-viewbox {:x (d/parse-double viewbox-x)