javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Manol Donev
2018-05-14 18:11:02 +03:00
committed by GitHub
parent 3bb0f4a8cd
commit a86d41e7db
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tns-core-modules/ui/frame/fragment.transitions.android.ts
View File

@@ -695,6 +695,14 @@ function addNativeTransitionListener(entry: ExpandedEntry, nativeTransition: and
function transitionOrAnimationCompleted(entry: ExpandedEntry): void {
const frameId = entry.frameId;
const entries = waitingQueue.get(frameId);
// https://github.com/NativeScript/NativeScript/issues/5759
// https://github.com/NativeScript/NativeScript/issues/5780
// transitionOrAnimationCompleted fires again (probably bug in android)
// NOTE: we cannot reproduce this issue so this is a blind fix
if (!entries) {
return;
}
entries.delete(entry);
if (entries.size === 0) {
const frame = entry.resolvedPage.frame;
@@ -707,7 +715,7 @@ function transitionOrAnimationCompleted(entry: ExpandedEntry): void {
let current = frame.isCurrent(entry) ? previousCompletedAnimationEntry : entry;
current = current || entry;
// Will be null if Frame is shown modally...
// AnimationCompleted fires again (probably bug in android).
// transitionOrAnimationCompleted fires again (probably bug in android).
if (current) {
const isBack = frame._isBack;
setTimeout(() => frame.setCurrent(current, isBack));