Tabbed screen

Example/Example/Deeplinking/DetailsDeeplink.swift

@@ -1,20 +1,20 @@
 import ComposableDeeplinking
 
 extension DeeplinkParser {
-    /// example://detail?id={id}
-    static let details = DeeplinkParser(
-        parse: { deeplink in
-            guard deeplink.components.count == 1,
-                  deeplink.components[0].name == "detail",
-                  case let .value(id) = deeplink.components[0].arguments?["id"]
-            else {
-                return nil
-            }
+  /// example://detail?id={id}
+  static let details = DeeplinkParser(
+    parse: { deeplink in
+      guard deeplink.components.count == 1,
+            deeplink.components[0].name == "detail",
+            case let .value(id) = deeplink.components[0].arguments?["id"]
+      else {
+        return nil
+      }
 
-            return [
-                HomeScreen().eraseToAnyScreen(),
-                DetailScreen(detailID: id).eraseToAnyScreen()
-            ]
-        }
-    )
+      return [
+        .screen(HomeScreen().eraseToAnyScreen()),
+        .screen(DetailScreen(detailID: id).eraseToAnyScreen())
+      ]
+    }
+  )
 }

Example/Example/Deeplinking/DetailsSettingsDeeplink.swift

@@ -1,22 +1,22 @@
 import ComposableDeeplinking
 
 extension DeeplinkParser {
-    /// example://detail?id={id}/settings
-    static let detailSettings = DeeplinkParser(
-        parse: { deeplink in
-            guard deeplink.components.count == 2,
-                  deeplink.components[0].name == "detail",
-                  case let .value(id) = deeplink.components[0].arguments?["id"],
-                  deeplink.components[1].name == "settings"
-            else {
-                return nil
-            }
+  /// example://detail?id={id}/settings
+  static let detailSettings = DeeplinkParser(
+    parse: { deeplink in
+      guard deeplink.components.count == 2,
+            deeplink.components[0].name == "detail",
+            case let .value(id) = deeplink.components[0].arguments?["id"],
+            deeplink.components[1].name == "settings"
+      else {
+        return nil
+      }
 
-            return [
-                HomeScreen().eraseToAnyScreen(),
-                DetailScreen(detailID: id).eraseToAnyScreen(),
-                SettingsScreen().eraseToAnyScreen()
-            ]
-        }
-    )
+      return [
+        .screen(HomeScreen().eraseToAnyScreen()),
+        .screen(DetailScreen(detailID: id).eraseToAnyScreen()),
+        .screen(SettingsScreen().eraseToAnyScreen())
+      ]
+    }
+  )
 }

Example/Example/Deeplinking/HomeSettingsDeeplink.swift

@@ -1,20 +1,20 @@
 import ComposableDeeplinking
 
 extension DeeplinkParser {
-    /// example://home/settings
-    static let homeSettings = DeeplinkParser(
-        parse: { deeplink in
-            guard deeplink.components.count == 2,
-                  deeplink.components[0].name == "home",
-                  deeplink.components[1].name == "settings"
-            else {
-                return nil
-            }
+  /// example://home/settings
+  static let homeSettings = DeeplinkParser(
+    parse: { deeplink in
+      guard deeplink.components.count == 2,
+            deeplink.components[0].name == "home",
+            deeplink.components[1].name == "settings"
+      else {
+        return nil
+      }
 
-            return [
-                HomeScreen().eraseToAnyScreen(),
-                SettingsScreen().eraseToAnyScreen()
-            ]
-        }
-    )
+      return [
+        .screen(HomeScreen().eraseToAnyScreen()),
+        .screen(SettingsScreen().eraseToAnyScreen())
+      ]
+    }
+  )
 }

Example/Example/ExampleApp.swift

