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

🐛 Fix import svgs with currentColor as stroke fill

Browse source
This commit is contained in:
Alejandro Alonso 2023-01-20 09:17:04 +01:00
parent 9c66998530
commit be74cd2c7b
1 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
frontend/src/app/main/data/workspace/svg_upload.cljs
View file

@ -81,13 +81,13 @@
color-style (str/trim (get-in shape [:svg-attrs :style :fill])) color-style (str/trim (get-in shape [:svg-attrs :style :fill]))
color-style (if (= color-style "currentColor") clr/black color-style)] color-style (if (= color-style "currentColor") clr/black color-style)]
(cond-> shape (cond-> shape
;; Color present as attribute ;; Color present as attribute
(uc/color? color-attr) (uc/color? color-attr)
(-> (update :svg-attrs dissoc :fill) (-> (update :svg-attrs dissoc :fill)
(update-in [:svg-attrs :style] dissoc :fill) (update-in [:svg-attrs :style] dissoc :fill)
(assoc-in [:fills 0 :fill-color] (uc/parse-color color-attr))) (assoc-in [:fills 0 :fill-color] (uc/parse-color color-attr)))
;; Color present as style ;; Color present as style
(uc/color? color-style) (uc/color? color-style)
(-> (update-in [:svg-attrs :style] dissoc :fill) (-> (update-in [:svg-attrs :style] dissoc :fill)
(update :svg-attrs dissoc :fill) (update :svg-attrs dissoc :fill)
@ -110,20 +110,22 @@
(get-in shape [:svg-attrs :style :stroke-linecap])) (get-in shape [:svg-attrs :style :stroke-linecap]))
((d/nilf str/trim)) ((d/nilf str/trim))
((d/nilf keyword))) ((d/nilf keyword)))
color-attr (str/trim (get-in shape [:svg-attrs :stroke]))
color-attr (if (= color-attr "currentColor") clr/black color-attr)
color-style (str/trim (get-in shape [:svg-attrs :style :stroke]))
color-style (if (= color-style "currentColor") clr/black color-style)
shape shape
(cond-> shape (cond-> shape
(uc/color? (str/trim (get-in shape [:svg-attrs :stroke]))) ;; Color present as attribute
(uc/color? color-attr)
(-> (update :svg-attrs dissoc :stroke) (-> (update :svg-attrs dissoc :stroke)
(assoc-in [:strokes 0 :stroke-color] (-> (get-in shape [:svg-attrs :stroke]) (assoc-in [:strokes 0 :stroke-color] (uc/parse-color color-attr)))
(str/trim)
(uc/parse-color))))
(uc/color? (str/trim (get-in shape [:svg-attrs :style :stroke]))) ;; Color present as style
(uc/color? color-style)
(-> (update-in [:svg-attrs :style] dissoc :stroke) (-> (update-in [:svg-attrs :style] dissoc :stroke)
(assoc-in [:strokes 0 :stroke-color] (-> (get-in shape [:svg-attrs :style :stroke]) (assoc-in [:strokes 0 :stroke-color] (uc/parse-color color-style)))
(str/trim)
(uc/parse-color))))
(get-in shape [:svg-attrs :stroke-opacity]) (get-in shape [:svg-attrs :stroke-opacity])
(-> (update :svg-attrs dissoc :stroke-opacity) (-> (update :svg-attrs dissoc :stroke-opacity)
@ -133,7 +135,7 @@
(get-in shape [:svg-attrs :style :stroke-opacity]) (get-in shape [:svg-attrs :style :stroke-opacity])
(-> (update-in [:svg-attrs :style] dissoc :stroke-opacity) (-> (update-in [:svg-attrs :style] dissoc :stroke-opacity)
(assoc-in [:strokes 0 :stroke-opacity] (-> (get-in shape [:svg-attrs :style :stroke-opacity]) (assoc-in [:strokes 0 :stroke-opacity] (-> (get-in shape [:svg-attrs :style :stroke-opacity])
(d/parse-double)))) (d/parse-double))))
(get-in shape [:svg-attrs :stroke-width]) (get-in shape [:svg-attrs :stroke-width])
(-> (update :svg-attrs dissoc :stroke-width) (-> (update :svg-attrs dissoc :stroke-width)