Merge pull request #2333 from DataDog/gonzalezreal/RUM-10305/swiftui-session-replay-privacy-override

Add SwiftUI support for Session Replay privacy overrides

Author: gonzalezreal

CHANGELOG.md

@@ -1,5 +1,7 @@
 # Unreleased
 
+- [FEATURE] Add SwiftUI support for Session Replay privacy overrides. See [#2333][]
+
 # 2.29.0 / 18-06-2025
 
 - [FEATURE] Add SwiftUI auto-tracking for views and actions. See [#2237][] [#2315][]

Datadog/Datadog.xcodeproj/project.pbxproj

@@ -392,6 +392,7 @@
 		49D8C0B82AC5D2160075E427 /* RUM+Internal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49D8C0B62AC5D2160075E427 /* RUM+Internal.swift */; };
 		49D8C0BD2AC5F2BB0075E427 /* Logs+Internal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49D8C0B92AC5F21F0075E427 /* Logs+Internal.swift */; };
 		49D8C0BE2AC5F2BC0075E427 /* Logs+Internal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49D8C0B92AC5F21F0075E427 /* Logs+Internal.swift */; };
+		5BCBC0CD2DF85B6A0094DCC2 /* SessionReplayPrivacyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BCBC0CC2DF85AFE0094DCC2 /* SessionReplayPrivacyView.swift */; };
 		61020C2A2757AD91005EEAEA /* BackgroundLocationMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61020C292757AD91005EEAEA /* BackgroundLocationMonitor.swift */; };
 		61020C2C2758E853005EEAEA /* DebugBackgroundEventsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61020C2B2758E853005EEAEA /* DebugBackgroundEventsViewController.swift */; };
 		61054E612A6EE10A00AAA894 /* SRCompression.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61054E082A6EE10A00AAA894 /* SRCompression.swift */; };
@@ -2469,6 +2470,7 @@
 		49274908288048F400ECD49B /* RUMInternalProxyTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RUMInternalProxyTests.swift; sourceTree = "<group>"; };
 		49D8C0B62AC5D2160075E427 /* RUM+Internal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "RUM+Internal.swift"; sourceTree = "<group>"; };
 		49D8C0B92AC5F21F0075E427 /* Logs+Internal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Logs+Internal.swift"; sourceTree = "<group>"; };
+		5BCBC0CC2DF85AFE0094DCC2 /* SessionReplayPrivacyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionReplayPrivacyView.swift; sourceTree = "<group>"; };
 		61020C292757AD91005EEAEA /* BackgroundLocationMonitor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackgroundLocationMonitor.swift; sourceTree = "<group>"; };
 		61020C2B2758E853005EEAEA /* DebugBackgroundEventsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DebugBackgroundEventsViewController.swift; sourceTree = "<group>"; };
 		61054E082A6EE10A00AAA894 /* SRCompression.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SRCompression.swift; sourceTree = "<group>"; };
@@ -4031,6 +4033,7 @@
 				966253B52C98807400B90B63 /* SessionReplayPrivacyOverrides.swift */,
 				A795069B2B974C8100AC4814 /* SessionReplay+objc.swift */,
 				96F25A802CC7EA4300459567 /* SessionReplayPrivacyOverrides+objc.swift */,
+				5BCBC0CC2DF85AFE0094DCC2 /* SessionReplayPrivacyView.swift */,
 				96F25A812CC7EA4300459567 /* UIView+SessionReplayPrivacyOverrides+objc.swift */,
 				61054E3B2A6EE10A00AAA894 /* Feature */,
 				61054E482A6EE10A00AAA894 /* Processor */,
@@ -8610,6 +8613,7 @@
 				D2AD1CC62CE4AE6600106C74 /* Color.swift in Sources */,
 				D2AD1CC72CE4AE6600106C74 /* Text+Reflection.swift in Sources */,
 				D2AD1CC82CE4AE6600106C74 /* Text.swift in Sources */,
