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

Merge pull request #3942 from penpot/niwinz-staging-svg-parse-fill-fix

Browse source 
🐛 Fix several issues on svg path parsing
This commit is contained in:
Alejandro 2023-12-28 10:41:52 +01:00 • committed by GitHub
commit 5621c2c394
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 570 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

23
frontend/src/app/main/ui/shapes/custom_stroke.cljs
View file

@ -21,6 +21,9 @@
[cuerdas.core :as str]
[rumext.v2 :as mf]))
;; FIXME: this clearly should be renamed to something different, this
;; namespace has also fill related code
(mf/defc inner-stroke-clip-path
{::mf/wrap-props false}
[{:keys [shape render-id index]}]
@ -449,10 +452,8 @@
(obj/unset! style "fillOpacity")
(obj/set! props "fill" (dm/fmt "url(#fill-%-%)" position render-id)))
(and ^boolean (or (obj/contains? svg-styles "fill")
(obj/contains? svg-styles "fillOpacity"))
(and ^boolean (some? svg-styles)
^boolean (obj/contains? svg-styles "fill"))
(let [fill (obj/get svg-styles "fill")
opacity (obj/get svg-styles "fillOpacity")]
(when (some? fill)
@ -460,8 +461,7 @@
(when (some? opacity)
(obj/set! style "fillOpacity" opacity)))
(and ^boolean (or (obj/contains? svg-attrs "fill")
(obj/contains? svg-attrs "fillOpacity"))
(and ^boolean (some? svg-attrs)
^boolean (empty? shape-fills))
(let [fill (obj/get svg-attrs "fill")
opacity (obj/get svg-attrs "fillOpacity")]
@ -562,13 +562,6 @@
(mf/defc shape-custom-strokes
{::mf/wrap-props false}
[props]
(let [children (unchecked-get props "children")
shape (unchecked-get props "shape")
position (unchecked-get props "position")
render-id (unchecked-get props "render-id")
props #js {:shape shape
:position position
:render-id render-id}]
[:*
[:> shape-fills props children]
[:> shape-strokes props children]]))
[:*
[:> shape-fills props]
[:> shape-strokes props]])

5
frontend/src/app/main/ui/shapes/fills.cljs
View file

@ -17,7 +17,7 @@
(def no-repeat-padding 1.05)
(mf/defc fills*
(mf/defc internal-fills
{::mf/wrap-props false}
[props]
(let [shape (unchecked-get props "shape")
@ -120,7 +120,6 @@
(mf/defc fills
{::mf/wrap-props false}
[props]
(let [shape (unchecked-get props "shape")
type (dm/get-prop shape :type)
image (:fill-image shape)
@ -132,4 +131,4 @@
(> (count fills) 1)
(some :fill-color-gradient fills)
(some :fill-image fills))
[:> fills* props])))
[:> internal-fills props])))