fix(android): animator restore logic on simulated nav (#6710) · NativeScript/NativeScript@54b6df6 · GitHub

NativeScript / NativeScript Public

• Notifications You must be signed in to change notification settings
• Fork 1.7k
• Star 25.7k

• Code
• Issues 775
• Pull requests 73
• Discussions
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Additional navigation options

Commit 54b6df6

Browse filesBrowse the repository at this point in the historyBrowse files

manoldonev

authored and

SvetoslavTsenov

committed

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

1 parent ea44416 commit 54b6df6
Copy full SHA for 54b6df6

1 file changed

+16-4Lines changed: 16 additions & 4 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• tns-core-modules/ui/frame
  • frame.android.ts

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎tns-core-modules/ui/frame/frame.android.ts‎

Copy file name to clipboardExpand all lines: tns-core-modules/ui/frame/frame.android.ts

+16-4Lines changed: 16 additions & 4 deletions

Original file line number	Diff line number	Diff line change
@@ -527,10 +527,22 @@ function getAnimatorState(entry: BackstackEntry): AnimatorState {
527	527
528	528	function restoreAnimatorState(entry: BackstackEntry, snapshot: AnimatorState): void {
529	529	const expandedEntry = <any>entry;
530		- expandedEntry.enterAnimator = snapshot.enterAnimator;
531		- expandedEntry.exitAnimator = snapshot.exitAnimator;
532		- expandedEntry.popEnterAnimator = snapshot.popEnterAnimator;
533		- expandedEntry.popExitAnimator = snapshot.popExitAnimator;
	530	+ if (snapshot.enterAnimator) {
	531	+ expandedEntry.enterAnimator = snapshot.enterAnimator;
	532	+ }
	533	+
	534	+ if (snapshot.exitAnimator) {
	535	+ expandedEntry.exitAnimator = snapshot.exitAnimator;
	536	+ }
	537	+
	538	+ if (snapshot.popEnterAnimator) {
	539	+ expandedEntry.popEnterAnimator = snapshot.popEnterAnimator;
	540	+ }
	541	+
	542	+ if (snapshot.popExitAnimator) {
	543	+ expandedEntry.popExitAnimator = snapshot.popExitAnimator;
	544	+ }
	545	+
534	546	expandedEntry.transitionName = snapshot.transitionName;
535	547	}
536	548

0 commit comments

Comments

0 (0)