Merge pull request #10 from davidscheutz/remove-any-view

Remove AnyView requirement for root view and destinations view builder
davidscheutz · May 11, 2024 · 4160994 · 4160994
2 parents 6cddf63 + da404fb
commit 4160994
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/Sources/InfiniteNavigation/Helper/View+Environments.swift b/Sources/InfiniteNavigation/Helper/View+Environments.swift
@@ -1,7 +1,7 @@
 import SwiftUI
 
 extension View {
-    func apply(environments: Environments) -> AnyView {
+    func apply(environments: [Environment]) -> AnyView {
         var result: any View = self
         environments.forEach { result = (result.environmentObject($0) as any View) }
         return result.toAnyView()

diff --git a/Sources/InfiniteNavigation/InfiniteNavContainer.swift b/Sources/InfiniteNavigation/InfiniteNavContainer.swift
@@ -5,27 +5,27 @@ 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]
+public typealias Environment = any ObservableObject
 
 @available(iOS 16.0, *)
 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
-    private let environments: Environments
+    private let environments: [Environment]
 
     @State private var stack: [Sheet]
 
     init(
         initialStack: [Destination] = [],
         navAction: NavDestinationPublisher,
-        environments: Environments = [],
+        environments: [Environment] = [],
         viewBuilder: @escaping NavDestinationBuilder,
         root: @escaping () -> Root
     ) {
@@ -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
@@ -7,9 +7,9 @@ public struct InfiniteNavigation {
     public static func create<Root: View, Destination: Hashable>(
         initialStack: [Destination] = [],
         navAction: AnyPublisher<NavAction<Destination>, Never>,
-        environments: any ObservableObject...,
-        viewBuilder: @escaping (Destination) -> AnyView,
-        root: @escaping () -> Root
+        environments: Environment...,
+        viewBuilder: @escaping (Destination) -> some View,
+        @ViewBuilder root: @escaping () -> Root
     ) -> some View {
         create(
             initialStack: initialStack,
@@ -24,9 +24,9 @@ public struct InfiniteNavigation {
     public static func create<Root: View, Destination: Hashable>(
         initialStack: [Destination] = [],
         navAction: AnyPublisher<NavAction<Destination>, Never>,
-        environments: Environments = [],
-        viewBuilder: @escaping (Destination) -> AnyView,
-        root: @escaping () -> Root
+        environments: [Environment] = [],
+        viewBuilder: @escaping (Destination) -> some View,
+        @ViewBuilder root: @escaping () -> Root
     ) -> some View {
         if #available(iOS 16.0, *) {
             InfiniteNavContainer(

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
@@ -17,7 +17,7 @@ public struct LegacyInfiniteNavContainer<Root: SwiftUI.View, View>: UIViewContro
     internal init(
         initialStack: [View] = [],
         navAction: NavDestinationPublisher,
-        environments: Environments = [],
+        environments: [Environment] = [],
         viewBuilder: @escaping NavDestinationBuilder,
         root: @escaping () -> Root
     ) {
@@ -50,11 +50,11 @@ public struct LegacyInfiniteNavContainer<Root: SwiftUI.View, View>: UIViewContro
 
         var resolver: Resolver?
 
-        private let environments: Environments
+        private let environments: [Environment]
         private let viewBuilder: NavDestinationBuilder
         private var navSubscription: AnyCancellable?
 
-        init(navAction: NavDestinationPublisher, environments: Environments, viewBuilder: @escaping NavDestinationBuilder) {
+        init(navAction: NavDestinationPublisher, environments: [Environment], viewBuilder: @escaping NavDestinationBuilder) {
             self.environments = environments
             self.viewBuilder = viewBuilder