iOS navigation: to supported embedded navigation manager, the parent …

…route name is used when there is no child route
mirego · Apr 18, 2024 · 9c80dc8 · 9c80dc8
1 parent c5d271b
commit 9c80dc8
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/navigation/ios/NavigationContainerView.swift b/navigation/ios/NavigationContainerView.swift
@@ -9,9 +9,13 @@ struct NavigationContainerView<
     ScreenView: View,
     NavModifier: ViewModifier
 >: View {
-    @ObservedObject var navigateState: NavigationState<ScreenData, Route, Action, NavModifier>
 
-    @ViewBuilder let buildView: (ScreenData) -> ScreenView
+    @Environment(\.presentedPilotRouteName) private var presentedRouteName
+
+    @ObservedObject private var navigateState: NavigationState<ScreenData, Route, Action, NavModifier>
+
+    @ViewBuilder private let buildView: (ScreenData) -> ScreenView
+
     let content: () -> Content
 
     init(navigateState: NavigationState<ScreenData, Route, Action, NavModifier>, buildView: @escaping (ScreenData) -> ScreenView, content: @escaping () -> Content) {
@@ -70,7 +74,7 @@ struct NavigationContainerView<
                 )
             )
             .environment(\.pilotNavigationDismissTriggered, navigateState.navigationDismissTriggered)
-            .environment(\.presentedPilotRouteName, navigateState.child?.route?.name)
+            .environment(\.presentedPilotRouteName, navigateState.child?.route?.name ?? presentedRouteName)
     }
 
     private var embedInNavigationView: Bool {