+				5BCBC0CD2DF85B6A0094DCC2 /* SessionReplayPrivacyView.swift in Sources */,
 				D2AD1CC92CE4AE6600106C74 /* SwiftUIWireframesBuilder.swift in Sources */,
 				969B3B212C33F80500D62400 /* UIActivityIndicatorRecorder.swift in Sources */,
 				61054EA22A6EE10B00AAA894 /* Scheduler.swift in Sources */,

DatadogSessionReplay/SRSnapshotTests/SRFixtures/Sources/SRFixtures/Fixtures.swift

@@ -7,7 +7,11 @@
 import UIKit
 import SwiftUI
 
-public enum Fixture: CaseIterable {
+public protocol FixtureProtocol {
+    func instantiateViewController() -> UIViewController
+}
+
+public enum Fixture: FixtureProtocol, CaseIterable {
     case basicShapes
     case basicTexts
     case sliders

DatadogSessionReplay/SRSnapshotTests/SRFixtures/Sources/SRFixtures/Resources/Image+Assets.swift

@@ -0,0 +1,18 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+import SwiftUI
+
+@available(iOS 13.0, *)
+extension Image {
+    public static var datadogLogo: Image {
+        Image("dd_logo", bundle: .module)
+    }
+
+    public static var flowers: Image {
+        Image("Flowers_1", bundle: .module)
+    }
+}

DatadogSessionReplay/SRSnapshotTests/SRHost/AppDelegate.swift

@@ -20,7 +20,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set<UISceneSession>) {}
 
     /// Presents view controller for given fixture in full screen.
-    func show(fixture: Fixture, completion: @escaping (UIViewController) -> Void) {
+    func show(fixture: any FixtureProtocol, completion: @escaping (UIViewController) -> Void) {
         let vc = fixture.instantiateViewController()
         vc.modalPresentationStyle = .fullScreen
 

DatadogSessionReplay/SRSnapshotTests/SRSnapshotTests.xcodeproj/project.pbxproj

@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		5BB746152E02ABB900B568F1 /* SwiftUIFixture.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BB746142E02ABB500B568F1 /* SwiftUIFixture.swift */; };
+		5BB746182E02B4CD00B568F1 /* SwiftUIViewWithPrivacyOverrides.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BB746172E02B4CD00B568F1 /* SwiftUIViewWithPrivacyOverrides.swift */; };
 		614396642A5E8C0600197326 /* Environment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 614396632A5E8C0600197326 /* Environment.swift */; };
 		614396652A5E8C0600197326 /* Environment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 614396632A5E8C0600197326 /* Environment.swift */; };
 		619C49B429952E12006B66A6 /* SnapshotTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 619C49B329952E12006B66A6 /* SnapshotTestCase.swift */; };