@@ -19,7 +19,12 @@ struct ExampleApp: App {
 
   init() {
     dataSource = Navigator.Datasource(
-      root: HomeScreen()
+      root: ActiveNavigationPathElement.tabbed(
+        ActiveNavigationPathElement.ActiveTab(
+          active: HomeTabs.list,
+          path: [.screen(HomeScreen().eraseToAnyScreen())]
+        )
+      )
     )
 
     navigator = Navigator(dataSource: dataSource).debug()

Example/Example/Home Screen/HomeView.swift

@@ -96,6 +96,11 @@ struct HomeView: View {
   }
 }
 
+enum HomeTabs: Activatable {
+  case list
+  case settings
+}
+
 struct HomeScreen: Screen {
   let presentationStyle: ScreenPresentationStyle = .push
 
@@ -126,46 +131,75 @@ struct HomeScreen: Screen {
     }
 
     var builder: some PathBuilder {
-      Screen( // /home
-        HomeScreen.self,
-        onAppear: { _ in print("HomeView appeared") },
-        content: { HomeView(store: homeStore) },
-        nesting: {
-          If { (screen: DetailScreen) in
-            IfLetStore(
-              store: detailStore(for: screen.detailID),
-              then: { store in
-                DetailScreen.Builder(
-                  store: store,
-                  settingsStore: settingsStore
-                )
-                .onDismiss { (screen: DetailScreen) in
-                  print("Dismissed \(screen)")
-                  let viewStore = ViewStore(homeStore)
-                  // Only if the current detail state represents the dismissed screen, set the state to nil.
-                  if viewStore.state.selectedDetail?.id == screen.detailID {
-                    ViewStore(homeStore).send(.binding(.set(\.selectedDetail, nil)))
-                  }
+      Tabbed(
+        .init(
+          tag: HomeTabs.list,
+          contentBuilder: {
+            Screen( // /home
+              HomeScreen.self,
+              onAppear: { _ in print("HomeView appeared") },
+              content: { HomeView(store: homeStore) },
+              nesting: {
+                If { (screen: DetailScreen) in
+                  IfLetStore(
+                    store: detailStore(for: screen.detailID),
+                    then: { store in
+                      DetailScreen.Builder(
+                        store: store,
+                        settingsStore: settingsStore
+                      )
+                        .onDismiss { (screen: DetailScreen) in
+                          print("Dismissed \(screen)")
+                          let viewStore = ViewStore(homeStore)
+                          // Only if the current detail state represents the dismissed screen, set the state to nil.
+                          if viewStore.state.selectedDetail?.id == screen.detailID {
+                            ViewStore(homeStore).send(.binding(.set(\.selectedDetail, nil)))
+                          }
+                        }
+                    }
+                  )
+                    .beforeBuild {
+                      let viewStore = ViewStore(homeStore)
+                      // we do not navigate to invalid navigation paths (i.e. example://detail?id=123)
+                      if viewStore.elements.contains(screen.detailID),
+                         viewStore.state.selectedDetail?.id != screen.detailID {
+                        viewStore.send(.binding(.set(\.selectedDetail, DetailState(id: screen.detailID))))
+                      }
+                    }
+                }
+
+                SettingsScreen.Builder(
+                  store: settingsStore,
+                  entrypoint: "home"
+                ).onDismiss(of: SettingsScreen.self) {
+                  print("Dismissed settings")
                 }
               }
             )
-            .beforeBuild {
-              let viewStore = ViewStore(homeStore)
-              // we do not navigate to invalid navigation paths (i.e. example://detail?id=123)
-              if viewStore.elements.contains(screen.detailID),
-                 viewStore.state.selectedDetail?.id != screen.detailID {
-                viewStore.send(.binding(.set(\.selectedDetail, DetailState(id: screen.detailID))))
-              }
-            }
-          }
+          },
+          tabItem: {
+            Image(systemName: "list.triangle")
+            Text("List")
 
-          SettingsScreen.Builder(
-            store: settingsStore,
-            entrypoint: "home"
-          ).onDismiss(of: SettingsScreen.self) {
-            print("Dismissed settings")
-          }
-        }
+          },
+          defaultContent: .screen(HomeScreen().eraseToAnyScreen())
+        ),
+        .init(
+          tag: HomeTabs.settings,
+          contentBuilder: {
+            SettingsScreen.Builder(
+              store: settingsStore,
+              entrypoint: "home"
+            ).onDismiss(of: SettingsScreen.self) {
+              print("Dismissed settings")
+            }
+          },
+          tabItem: {
+            Image(systemName: "gear")
+            Text("Settings")
+          },
+          defaultContent: .screen(SettingsScreen().eraseToAnyScreen())
+        )
       )
     }
   }
@@ -202,7 +236,7 @@ let homeReducer = Reducer<
           to: [
             DetailScreen(detailID: element).eraseToAnyScreen(),
             SettingsScreen().eraseToAnyScreen(),
-          ],
+          ].map(ActiveNavigationPathElement.screen),
           on: screenID
         )
     }

Example/Example/Navigation Shortcuts/NavigationShortcuts.swift

@@ -13,9 +13,9 @@ struct NavigationShortcuts: View {
       action: {
         navigator.replace(
           path: [
-            HomeScreen().eraseToAnyScreen(),
-            DetailScreen(detailID: "0").eraseToAnyScreen(),
-            NavigationShortcutsScreen(presentationStyle: .push).eraseToAnyScreen()
+            .screen(HomeScreen().eraseToAnyScreen()),
+            .screen(DetailScreen(detailID: "0").eraseToAnyScreen()),
+            .screen(NavigationShortcutsScreen(presentationStyle: .push).eraseToAnyScreen())
           ]
         )
       },
@@ -33,7 +33,7 @@ struct NavigationShortcuts: View {
             HomeScreen().eraseToAnyScreen(),
             DetailScreen(detailID: "0").eraseToAnyScreen(),
             SettingsScreen().eraseToAnyScreen()
-          ]
+          ].map(ActiveNavigationPathElement.screen)
         )
       },
       label: { Text("Go to [home/detail?id=0/settings]") }
