Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-09 16:30:37 -05:00
Code Issues Activity

Merge pull request #3102 from penpot/alotor-bugfixing-16

Browse source 
SVG Uploading fixes
This commit is contained in:
Alejandro 2023-04-04 10:14:10 +02:00 committed by GitHub
commit dc7e62245d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 55 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CHANGES.md
View file

@ -1,5 +1,12 @@
# CHANGELOG
## 1.18.1
### :bug: Bugs fixed
- Fix problems with imported SVG shadows [Taiga #4922](https://tree.taiga.io/project/penpot/issue/4922)
- Fix problems with imported SVG embedded images and transforms [Taiga #4639](https://tree.taiga.io/project/penpot/issue/4639)
## 1.18.0
### :sparkles: New features

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

@ -181,7 +181,7 @@
(-> (update-in [:svg-attrs :style] dissoc :mix-blend-mode)
(assoc :blend-mode (-> (get-in shape [:svg-attrs :style :mix-blend-mode]) keyword)))))
(defn create-raw-svg [name frame-id svg-data {:keys [attrs] :as data}]
(defn create-raw-svg [name frame-id svg-data {:keys [tag attrs] :as data}]
(let [{:keys [x y width height offset-x offset-y]} svg-data]
(-> {:id (uuid/next)
:type :svg-raw
@ -191,6 +191,7 @@
:height height
:x x
:y y
:hidden (= tag :defs)
:content (cond-> data
(map? data) (update :attrs usvg/clean-attrs))}
(assoc :svg-attrs attrs)
@ -388,7 +389,7 @@
disp-matrix (str (gmt/translate-matrix displacement))
element-data (-> element-data
(assoc :tag :g)
(update :attrs dissoc :x :y :width :height :href :xlink:href)
(update :attrs dissoc :x :y :width :height :href :xlink:href :transform)
(update :attrs usvg/add-transform disp-matrix)
(assoc :content [use-data]))]
(parse-svg-element frame-id svg-data element-data unames))
@ -419,7 +420,7 @@
hidden (assoc :hidden true))
children (cond->> (:content element-data)
(or (= tag :g) (= tag :svg))
(contains? usvg/parent-tags tag)
(mapv #(usvg/inherit-attributes attrs %)))]
[shape children]))))))
@ -469,12 +470,12 @@
(rx/map (fn [uri]
(merge
{:file-id file-id
:is-local true}
:is-local true
:url uri}
(if (str/starts-with? uri "data:")
{:name "image"
:content (data-uri->blob uri)}
{:name (extract-name uri)
:url uri}))))
{:name (extract-name uri)}))))
(rx/mapcat (fn [uri-data]
(->> (rp/command! (if (contains? uri-data :content)
:upload-file-media-object
@ -577,12 +578,9 @@
(pcb/add-object new-shape))
changes
(reduce (fn [changes [index new-child]]
(-> changes
(pcb/add-object new-child)
(pcb/change-parent (:parent-id new-child) [new-child] index)))
changes
(d/enumerate new-children))
(reduce (fn [changes new-child]
(-> changes (pcb/add-object new-child)))
changes new-children)
changes (pcb/resize-parents changes
(->> changes

15
frontend/src/app/main/ui/shapes/shape.cljs
View file

@ -67,6 +67,14 @@
shape-without-blur (dissoc shape :blur)
shape-without-shadows (assoc shape :shadow [])
filter-str
(when (and (or (cph/group-shape? shape)
(cph/frame-shape? shape)
(cph/svg-raw-shape? shape))
(not disable-shadows?))
(filters/filter-str filter-id shape))
wrapper-props
(-> (obj/clone props)
(obj/without ["shape" "children" "disable-shadows?"])
@ -79,11 +87,8 @@
(= :group type)
(attrs/add-style-attrs shape render-id)
(and (or (cph/group-shape? shape)
(cph/frame-shape? shape)
(cph/svg-raw-shape? shape))
(not disable-shadows?))
(obj/set! "filter" (filters/filter-str filter-id shape)))
(some? filter-str)
(obj/set! "filter" filter-str))
svg-group? (and (contains? shape :svg-attrs) (= :group type))

10
frontend/src/app/main/ui/shapes/svg_defs.cljs
View file

@ -64,6 +64,16 @@
(or transform-filter?
transform-mask?) (merge bounds)))
;; Fixes race condition with dynamic modifiers forcing redraw this properties before
;; the effect triggers
attrs
(cond-> attrs
(or (= tag :filter) (= tag :mask))
(merge {:data-old-x (:x attrs)
:data-old-y (:y attrs)
:data-old-width (:width attrs)
:data-old-height (:height attrs)}))
[wrapper wrapper-props] (if (= tag :mask)
["g" #js {:className "svg-mask-wrapper"
:transform (str transform)}]

4
frontend/src/app/main/ui/workspace/shapes.cljs
View file

@ -100,10 +100,8 @@
opts #js {:shape shape :thumbnail? thumbnail?}
svg-leaf? (and (= :svg-raw (:type shape)) (string? (:content shape)))
[wrapper wrapper-props]
(if svg-leaf?
(if (= :svg-raw (:type shape))
[mf/Fragment nil]
["g" #js {:className "workspace-shape-wrapper"}])]

13
frontend/src/app/main/ui/workspace/shapes/frame/dynamic_modifiers.cljs
View file

@ -181,11 +181,14 @@
(or (= (dom/get-tag-name node) "mask")
(= (dom/get-tag-name node) "filter"))
(do
(dom/set-attribute! node "x" (dom/get-attribute node "data-old-x"))
(dom/set-attribute! node "y" (dom/get-attribute node "data-old-y"))
(dom/set-attribute! node "width" (dom/get-attribute node "data-old-width"))
(dom/set-attribute! node "height" (dom/get-attribute node "data-old-height"))
(let [old-x (dom/get-attribute node "data-old-x")
old-y (dom/get-attribute node "data-old-y")
old-width (dom/get-attribute node "data-old-width")
old-height (dom/get-attribute node "data-old-height")]
(dom/set-attribute! node "x" old-x)
(dom/set-attribute! node "y" old-y)
(dom/set-attribute! node "width" old-width)
(dom/set-attribute! node "height" old-height)
(dom/remove-attribute! node "data-old-x")
(dom/remove-attribute! node "data-old-y")

9
frontend/src/app/util/svg.cljs
View file

@ -389,7 +389,8 @@
:mask-type})
(defonce inheritable-props
[:clip-rule
[:style
:clip-rule
:color
:color-interpolation
:color-interpolation-filters
@ -458,6 +459,12 @@
:feTile
:feTurbulence})
(def parent-tags
#{:g
:svg
:text
:tspan})
;; By spec: https://www.w3.org/TR/SVG11/single-page.html#struct-GElement
(defonce svg-group-safe-tags
#{:animate

2
version.txt
View file

@ -1 +1 @@
1.18.0
1.18.1