Merge pull request #2236 from DataDog/maxep/RUM-8847/fix-uikit-swiftui-navigation-tracking

RUM-8847 Remove automatic `RUMUntrackedModal`

Co-authored-by: maxep <maxime.epain@datadoghq.com>

Author: dd-mergequeue[bot]

DatadogRUM/Sources/Instrumentation/Views/RUMViewsHandler.swift

@@ -242,17 +242,6 @@ extension RUMViewsHandler: UIViewControllerHandler {
                     instrumentationType: .swiftui
                 )
             )
-        } else if #available(iOS 13, tvOS 13, *), viewController.isModalInPresentation {
-            add(
-                view: .init(
-                    identity: identity,
-                    name: "RUMUntrackedModal",
-                    path: viewController.canonicalClassName,
-                    isUntrackedModal: true,
-                    attributes: [:],
-                    instrumentationType: .uikit
-                )
-            )
         }
     }
 

DatadogRUM/Tests/Instrumentation/Views/RUMViewsHandlerTests.swift

@@ -440,57 +440,6 @@ class RUMViewsHandlerTests: XCTestCase {
         XCTAssertTrue(startCommand2.identity == ViewIdentifier(someView))
     }
 
-    func testGiveniOS13AppearedView_whenTransitioningToModal_viewDoesStop() throws {
-        if #available(iOS 13, tvOS 13, *) {
-            // Given
-            let someView = createMockViewInWindow()
-            let untrackedModal = createMockViewInWindow()
-            untrackedModal.isModalInPresentation = true
-
-            let uiKitPredicate = UIKitPredicateWithModalMock(untrackedModal: untrackedModal)
-            let handler = createHandler(uiKitPredicate: uiKitPredicate)
-
-            // When
-            handler.notify_viewDidAppear(viewController: someView, animated: .mockAny())
-            handler.notify_viewDidAppear(viewController: untrackedModal, animated: .mockAny())
-
-            XCTAssertEqual(commandSubscriber.receivedCommands.count, 2)
-
-            let startCommand = try XCTUnwrap(commandSubscriber.receivedCommands[0] as? RUMStartViewCommand)
-            let stopCommand = try XCTUnwrap(commandSubscriber.receivedCommands[1] as? RUMStopViewCommand)
-
-            XCTAssertTrue(startCommand.identity == ViewIdentifier(someView))
-            XCTAssertTrue(stopCommand.identity == ViewIdentifier(someView))
-        }
-    }
-
-    func testGiveniOS13Modal_whenTransitioningToAppearedView_viewDoesStart() throws {
-        if #available(iOS 13, tvOS 13, *) {
-            // Given
-            let someView = createMockViewInWindow()
-            let untrackedModal = createMockViewInWindow()
-            untrackedModal.isModalInPresentation = true
-
-            let uiKitPredicate = UIKitPredicateWithModalMock(untrackedModal: untrackedModal)
-            let handler = createHandler(uiKitPredicate: uiKitPredicate)
-
-            // When
-            handler.notify_viewDidAppear(viewController: someView, animated: .mockAny())
-            handler.notify_viewDidAppear(viewController: untrackedModal, animated: .mockAny())
-            handler.notify_viewDidAppear(viewController: someView, animated: .mockAny())
-
-            XCTAssertEqual(commandSubscriber.receivedCommands.count, 3)
-
-            let startCommand = try XCTUnwrap(commandSubscriber.receivedCommands[0] as? RUMStartViewCommand)
-            let stopCommand = try XCTUnwrap(commandSubscriber.receivedCommands[1] as? RUMStopViewCommand)
-            let startCommand2 = try XCTUnwrap(commandSubscriber.receivedCommands[2] as? RUMStartViewCommand)
-
-            XCTAssertTrue(startCommand.identity == ViewIdentifier(someView))
-            XCTAssertTrue(stopCommand.identity == ViewIdentifier(someView))
-            XCTAssertTrue(startCommand2.identity == ViewIdentifier(someView))
-        }
-    }
-
     // MARK: - Handling Manual SwiftUI Instrumentation `.onAppear`
 
     func testWhenOnAppear_itStartsRUMView() throws {

IntegrationTests/Runner/Scenarios/RUM/SwiftUIInstrumentation/SwiftUIRootViewController.swift

@@ -94,8 +94,11 @@ struct ScreenView: View {
 
     var body: some View {
         VStack(spacing: 32) {
-            NavigationLink("Push to Next View", destination: destination)
-                .trackRUMTapAction(name: "Tap Push to Next View")
+            NavigationLink(
+                "Push to Next View",
+                destination: destination.dd_interactiveDismissDisabled()
+            )
+            .trackRUMTapAction(name: "Tap Push to Next View")
 
             Text("This is a Label")
 
@@ -189,3 +192,14 @@ class UIScreenViewController: UIViewController {
     }
 }
 
+@available(iOS 13, *)
+extension View {
+    func dd_interactiveDismissDisabled(_ isDisabled: Bool = true) -> some View {
+        if #available(iOS 15.0, *) {
+            return interactiveDismissDisabled(isDisabled)
+        } else {
+            return self
+        }
+    }
+}
+