@@ -48,7 +48,7 @@ struct NavigationShortcuts: View {
             DetailScreen(detailID: "0").eraseToAnyScreen(),
             SettingsScreen().eraseToAnyScreen(),
             NavigationShortcutsScreen(presentationStyle: .push).eraseToAnyScreen()
-          ]
+          ].map(ActiveNavigationPathElement.screen)
         )
       },
       label: { Text("Go to [home/detail?id=0/settings/shortcuts?style=push]") }
@@ -65,7 +65,7 @@ struct NavigationShortcuts: View {
             NavigationShortcutsScreen(
               presentationStyle: .sheet(allowsPush: true)
             ).eraseToAnyScreen()
-          ]
+          ].map(ActiveNavigationPathElement.screen)
         )
       },
       label: { Text("Go to [home/detail?id=0/settings/shortcuts?style=sheet]") }
@@ -79,7 +79,7 @@ struct NavigationShortcuts: View {
           path: [
             HomeScreen().eraseToAnyScreen(),
             SettingsScreen().eraseToAnyScreen()
-          ]
+          ].map(ActiveNavigationPathElement.screen)
         )
       },
       label: { Text("Go to [home/settings]") }

Package.swift

@@ -54,7 +54,9 @@ let package = Package(
       dependencies: [],
       exclude: [
         "NavigationTree/NavigationTreeBuilder+AnyOf.swift.gyb",
+        "NavigationTree/NavigationTreeBuilder+Tabbed.swift.gyb",
         "PathBuilder/PathBuilders/PathBuilder+AnyOf.swift.gyb",
+        "PathBuilder/Nodes/Tabbed/TabbedNode.swift.gyb"
       ]
     ),
     .target(

Sources/ComposableDeeplinking/DeeplinkHandler.swift

@@ -11,8 +11,8 @@ public struct DeeplinkHandler {
   }
 
   public func handle(deeplink: Deeplink) {
-    if let path = parser.parse(deeplink) {
-      navigator.replace(path: path)
+    if let activeNavigationPath = parser.parse(deeplink) {
+      navigator.replace(path: activeNavigationPath)
     }
   }
 }

Sources/ComposableDeeplinking/DeeplinkParser.swift

@@ -8,16 +8,16 @@ import ComposableNavigator
 ///  If a deeplink parser handles the input `Deeplink`, it returns a `navigation path` in the form of an `AnyScreen` array.
 ///  If the deeplink parser is not responsible for parsing the deeplink, it returns nil.
 public struct DeeplinkParser {
-    private let _parse: (Deeplink) -> [AnyScreen]?
+    private let _parse: (Deeplink) -> ActiveNavigationPath?
 
-    public init(parse: @escaping (Deeplink) -> [AnyScreen]?) {
+    public init(parse: @escaping (Deeplink) -> ActiveNavigationPath?) {
         _parse = parse
     }
 
     /// Parses a Deeplink to a navigation path
     ///
     /// - Returns: If the DeepLinkParser is responsible for the passed deeplink, it returns the built navigation path. Else nil.
-    public func parse(_ deeplink: Deeplink) -> [AnyScreen]? {
+    public func parse(_ deeplink: Deeplink) -> ActiveNavigationPath? {
         _parse(deeplink)
     }
 }

Sources/ComposableDeeplinking/Parsers/DeeplinkParser+Prepending.swift

@@ -5,7 +5,7 @@ public extension DeeplinkParser {
   ///
   /// In bigger, modularly designed applications, features often have entrypoints. This Deeplink Parses allows you to navigate to the feature's entrypoint before the performing the navigation defined in the deeplink.
   static func prepending(
-    path pathToEntrypoint: [AnyScreen],
+    path pathToEntrypoint: ActiveNavigationPath,
     to parser: DeeplinkParser
   ) -> DeeplinkParser {
     DeeplinkParser(