From 6090cf6c6802b4bd56ac74e702482a4aa894ca27 Mon Sep 17 00:00:00 2001
From: "alonso.torres" <alonso.torres@kaleidos.net>
Date: Thu, 13 Jan 2022 15:15:55 +0100
Subject: [PATCH] :bug: Fix problem with imported svgs with filters

---
 CHANGES.md                                 |  1 +
 frontend/src/app/main/ui/shapes/attrs.cljs | 35 ++++++++++++----------
 frontend/src/app/main/ui/shapes/shape.cljs |  2 +-
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 226638e16..e85bee7c6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -52,6 +52,7 @@
 - Fix blur input field when click on viewport [Taiga #2164](https://tree.taiga.io/project/penpot/issue/2164)
 - Fix default page id in workspace [Taiga #2205](https://tree.taiga.io/project/penpot/issue/2205)
 - Fix problem when importing a file with grids [Taiga #2314](https://tree.taiga.io/project/penpot/issue/2314)
+- Fix problem with imported svgs with filters [Taiga #2478](https://tree.taiga.io/project/penpot/issue/2478)
 - Fix issues when updating selrect in paths [Taiga #2366](https://tree.taiga.io/project/penpot/issue/2366)
 - Fix scroll jumps in handoff mode [Taiga #2383](https://tree.taiga.io/project/penpot/issue/2383)
 - Fix handoff text with opacity [Taiga #2384](https://tree.taiga.io/project/penpot/issue/2384)
diff --git a/frontend/src/app/main/ui/shapes/attrs.cljs b/frontend/src/app/main/ui/shapes/attrs.cljs
index 8c72f7294..ae5967d1b 100644
--- a/frontend/src/app/main/ui/shapes/attrs.cljs
+++ b/frontend/src/app/main/ui/shapes/attrs.cljs
@@ -179,25 +179,28 @@
     [attrs styles]))
 
 (defn add-style-attrs
-  [props shape]
-  (let [render-id (mf/use-ctx muc/render-ctx)
-        svg-defs  (:svg-defs shape {})
-        svg-attrs (:svg-attrs shape {})
+  ([props shape]
+   (let [render-id (mf/use-ctx muc/render-ctx)]
+     (add-style-attrs props shape render-id)))
 
-        [svg-attrs svg-styles] (mf/use-memo
-                                (mf/deps render-id svg-defs svg-attrs)
-                                #(extract-svg-attrs render-id svg-defs svg-attrs))
+  ([props shape render-id]
+   (let [svg-defs  (:svg-defs shape {})
+         svg-attrs (:svg-attrs shape {})
 
-        styles (-> (obj/get props "style" (obj/new))
-                   (obj/merge! svg-styles)
-                   (add-fill shape render-id)
-                   (add-stroke shape render-id)
-                   (add-layer-props shape))]
+         [svg-attrs svg-styles] (mf/use-memo
+                                 (mf/deps render-id svg-defs svg-attrs)
+                                 #(extract-svg-attrs render-id svg-defs svg-attrs))
 
-    (-> props
-        (obj/merge! svg-attrs)
-        (add-border-radius shape)
-        (obj/set! "style" styles))))
+         styles (-> (obj/get props "style" (obj/new))
+                    (obj/merge! svg-styles)
+                    (add-fill shape render-id)
+                    (add-stroke shape render-id)
+                    (add-layer-props shape))]
+
+     (-> props
+         (obj/merge! svg-attrs)
+         (add-border-radius shape)
+         (obj/set! "style" styles)))))
 
 (defn extract-style-attrs
   [shape]
diff --git a/frontend/src/app/main/ui/shapes/shape.cljs b/frontend/src/app/main/ui/shapes/shape.cljs
index 961a30e29..cfb73aad9 100644
--- a/frontend/src/app/main/ui/shapes/shape.cljs
+++ b/frontend/src/app/main/ui/shapes/shape.cljs
@@ -53,7 +53,7 @@
           (obj/set! "clipPath" (frame/frame-clip-url shape render-id))
 
           (= :group type)
-          (attrs/add-style-attrs shape))]
+          (attrs/add-style-attrs shape render-id))]
 
     [:& (mf/provider muc/render-ctx) {:value render-id}
      [:> :g wrapper-props