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: rollback on last fix

Browse Source
This commit is contained in:
Martin Guillon
2022-02-10 13:12:39 +01:00
parent d37557d20f
commit b592e66e9b
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -234,14 +234,9 @@ 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} backEntry:${backEntry ? backEntry.fragmentTag : 'none'}`, Trace.categories.Transition);
Trace.write(`CANCEL ${animator.transitionType} for ${animator.entry.fragmentTag} backEntry:${animator.backEntry?.fragmentTag ?? 'none'}`, Trace.categories.Transition);
}
transitionOrAnimationCompleted(entry, backEntry);
animator.backEntry = null;
}
}
@@ -363,14 +358,9 @@ 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} backEntry:${backEntry ? backEntry.fragmentTag : 'none'}`, Trace.categories.Transition);
Trace.write(`CANCEL ${toShortString(transition)} transition for ${this.entry.fragmentTag} backEntry:${this.backEntry?.fragmentTag ?? 'none'}`, Trace.categories.Transition);
}
transitionOrAnimationCompleted(entry, backEntry);
this.backEntry = null;
}
}
@@ -601,6 +591,7 @@ function transitionOrAnimationCompleted(entry: ExpandedEntry, backEntry: Backsta
// 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
console.log('transitionOrAnimationCompleted', entry && entry.fragmentTag, backEntry && backEntry.fragmentTag, entries?.size);
if (!entries) {
return;
}
@@ -622,6 +613,7 @@ function transitionOrAnimationCompleted(entry: ExpandedEntry, backEntry: Backsta
current = current || entry;
// Will be null if Frame is shown modally...
// transitionOrAnimationCompleted fires again (probably bug in android).
console.log('transitionOrAnimationCompleted setCurrent', backEntry && backEntry.fragmentTag, current && current.fragmentTag);
if (current) {
setTimeout(() => frame.setCurrent(backEntry || current, navigationContext.navigationType));
}