A little tweak to getting the animations for an exiting instruction f…

…rom the NavigationContainer; if the current backstack is empty, always get the closing animation.
isaac-udy · Mar 1, 2023 · d204370 · d204370
1 parent ba0835a
commit d204370
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/enro-core/src/main/java/dev/enro/core/NavigationAnimations.kt b/enro-core/src/main/java/dev/enro/core/NavigationAnimations.kt
@@ -189,7 +189,7 @@ public object DefaultAnimations {
             else -> ForView.presentCloseEnter
         }
 
-        val exitingAnimation = when (exiting.originalNavigationDirection()) {
+        val exitingAnimation = when (exiting.navigationDirection) {
             NavigationDirection.Push, NavigationDirection.Forward -> ForView.pushCloseExit
             else -> ForView.presentCloseExit
         }

diff --git a/enro-core/src/main/java/dev/enro/core/container/NavigationContainer.kt b/enro-core/src/main/java/dev/enro/core/container/NavigationContainer.kt
@@ -281,7 +281,7 @@ public fun NavigationContainer.getAnimationsForExiting(instruction: AnyOpenInstr
     val activeInstruction = currentTransition.activeBackstack.active
         ?: return animations.closing(instruction, null).exiting
 
-    if(currentTransition.lastInstruction is NavigationInstruction.Close) {
+    if(currentTransition.lastInstruction is NavigationInstruction.Close || backstack.isEmpty()) {
         return animations.closing(instruction, activeInstruction).exiting
     }
     return animations.opening(instruction, activeInstruction).exiting