Properly handle navigate back/up from a bottom sheet dialog fragment …

…by cancelling the dialog instead of popping the backstack
hotwired · Feb 24, 2024 · 00b875b · 00b875b
1 parent 95de8a7
commit 00b875b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/turbo/src/main/kotlin/dev/hotwire/turbo/delegates/TurboFragmentDelegate.kt b/turbo/src/main/kotlin/dev/hotwire/turbo/delegates/TurboFragmentDelegate.kt
@@ -97,10 +97,7 @@ class TurboFragmentDelegate(private val navDestination: TurboNavDestination) {
         navDestination.toolbarForNavigation()?.let {
             NavigationUI.setupWithNavController(it, fragment.findNavController())
             it.setNavigationOnClickListener {
-                when (fragment) {
-                    is DialogFragment -> fragment.requireDialog().cancel()
-                    else -> navDestination.navigateUp()
-                }
+                navDestination.navigateUp()
             }
         }
     }

diff --git a/turbo/src/main/kotlin/dev/hotwire/turbo/nav/TurboNavigator.kt b/turbo/src/main/kotlin/dev/hotwire/turbo/nav/TurboNavigator.kt
@@ -22,13 +22,21 @@ internal class TurboNavigator(private val navDestination: TurboNavDestination) {
 
     fun navigateUp() {
         onNavigationVisit {
-            currentController().navigateUp()
+            if (fragment is DialogFragment) {
+                fragment.requireDialog().cancel()
+            } else {
+                currentController().navigateUp()
+            }
         }
     }
 
     fun navigateBack() {
         onNavigationVisit {
-            currentController().popBackStack()
+            if (fragment is DialogFragment) {
+                fragment.requireDialog().cancel()
+            } else {
+                currentController().popBackStack()
+            }
         }
     }