dispose steps after transition

samples/android/src/main/AndroidManifest.xml

@@ -20,7 +20,8 @@
         </activity>
         <activity android:name=".stateStack.StateStackActivity"/>
         <activity android:name=".basicNavigation.BasicNavigationActivity"/>
-        <activity android:name=".tabNavigation.TabNavigationActivity"/>
+        <activity android:name=".disposeSample.DisposeWhenTransitionFinishedSampleActivity"/>
+        <activity android:name=".disposeSample.DisposeWhenStackChangedSampleActivity"/>
         <activity android:name=".nestedNavigation.NestedNavigationActivity"/>
         <activity android:name=".parcelableScreen.ParcelableActivity"/>
         <activity android:name=".screenModel.ScreenModelActivity"/>

samples/android/src/main/java/cafe/adriel/voyager/sample/SampleActivity.kt

@@ -22,6 +22,7 @@ import cafe.adriel.voyager.sample.androidLegacy.LegacyActivity
 import cafe.adriel.voyager.sample.androidViewModel.AndroidViewModelActivity
 import cafe.adriel.voyager.sample.basicNavigation.BasicNavigationActivity
 import cafe.adriel.voyager.sample.bottomSheetNavigation.BottomSheetNavigationActivity
+import cafe.adriel.voyager.sample.disposeSample.DisposeWhenStackChangedSampleActivity
 import cafe.adriel.voyager.sample.hiltIntegration.HiltMainActivity
 import cafe.adriel.voyager.sample.kodeinIntegration.KodeinIntegrationActivity
 import cafe.adriel.voyager.sample.koinIntegration.KoinIntegrationActivity
@@ -31,6 +32,7 @@ import cafe.adriel.voyager.sample.parcelableScreen.ParcelableActivity
 import cafe.adriel.voyager.sample.rxJavaIntegration.RxJavaIntegrationActivity
 import cafe.adriel.voyager.sample.screenModel.ScreenModelActivity
 import cafe.adriel.voyager.sample.stateStack.StateStackActivity
+import cafe.adriel.voyager.sample.disposeSample.DisposeWhenTransitionFinishedSampleActivity
 import cafe.adriel.voyager.sample.tabNavigation.TabNavigationActivity
 
 class SampleActivity : ComponentActivity() {
@@ -52,6 +54,8 @@ class SampleActivity : ComponentActivity() {
             contentPadding = PaddingValues(24.dp)
         ) {
             item {
+                StartSampleButton<DisposeWhenTransitionFinishedSampleActivity>("DisposeWhenTransitionFinished")
+                StartSampleButton<DisposeWhenStackChangedSampleActivity>("DisposeWhenStackChanged")
                 StartSampleButton<StateStackActivity>("SnapshotStateStack")
                 StartSampleButton<BasicNavigationActivity>("Basic Navigation")
                 StartSampleButton<ParcelableActivity>("Basic Navigation with Parcelable")

samples/android/src/main/java/cafe/adriel/voyager/sample/disposeSample/DisposeWhenStackChangedSampleActivity.kt

@@ -0,0 +1,37 @@
+package cafe.adriel.voyager.sample.disposeSample
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.animation.core.tween
+import androidx.compose.runtime.Composable
+import cafe.adriel.voyager.navigator.DisposeStepsBehavior
+import cafe.adriel.voyager.navigator.Navigator
+import cafe.adriel.voyager.navigator.NavigatorDisposeBehavior
+import cafe.adriel.voyager.transitions.SlideTransition
+
+class DisposeWhenStackChangedSampleActivity : ComponentActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setContent {
+            Content()
+        }
+    }
+
+    @Composable
+    fun Content() {
+        Navigator(
+            screen = SampleScreen(0),
+            disposeBehavior = NavigatorDisposeBehavior(
+                disposeStepsBehavior = DisposeStepsBehavior.DisposeWhenStackChanged
+            )
+        ) {
+            SlideTransition(
+                navigator = it,
+                animationSpec = tween(1000)
+            )
+        }
+    }
+}

samples/android/src/main/java/cafe/adriel/voyager/sample/disposeSample/DisposeWhenTransitionFinishedSampleActivity.kt

@@ -0,0 +1,37 @@
+package cafe.adriel.voyager.sample.disposeSample
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.animation.core.tween
+import androidx.compose.runtime.Composable
+import cafe.adriel.voyager.navigator.DisposeStepsBehavior
+import cafe.adriel.voyager.navigator.Navigator
+import cafe.adriel.voyager.navigator.NavigatorDisposeBehavior
+import cafe.adriel.voyager.transitions.SlideTransition
+
+class DisposeWhenTransitionFinishedSampleActivity : ComponentActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setContent {
+            Content()
+        }
+    }
+
+    @Composable
+    fun Content() {
+        Navigator(
+            screen = SampleScreen(0),
+            disposeBehavior = NavigatorDisposeBehavior(
+                disposeStepsBehavior = DisposeStepsBehavior.DisposeWhenTransitionFinished
+            )
+        ) {
+            SlideTransition(
+                navigator = it,
+                animationSpec = tween(1000)
+            )
+        }
+    }
+}

