Merge pull request #44 from skiptools/tabback

Fix broken interaction between TabView and system back button
skiptools · Sep 7, 2024 · fe1b87d · fe1b87d
2 parents a383a61 + 24a0751
commit fe1b87d
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/Sources/SkipUI/SkipUI/Containers/TabView.swift b/Sources/SkipUI/SkipUI/Containers/TabView.swift
@@ -248,7 +248,10 @@ public struct TabView : View {
 
     private func navigate(controller navController: NavHostController, route: String) {
         navController.navigate(route) {
-            popUpTo(navController.graph.startDestinationId) {
+            // Clear back stack so that tabs don't participate in Android system back button
+            let destinationID = navController.currentBackStackEntry?.destination?.id ?? navController.graph.startDestinationId
+            popUpTo(destinationID) {
+                inclusive = true
                 saveState = true
             }
             // Avoid multiple copies of the same destination when reselecting the same item