diff --git a/tns-core-modules/ui/frame/frame.android.ts b/tns-core-modules/ui/frame/frame.android.ts index 1f56a8eb2..0322aaf3c 100644 --- a/tns-core-modules/ui/frame/frame.android.ts +++ b/tns-core-modules/ui/frame/frame.android.ts @@ -527,10 +527,22 @@ function getAnimatorState(entry: BackstackEntry): AnimatorState { function restoreAnimatorState(entry: BackstackEntry, snapshot: AnimatorState): void { const expandedEntry = entry; - expandedEntry.enterAnimator = snapshot.enterAnimator; - expandedEntry.exitAnimator = snapshot.exitAnimator; - expandedEntry.popEnterAnimator = snapshot.popEnterAnimator; - expandedEntry.popExitAnimator = snapshot.popExitAnimator; + if (snapshot.enterAnimator) { + expandedEntry.enterAnimator = snapshot.enterAnimator; + } + + if (snapshot.exitAnimator) { + expandedEntry.exitAnimator = snapshot.exitAnimator; + } + + if (snapshot.popEnterAnimator) { + expandedEntry.popEnterAnimator = snapshot.popEnterAnimator; + } + + if (snapshot.popExitAnimator) { + expandedEntry.popExitAnimator = snapshot.popExitAnimator; + } + expandedEntry.transitionName = snapshot.transitionName; }