samples/android/src/main/java/cafe/adriel/voyager/sample/disposeSample/SampleScreen.kt

@@ -0,0 +1,86 @@
+package cafe.adriel.voyager.sample.disposeSample
+
+import android.util.Log
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.Button
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import androidx.lifecycle.viewmodel.compose.viewModel
+import cafe.adriel.voyager.core.screen.Screen
+import cafe.adriel.voyager.core.screen.ScreenKey
+import cafe.adriel.voyager.navigator.LocalNavigator
+import cafe.adriel.voyager.navigator.currentOrThrow
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+
+class SampleScreenModel : ViewModel() {
+
+    init {
+        Log.d("SampleScreenModel", "start doing job")
+        viewModelScope.launch {
+            while (true) {
+                Log.d("SampleScreenModel", "Doing job")
+                delay(1000)
+            }
+        }
+    }
+
+    override fun onCleared() {
+        Log.d("SampleScreenModel", "Disposed")
+    }
+}
+
+data class SampleScreen(
+    private val index: Int,
+) : Screen {
+
+    override val key: ScreenKey = "SampleScreen$index"
+
+    @Composable
+    override fun Content() {
+
+        if (index == 1) {
+            viewModel(key = key) { SampleScreenModel() }
+        }
+
+        val navigator = LocalNavigator.currentOrThrow
+
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(40.dp),
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.Center,
+        ) {
+
+            Text(text = "Screen $index")
+
+            Spacer(modifier = Modifier.height(20.dp))
+
+            Button(
+                modifier = Modifier.fillMaxWidth(),
+                onClick = { navigator.push(SampleScreen(index = index + 1)) }
+            ) {
+                Text(text = "Next")
+            }
+
+            Button(
+                modifier = Modifier.fillMaxWidth(),
+                onClick = { navigator.pop() }
+            ) {
+                Text(text = "Back")
+            }
+        }
+    }
+}

voyager-navigator/src/commonMain/kotlin/cafe/adriel/voyager/navigator/Navigator.kt

@@ -2,10 +2,12 @@ package cafe.adriel.voyager.navigator
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.currentCompositeKeyHash
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.SaveableStateHolder
 import androidx.compose.runtime.saveable.rememberSaveableStateHolder
@@ -23,6 +25,7 @@ import cafe.adriel.voyager.navigator.internal.ChildrenNavigationDisposableEffect
 import cafe.adriel.voyager.navigator.internal.LocalNavigatorStateHolder
 import cafe.adriel.voyager.navigator.internal.NavigatorBackHandler
 import cafe.adriel.voyager.navigator.internal.NavigatorDisposableEffect
+import cafe.adriel.voyager.navigator.internal.StepDisposableAfterTransitionEffect
 import cafe.adriel.voyager.navigator.internal.StepDisposableEffect
 import cafe.adriel.voyager.navigator.internal.getNavigatorScreenLifecycleProvider
 import cafe.adriel.voyager.navigator.internal.rememberNavigator
@@ -32,6 +35,11 @@ public typealias NavigatorContent = @Composable (navigator: Navigator) -> Unit
 
 public typealias OnBackPressed = ((currentScreen: Screen) -> Boolean)?
 
+@InternalVoyagerApi
+public val LocalIsTransitionRunning: ProvidableCompositionLocal<MutableState<Boolean>> = staticCompositionLocalOf {
+    error("No LocalIsTransitionRunning provided")
+}
+
 public val LocalNavigator: ProvidableCompositionLocal<Navigator?> =
     staticCompositionLocalOf { null }
 
@@ -86,11 +94,20 @@ public fun Navigator(
             NavigatorDisposableEffect(navigator)
         }
 
+        val isTransitionRunning = remember { mutableStateOf(false) }
+
         CompositionLocalProvider(
-            LocalNavigator provides navigator
+            LocalNavigator provides navigator,
+            LocalIsTransitionRunning provides isTransitionRunning
         ) {
-            if (disposeBehavior.disposeSteps) {
-                StepDisposableEffect(navigator)
+
+            when (disposeBehavior.disposeStepsBehavior) {
+                DisposeStepsBehavior.DisposeWhenTransitionFinished -> StepDisposableAfterTransitionEffect(
+                    isTransitionRunning = isTransitionRunning,
+                    navigator = navigator,
+                )
+                DisposeStepsBehavior.DisposeWhenStackChanged -> StepDisposableEffect(navigator)
+                DisposeStepsBehavior.None -> Unit
             }
 
             NavigatorBackHandler(navigator, onBackPressed)
@@ -180,10 +197,24 @@ public class Navigator @InternalVoyagerApi constructor(
     }
 }
 
+public enum class DisposeStepsBehavior {
+    DisposeWhenTransitionFinished,
+    DisposeWhenStackChanged,
+    None,
+}
+
 public data class NavigatorDisposeBehavior(
     val disposeNestedNavigators: Boolean = true,
-    val disposeSteps: Boolean = true
-)
+    val disposeStepsBehavior: DisposeStepsBehavior,
+) {
+    public constructor(
+        disposeNestedNavigators: Boolean = true,
+        disposeSteps: Boolean = true,
+    ) : this(
+        disposeNestedNavigators = disposeNestedNavigators,
+        disposeStepsBehavior = if (disposeSteps) DisposeStepsBehavior.DisposeWhenStackChanged else DisposeStepsBehavior.None,
+    )
+}
 
 @InternalVoyagerApi
 @Composable

