fix(android): fix sporadic issue with transition cleanup logic called… · NativeScript/NativeScript@a86d41e · GitHub

NativeScript / NativeScript Public

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

• Code
• Issues 773
• Pull requests 69
• Discussions
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Additional navigation options

Commit a86d41e

Browse filesBrowse the repository at this point in the historyBrowse files

manoldonev

authored

fix(android): fix sporadic issue with transition cleanup logic called twice (#5805)

1 parent 3bb0f4a commit a86d41e
Copy full SHA for a86d41e

1 file changed

+9-1Lines changed: 9 additions & 1 deletion

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

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

Expand file treeCollapse file tree

Open diff view settings

Collapse file

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

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

+9-1Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -695,6 +695,14 @@ function addNativeTransitionListener(entry: ExpandedEntry, nativeTransition: and
695	695	function transitionOrAnimationCompleted(entry: ExpandedEntry): void {
696	696	const frameId = entry.frameId;
697	697	const entries = waitingQueue.get(frameId);
	698	+ // https://github.com/NativeScript/NativeScript/issues/5759
	699	+ // https://github.com/NativeScript/NativeScript/issues/5780
	700	+ // transitionOrAnimationCompleted fires again (probably bug in android)
	701	+ // NOTE: we cannot reproduce this issue so this is a blind fix
	702	+ if (!entries) {
	703	+ return;
	704	+ }
	705	+
698	706	entries.delete(entry);
699	707	if (entries.size === 0) {
700	708	const frame = entry.resolvedPage.frame;
@@ -707,7 +715,7 @@ function transitionOrAnimationCompleted(entry: ExpandedEntry): void {
707	715	let current = frame.isCurrent(entry) ? previousCompletedAnimationEntry : entry;
708	716	current = current || entry;
709	717	// Will be null if Frame is shown modally...
710		- // AnimationCompleted fires again (probably bug in android).
	718	+ // transitionOrAnimationCompleted fires again (probably bug in android).
711	719	if (current) {
712	720	const isBack = frame._isBack;
713	721	setTimeout(() => frame.setCurrent(current, isBack));

0 commit comments

Comments

0 (0)