remove AnyView requirement

davidscheutz · Feb 27, 2024 · 51c9400 · 51c9400
1 parent ac7a027
commit 51c9400
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Sources/InfiniteNavigation/InfiniteNavContainer.swift b/Sources/InfiniteNavigation/InfiniteNavContainer.swift
@@ -5,7 +5,7 @@ import Combine
 internal struct Sheet: Identifiable {
     let id = UUID().uuidString
     var path = NavigationPath()
-    let source: () -> AnyView
+    let source: () -> any View
 }
 
 public typealias Environments = [any ObservableObject]
@@ -14,7 +14,7 @@ public typealias Environments = [any ObservableObject]
 public struct InfiniteNavContainer<Destination: Hashable, Root: View>: View {
 
     public typealias NavDestinationPublisher = AnyPublisher<NavAction<Destination>, Never>
-    public typealias NavDestinationBuilder = (Destination) -> AnyView
+    public typealias NavDestinationBuilder = (Destination) -> any View
 
     private let navAction: NavDestinationPublisher
     private let viewBuilder: NavDestinationBuilder
@@ -83,7 +83,7 @@ extension InfiniteNavContainer {
         .toAnyView()
     }
 
-    private func wrap(_ view: some View) -> some View {
+    private func wrap(_ view: any View) -> some View {
         view
             .apply(environments: environments)
             .navigationBarHidden(true)

diff --git a/Sources/InfiniteNavigation/InfiniteNavigation.swift b/Sources/InfiniteNavigation/InfiniteNavigation.swift
@@ -8,7 +8,7 @@ public struct InfiniteNavigation {
         initialStack: [Destination] = [],
         navAction: AnyPublisher<NavAction<Destination>, Never>,
         environments: any ObservableObject...,
-        viewBuilder: @escaping (Destination) -> AnyView,
+        viewBuilder: @escaping (Destination) -> some View,
         @ViewBuilder root: @escaping () -> Root
     ) -> some View {
         create(
@@ -25,7 +25,7 @@ public struct InfiniteNavigation {
         initialStack: [Destination] = [],
         navAction: AnyPublisher<NavAction<Destination>, Never>,
         environments: Environments = [],
-        viewBuilder: @escaping (Destination) -> AnyView,
+        viewBuilder: @escaping (Destination) -> some View,
         @ViewBuilder root: @escaping () -> Root
     ) -> some View {
         if #available(iOS 16.0, *) {

diff --git a/Sources/InfiniteNavigation/LegacyInfiniteNavContainer.swift b/Sources/InfiniteNavigation/LegacyInfiniteNavContainer.swift
@@ -6,7 +6,7 @@ public struct LegacyInfiniteNavContainer<Root: SwiftUI.View, View>: UIViewContro
 
     public typealias UIViewControllerType = UINavigationController
     public typealias NavDestinationPublisher = AnyPublisher<NavAction<View>, Never>
-    public typealias NavDestinationBuilder = (View) -> AnyView
+    public typealias NavDestinationBuilder = (View) -> any SwiftUI.View
 
     private let coordinator: Coordinator
     private let rootResolver: () -> Root