Switch to SwiftUIIntrospect (#75)

Author: davdroman

.github/workflows/ci.yml

@@ -26,30 +26,26 @@ jobs:
           - mac-catalyst
           - tvOS
         swift:
-          - 5.5
-          - 5.6
           - 5.7
           - 5.8
         include:
-          - swift: 5.5
-            os: macos-12
-          - swift: 5.6
-            os: macos-12
           - swift: 5.7
             os: macos-13
           - swift: 5.8
             os: macos-13
     steps:
-      - uses: actions/checkout@v3
+      - name: Git Checkout
+        uses: actions/checkout@v3
+
       - name: Test Library
         uses: mxcl/xcodebuild@v2
         with:
           platform: ${{ matrix.platform }}
           swift: ~${{ matrix.swift }}
           action: test
           scheme: NavigationTransitions
-      - if: ${{ matrix.swift >= 5.7 }}
-        name: Build Examples/Demo
+
+      - name: Build Examples/Demo
         uses: mxcl/xcodebuild@v2
         with:
           platform: ${{ matrix.platform }}

Package.resolved

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.5
+// swift-tools-version: 5.7
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -15,14 +15,14 @@ let package = Package(
 // MARK: Dependencies
 
 package.dependencies = [
-	.package(url: "https://github.com/siteline/SwiftUI-Introspect", from: "0.1.4"),
-	.package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "0.6.0"), // dev
-	.package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "0.5.0"), // dev
+	.package(url: "https://github.com/siteline/swiftui-introspect", from: "0.6.0"),
+	.package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "0.10.3"), // dev
+	.package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "0.8.5"), // dev
 ]
 
-let Introspect: Target.Dependency = .product(
-	name: "Introspect",
-	package: "SwiftUI-Introspect"
+let SwiftUIIntrospect: Target.Dependency = .product(
+	name: "SwiftUIIntrospect",
+	package: "swiftui-introspect"
 )
 
 let CustomDump: Target.Dependency = .product(
@@ -57,7 +57,7 @@ package.targets += [
 	.target(name: "NavigationTransition", dependencies: [
 		"Animation",
 		"AtomicTransition",
-		Introspect,
+		SwiftUIIntrospect,
 	]),
 
 	.target(name: "NavigationTransitions", dependencies: [

Package.swift

@@ -1,4 +1,4 @@
-@_implementationOnly import Introspect
+@_implementationOnly import SwiftUIIntrospect
 import SwiftUI
 
 // MARK: iOS 16
@@ -51,59 +51,13 @@ extension View {
 		_ transition: AnyNavigationTransition,
 		interactivity: AnyNavigationTransition.Interactivity = .default
 	) -> some View {
-		self.modifier(
-			NavigationTransitionModifier(
-				transition: transition,
-				interactivity: interactivity
-			)
-		)
-	}
-}
-
-struct NavigationTransitionModifier: ViewModifier {
-	let transition: AnyNavigationTransition
-	let interactivity: AnyNavigationTransition.Interactivity
-
-	func body(content: Content) -> some View {
-		content.inject(
-			UIKitIntrospectionViewController { spy -> UINavigationController? in
-				guard spy.parent != nil else {
-					return nil // don't evaluate view until it's on screen
-				}
-				if let controller = Introspect.previousSibling(ofType: UINavigationController.self, from: spy) {
-					return controller
-				} else if let controller = spy.navigationController {
-					return controller
-				} else {
-					runtimeWarn(
-						"""
-						Modifier "navigationTransition" was applied to a view other than NavigationStack OR NavigationView with .navigationViewStyle(.stack). This has no effect.
-
-						Please make sure you're applying the modifier correctly:
-
-						    NavigationStack {
-						        ...
-						    }
-						    .navigationTransition(...)
-
-						    OR
-
-						    NavigationView {
-						        ...
-						    }
-						    .navigationViewStyle(.stack)
-						    .navigationTransition(...)
-
-						If you're attempting to apply the modifier to NavigationSplitView OR NavigationView with .navigationViewStyle(.columns), this has no effect either. Instead, you should apply the modifier to the child stack navigation component within it (if any).
-						"""
-					)
-					return nil
-				}
-			}
-			customize: { (controller: UINavigationController) in
-				controller.setNavigationTransition(transition, interactivity: interactivity)
-			}
-		)
+		self.introspect(
+			.navigationView(style: .stack),
+			on: .iOS(.v13, .v14, .v15, .v16, .v17), .tvOS(.v13, .v14, .v15, .v16, .v17),
+			scope: [.receiver, .ancestor]
+		) { controller in
+			controller.setNavigationTransition(transition, interactivity: interactivity)
+		}
 	}
 }