correctly finsh transitions when popping more modalsheets at once

hrach · Oct 23, 2024 · 5979f34 · 5979f34
1 parent 3903437
commit 5979f34
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/demo/src/main/kotlin/dev/hrach/navigation/demo/NavHost.kt b/demo/src/main/kotlin/dev/hrach/navigation/demo/NavHost.kt
@@ -55,7 +55,7 @@ internal fun NavHost(
  composable<Destinations.List> { List() }
  composable<Destinations.Profile> { Profile() }
  modalSheet<Destinations.Modal1> { Modal1(navController) }
- modalSheet<Destinations.Modal2> { Modal2() }
+ modalSheet<Destinations.Modal2> { Modal2(navController) }
  bottomSheet<Destinations.BottomSheet> { BottomSheet(navController) }
  }
  ModalSheetHost(

diff --git a/demo/src/main/kotlin/dev/hrach/navigation/demo/screens/Modal2.kt b/demo/src/main/kotlin/dev/hrach/navigation/demo/screens/Modal2.kt
@@ -2,23 +2,38 @@ package dev.hrach.navigation.demo.screens
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavController
+import dev.hrach.navigation.demo.Destinations
 
 @Composable
-internal fun Modal2() {
+internal fun Modal2(navController: NavController) {
  Column(
  Modifier
  .fillMaxSize()
  .background(MaterialTheme.colorScheme.surface)
  .windowInsetsPadding(WindowInsets.systemBars),
  ) {
  Text("Modal 2")
+
+ Spacer(Modifier.height(32.dp))
+ OutlinedButton(
+ onClick = {
+ navController.popBackStack<Destinations.Modal1>(inclusive = true)
+ },
+ ) {
+ Text("Close modals")
+ }
  }
 }
diff --git a/modalsheet/src/main/kotlin/dev/hrach/navigation/modalsheet/ModalSheetHost.kt b/modalsheet/src/main/kotlin/dev/hrach/navigation/modalsheet/ModalSheetHost.kt
@@ -227,8 +227,8 @@ public fun ModalSheetHost(
  }
  }
  LaunchedEffect(transition.currentState, transition.targetState) {
- if (transition.currentState == transition.targetState && backStackEntry != null) {
- modalSheetNavigator.onTransitionComplete(backStackEntry)
+ if (transition.currentState == transition.targetState) {
+ transitionsInProgress.forEach { entry -> modalSheetNavigator.onTransitionComplete(entry) }
  zIndices
  .filter { it.key != transition.targetState?.id }
  .forEach { zIndices.remove(it.key) }