From 73a52e53957d0f49601cac7141eee40f9ce6b732 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elena=20Torr=C3=B3?= <elenatorro@gmail.com>
Date: Wed, 19 Feb 2025 10:44:24 +0100
Subject: [PATCH] :bug: Fix opacity in frame containers (#5858)

* :bug: Fix opacity in frame containers

* :paperclip: Improve readability of frame containers by using class names
---
 frontend/src/app/main/ui/shapes/frame.cljs    | 43 +++++++++----------
 .../app/main/ui/workspace/shapes/frame.cljs   |  1 -
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/frontend/src/app/main/ui/shapes/frame.cljs b/frontend/src/app/main/ui/shapes/frame.cljs
index 090091d675..4840e18a86 100644
--- a/frontend/src/app/main/ui/shapes/frame.cljs
+++ b/frontend/src/app/main/ui/shapes/frame.cljs
@@ -94,33 +94,32 @@
     ;; We need to separate blur from shadows because the blur is applied to the strokes
     ;; while the shadows have to be placed *under* the stroke (for example, the inner shadows)
     ;; and the shadows needs to be applied only to the content (without the stroke)
-    [:g {:filter filter-str-blur}
-     [:defs
-      [:& filters/filters {:shape (dissoc shape :blur) :filter-id filter-id-shadows}]
-      [:& filters/filters {:shape (assoc shape :shadow []) :filter-id filter-id-blur}]]
+    [:g.frame-container-wrapper {:opacity opacity}
+     [:g.frame-container-blur {:filter filter-str-blur}
+      [:defs
+       [:& filters/filters {:shape (dissoc shape :blur) :filter-id filter-id-shadows}]
+       [:& filters/filters {:shape (assoc shape :shadow []) :filter-id filter-id-blur}]]
 
      ;; This need to be separated in two layers so the clip doesn't affect the shadow filters
      ;; otherwise the shadow will be clipped and not visible
-     [:g {:filter filter-str-shadows}
-      [:g {:clip-path (when-not ^boolean show-content? (frame-clip-url shape render-id))
-           ;; A frame sets back normal fill behavior (default
-           ;; transparent). It may have been changed to default black
-           ;; if a shape coming from an imported SVG file is
-           ;; rendered. See main.ui.shapes.attrs/add-style-attrs.
-           :fill "none"
-           :opacity opacity}
+      [:g.frame-container-shadows {:filter filter-str-shadows}
+       [:g {:clip-path (when-not ^boolean show-content? (frame-clip-url shape render-id))
+        ;; A frame sets back normal fill behavior (default
+        ;; transparent). It may have been changed to default black
+        ;; if a shape coming from an imported SVG file is
+        ;; rendered. See main.ui.shapes.attrs/add-style-attrs.
+            :fill "none"}
 
-       [:& shape-fills {:shape shape}
-        (if ^boolean path?
-          [:> :path props]
-          [:> :rect props])]
+        [:& shape-fills {:shape shape}
+         (if ^boolean path?
+           [:> :path props]
+           [:> :rect props])]
+        children]]
 
-       children]]
-
-     [:& shape-strokes {:shape shape}
-      (if ^boolean path?
-        [:> :path props]
-        [:> :rect props])]]))
+      [:& shape-strokes {:shape shape}
+       (if ^boolean path?
+         [:> :path props]
+         [:> :rect props])]]]))
 
 (mf/defc frame-thumbnail-image
   {::mf/wrap-props false}
diff --git a/frontend/src/app/main/ui/workspace/shapes/frame.cljs b/frontend/src/app/main/ui/workspace/shapes/frame.cljs
index 5eb3923279..27b6ae38a5 100644
--- a/frontend/src/app/main/ui/workspace/shapes/frame.cljs
+++ b/frontend/src/app/main/ui/workspace/shapes/frame.cljs
@@ -185,7 +185,6 @@
             (d/close! task)))
 
         (fdm/use-dynamic-modifiers objects (mf/ref-val content-ref) modifiers)
-
         [:& shape-container {:shape shape}
          [:g.frame-container
           {:id (dm/str "frame-container-" frame-id)