@@ -38,6 +40,8 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		5BB746142E02ABB500B568F1 /* SwiftUIFixture.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftUIFixture.swift; sourceTree = "<group>"; };
+		5BB746172E02B4CD00B568F1 /* SwiftUIViewWithPrivacyOverrides.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftUIViewWithPrivacyOverrides.swift; sourceTree = "<group>"; };
 		614396632A5E8C0600197326 /* Environment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Environment.swift; path = SRHost/Environment.swift; sourceTree = "<group>"; };
 		619C49B329952E12006B66A6 /* SnapshotTestCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SnapshotTestCase.swift; sourceTree = "<group>"; };
 		619C49B62995512A006B66A6 /* ImageComparison.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageComparison.swift; sourceTree = "<group>"; };
@@ -86,9 +90,18 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		5BB746162E02B34600B568F1 /* Fixtures */ = {
+			isa = PBXGroup;
+			children = (
+				5BB746172E02B4CD00B568F1 /* SwiftUIViewWithPrivacyOverrides.swift */,
+			);
+			path = Fixtures;
+			sourceTree = "<group>";
+		};
 		619C49B529955106006B66A6 /* Utils */ = {
 			isa = PBXGroup;
 			children = (
+				5BB746142E02ABB500B568F1 /* SwiftUIFixture.swift */,
 				619C49B329952E12006B66A6 /* SnapshotTestCase.swift */,
 				96363B2B2CD26AF3006FEC9D /* PrivacyOverrides.swift */,
 				61BB975E2A5D675400AFFF86 /* ImageComposition.swift */,
@@ -137,6 +150,7 @@
 			isa = PBXGroup;
 			children = (
 				61B3BC642993BEAF0032C78A /* SRSnapshotTests.swift */,
+				5BB746162E02B34600B568F1 /* Fixtures */,
 				619C49B529955106006B66A6 /* Utils */,
 				619C49B8299551F5006B66A6 /* _snapshots_ */,
 			);
@@ -293,8 +307,10 @@
 				61B3BC652993BEAF0032C78A /* SRSnapshotTests.swift in Sources */,
 				96363B2C2CD26AF3006FEC9D /* PrivacyOverrides.swift in Sources */,
 				61BB975F2A5D675400AFFF86 /* ImageComposition.swift in Sources */,
+				5BB746182E02B4CD00B568F1 /* SwiftUIViewWithPrivacyOverrides.swift in Sources */,
 				619C49B72995512A006B66A6 /* ImageComparison.swift in Sources */,
 				619C49B429952E12006B66A6 /* SnapshotTestCase.swift in Sources */,
+				5BB746152E02ABB900B568F1 /* SwiftUIFixture.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

DatadogSessionReplay/SRSnapshotTests/SRSnapshotTests/Fixtures/SwiftUIViewWithPrivacyOverrides.swift

@@ -0,0 +1,77 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+import SwiftUI
+import DatadogSessionReplay
+import DatadogInternal
+import SRFixtures
+
+@available(iOS 16.0, *)
+struct SwiftUIViewWithPrivacyOverrides: View {
+    private let core: DatadogCoreProtocol
+
+    init(core: DatadogCoreProtocol) {
+        self.core = core
+    }
+
+    var body: some View {
+        SessionReplayPrivacyView(imagePrivacy: .maskNonBundledOnly, core: core) {
+            VStack(spacing: 10) {
+                SessionReplayPrivacyView(textAndInputPrivacy: .maskAllInputs, core: core) {
+                    Text("Hello, SwiftUI!")
+                        .font(.headline)
+
+                    Label("Label with Icon", systemImage: "star.fill")
+                        .font(.subheadline)
+                        .foregroundStyle(.secondary)
+
+                    TextField("Enter text", text: .constant("Placeholder text"))
+                        .textFieldStyle(RoundedBorderTextFieldStyle())
+                        .padding(8)
+                }
+
+                SessionReplayPrivacyView(hide: true, core: core) {
+                    Button(action: {}) {
+                        Text("SwiftUI Button")
+                            .padding()
+                            .foregroundStyle(.background)
+                            .background(Color.blue)
+                            .cornerRadius(8)
+                    }
+                }
+
+                Divider()
+                    .frame(height: 2)
+                    .background(Color.purple)
+                    .padding(.horizontal, 20)
+                    .padding(.vertical, 6)
+
+                // "Bundled" image
+                Image.datadogLogo
+                    .resizable()
+                    .scaledToFit()
+                    .background(Color.purple)
+                    .frame(width: 120, height: 120)
+                    .clipped()
+
+                // "Content" image
+                Image.flowers
+                    .resizable()
+                    .scaledToFit()
+                    .background(Color.purple)
+                    .frame(width: 120, height: 120)
+                    .clipped()
+
+                List {
+                    Text("Item 1")
+                    SessionReplayPrivacyView(textAndInputPrivacy: .maskAll, core: core) {
+                        Text("Item 2")
+                    }
+                }.frame(height: 140)
+            }
+        }
+    }
+}