Merge 03bff91 into fff4a70

getsentry · Aug 16, 2024 · f34f2d3 · f34f2d3
2 parents fff4a70 + 03bff91
commit f34f2d3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### Fixes
+
+- Proper redact SR during animation (#4289)
+
 ## 8.34.0
 
 ### Features

diff --git a/Sources/Swift/Tools/UIRedactBuilder.swift b/Sources/Swift/Tools/UIRedactBuilder.swift
@@ -111,7 +111,7 @@ class UIRedactBuilder {
         var redactingRegions = [RedactRegion]()
 
         self.mapRedactRegion(fromView: view,
-                             to: view,
+                             to: view.layer.presentation() ?? view.layer,
                              redacting: &redactingRegions,
                              area: view.frame,
                              redactText: options?.redactAllText ?? true,
@@ -141,8 +141,8 @@ class UIRedactBuilder {
         return image.imageAsset?.value(forKey: "_containingBundle") == nil
     }
 
-    private func mapRedactRegion(fromView view: UIView, to: UIView, redacting: inout [RedactRegion], area: CGRect, redactText: Bool, redactImage: Bool) {
-        let rectInWindow = view.convert(view.bounds, to: to)
+    private func mapRedactRegion(fromView view: UIView, to: CALayer, redacting: inout [RedactRegion], area: CGRect, redactText: Bool, redactImage: Bool) {
+        let rectInWindow = (view.layer.presentation() ?? view.layer).convert(view.bounds, to: to)
         guard (redactImage || redactText) && area.intersects(rectInWindow) && !view.isHidden && view.alpha != 0 else { return }
 
         let ignore = shouldIgnore(view: view)