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): if a page transition is cancelled , the end event wont be called. We need to handle it and call transitionOrAnimationCompleted

Browse Source
This commit is contained in:
Martin Guillon
2022-02-10 12:15:46 +01:00
parent 9f4454724f
commit aef6338b30
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/core/ui/frame/fragment.transitions.android.ts
View File

@@ -234,9 +234,13 @@ function getAnimationListener(): android.animation.Animator.AnimatorListener {
}
onAnimationCancel(animator: ExpandedAnimator): void {
// if cancel onAnimationEnd will not be called
const entry = animator.entry;
const backEntry = animator.backEntry;
if (Trace.isEnabled()) {
Trace.write(`CANCEL ${animator.transitionType} for ${animator.entry.fragmentTag}`, Trace.categories.Transition);
Trace.write(`CANCEL ${animator.transitionType} for ${animator.entry.fragmentTag} backEntry:${backEntry ? backEntry.fragmentTag : 'none'}`, Trace.categories.Transition);
}
transitionOrAnimationCompleted(entry, backEntry);
}
}
@@ -358,9 +362,13 @@ function getTransitionListener(entry: ExpandedEntry, transition: androidx.transi
}
onTransitionCancel(transition: androidx.transition.Transition): void {
// if cancel onTransitionEnd will not be called
const entry = this.entry;
const backEntry = this.backEntry;
if (Trace.isEnabled()) {
Trace.write(`CANCEL ${toShortString(transition)} transition for ${this.entry.fragmentTag}`, Trace.categories.Transition);
Trace.write(`CANCEL ${toShortString(transition)} transition for ${this.entry.fragmentTag} backEntry:${backEntry ? backEntry.fragmentTag : 'none'}`, Trace.categories.Transition);
}
transitionOrAnimationCompleted(entry, backEntry);
}
}