Add contentZIndex for AnimatedNavHost

google · Sep 11, 2022 · 2dda12b · 2dda12b
1 parent e69b0bf
commit 2dda12b
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/...on-animation/src/main/java/com/google/accompanist/navigation/animation/AnimatedNavHost.kt b/...on-animation/src/main/java/com/google/accompanist/navigation/animation/AnimatedNavHost.kt
@@ -163,9 +163,14 @@ public fun AnimatedNavHost(
     val backStackEntry = visibleEntries.lastOrNull()
 
     if (backStackEntry != null) {
+        var contentZIndex = 0
         val finalEnter: AnimatedContentScope<NavBackStackEntry>.() -> EnterTransition = {
             val targetDestination = targetState.destination as AnimatedComposeNavigator.Destination
 
+            targetDestination.hierarchy.firstNotNullOfOrNull { destination ->
+                contentZIndex = navController.backQueue.indexOfFirst { it.destination.route == destination.route }
+            }
+
             if (composeNavigator.isPop.value) {
                 targetDestination.hierarchy.firstNotNullOfOrNull { destination ->
                     popEnterTransitions[destination.route]?.invoke(this)
@@ -202,6 +207,8 @@ public fun AnimatedNavHost(
                     finalEnter(this) with finalExit(this)
                 } else {
                     EnterTransition.None with ExitTransition.None
+                }.apply {
+                    targetContentZIndex = contentZIndex.toFloat()
                 }
             },
             contentAlignment,