fix(android): animator restore logic on simulated nav (#6710)

NativeScript · Dec 19, 2018 · 54b6df6 · 54b6df6
1 parent ea44416
commit 54b6df6
Showing 1 changed file with 16 additions and 4 deletions.
diff --git 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 = <any>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;
 }