voyager-navigator/src/commonMain/kotlin/cafe/adriel/voyager/navigator/internal/NavigatorDisposable.kt

@@ -2,14 +2,26 @@ package cafe.adriel.voyager.navigator.internal
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.Saver
+import androidx.compose.runtime.saveable.rememberSaveable
 import cafe.adriel.voyager.core.lifecycle.DisposableEffectIgnoringConfiguration
+import cafe.adriel.voyager.core.screen.Screen
+import cafe.adriel.voyager.core.screen.ScreenKey
 import cafe.adriel.voyager.core.stack.StackEvent
 import cafe.adriel.voyager.navigator.Navigator
 import cafe.adriel.voyager.navigator.lifecycle.NavigatorLifecycleStore
 
 private val disposableEvents: Set<StackEvent> =
     setOf(StackEvent.Pop, StackEvent.Replace)
 
+private data class ScreenData(
+    val key: ScreenKey,
+    val screen: Screen,
+)
+
 @Composable
 internal fun NavigatorDisposableEffect(
     navigator: Navigator
@@ -40,6 +52,42 @@ internal fun StepDisposableEffect(
     }
 }
 
+@Composable
+internal fun StepDisposableAfterTransitionEffect(
+    isTransitionRunning: MutableState<Boolean>,
+    navigator: Navigator,
+) {
+
+    val currentScreens = navigator.items
+    val screenCandidatesToDispose = rememberSaveable(saver = screenCandidatesToDisposeSaver()) {
+        mutableStateOf(emptySet())
+    }
+
+    fun dispose() {
+        val newScreens = navigator.items.map { it.key }
+        val screensToDispose = screenCandidatesToDispose.value.filterNot { it.key in newScreens }
+        if (screensToDispose.isNotEmpty()) {
+            screensToDispose.forEach { navigator.dispose(it.screen) }
+            navigator.clearEvent()
+        }
+        screenCandidatesToDispose.value = emptySet()
+    }
+
+    DisposableEffect(currentScreens) {
+        onDispose {
+            val newScreenKeys = navigator.items.map { it.key }
+            screenCandidatesToDispose.value += currentScreens.filter { it.key !in newScreenKeys }
+                .map { ScreenData(it.key, it) }
+        }
+    }
+
+    LaunchedEffect(isTransitionRunning.value) {
+        if (!isTransitionRunning.value) {
+            dispose()
+        }
+    }
+}
+
 @Composable
 internal fun ChildrenNavigationDisposableEffect(
     navigator: Navigator
@@ -80,3 +128,10 @@ internal fun disposeNavigator(navigator: Navigator) {
     NavigatorLifecycleStore.remove(navigator)
     navigator.clearEvent()
 }
+
+private fun screenCandidatesToDisposeSaver(): Saver<MutableState<Set<ScreenData>>, List<ScreenData>> {
+    return Saver(
+        save = { it.value.toList() },
+        restore = { mutableStateOf(it.toSet()) },
+    )
+}

voyager-transitions/src/commonMain/kotlin/cafe/adriel/voyager/transitions/ScreenTransition.kt

@@ -7,11 +7,13 @@ import androidx.compose.animation.ContentTransform
 import androidx.compose.animation.EnterTransition
 import androidx.compose.animation.ExitTransition
 import androidx.compose.animation.togetherWith
+import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import cafe.adriel.voyager.core.annotation.ExperimentalVoyagerApi
 import cafe.adriel.voyager.core.screen.Screen
 import cafe.adriel.voyager.core.stack.StackEvent
+import cafe.adriel.voyager.navigator.LocalIsTransitionRunning
 import cafe.adriel.voyager.navigator.Navigator
 
 @ExperimentalVoyagerApi
@@ -55,6 +57,7 @@ public fun ScreenTransition(
     )
 }
 
+@OptIn(ExperimentalAnimationApi::class)
 @Composable
 public fun ScreenTransition(
     navigator: Navigator,
@@ -90,6 +93,8 @@ public fun ScreenTransition(
         },
         modifier = modifier
     ) { screen ->
+        val isTransitionRunning = LocalIsTransitionRunning.current
+        isTransitionRunning.value = this.transition.isRunning
         navigator.saveableState("transition", screen) {
             content(screen)
         }