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

revert: feat(android): fragment transactions to use 'add' instead of 'replace' on fwd navigation (#8791)

Browse Source 
This reverts commit e498c9d5bc71bced194af694a95ec71a9037fda9.
This commit is contained in:
Igor Randjelovic
2021-08-11 17:55:31 +02:00
parent 4d91db193d
commit ee0e5dfaed
3 changed files with 13 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,6 @@ let AnimationListener: android.animation.Animator.AnimatorListener;
interface ExpandedTransitionListener extends androidx.transition.Transition.TransitionListener {
entry: ExpandedEntry;
backEntry?: BackstackEntry;
transition: androidx.transition.Transition;
}
@ -144,7 +143,7 @@ export function _setAndroidFragmentTransitions(animated: boolean, navigationTran
if (currentFragmentNeedsDifferentAnimation) {
setupCurrentFragmentFadeTransition(navigationTransition, currentEntry);
}
} else if (name === 'explode') {
} else if (name === 'explode') {
setupNewFragmentExplodeTransition(navigationTransition, newEntry);
if (currentFragmentNeedsDifferentAnimation) {
setupCurrentFragmentExplodeTransition(navigationTransition, currentEntry);
@ -224,7 +223,6 @@ function getAnimationListener(): android.animation.Animator.AnimatorListener {
onAnimationStart(animator: ExpandedAnimator): void {
const entry = animator.entry;
const backEntry = animator.backEntry;
addToWaitingQueue(entry);
if (Trace.isEnabled()) {
Trace.write(`START ${animator.transitionType} for ${entry.fragmentTag}`, Trace.categories.Transition);
@ -238,13 +236,10 @@ function getAnimationListener(): android.animation.Animator.AnimatorListener {
}
onAnimationEnd(animator: ExpandedAnimator): void {
const entry = animator.entry;
const backEntry = animator.backEntry;
if (Trace.isEnabled()) {
Trace.write(`END ${animator.transitionType} for ${entry.fragmentTag} backEntry:${backEntry ? backEntry.fragmentTag : 'none'}`, Trace.categories.Transition);
Trace.write(`END ${animator.transitionType} for ${animator.entry.fragmentTag}`, Trace.categories.Transition);
}
transitionOrAnimationCompleted(entry, backEntry);
animator.backEntry = null;
transitionOrAnimationCompleted(animator.entry, animator.backEntry);
}
onAnimationCancel(animator: ExpandedAnimator): void {
@ -350,12 +345,10 @@ function getTransitionListener(entry: ExpandedEntry, transition: androidx.transi
onTransitionEnd(transition: androidx.transition.Transition): void {
const entry = this.entry;
const backEntry = this.backEntry;
if (Trace.isEnabled()) {
Trace.write(`END ${toShortString(transition)} transition for ${entry.fragmentTag} backEntry:${backEntry ? backEntry.fragmentTag : 'none'}`, Trace.categories.Transition);
Trace.write(`END ${toShortString(transition)} transition for ${entry.fragmentTag}`, Trace.categories.Transition);
}
transitionOrAnimationCompleted(entry, backEntry);
this.backEntry = null;
transitionOrAnimationCompleted(entry, this.backEntry);
}
onTransitionResume(transition: androidx.transition.Transition): void {
@ -667,7 +660,6 @@ function transitionOrAnimationCompleted(entry: ExpandedEntry, backEntry: Backsta
if (!entries) {
return;
}
console.log('transitionOrAnimationCompleted', frameId, backEntry && backEntry.fragmentTag, waitingQueue.size, entries.size, completedEntries.size );
entries.delete(entry);
if (entries.size === 0) {

6
packages/core/ui/frame/frame-common.ts
View File

@ -266,8 +266,8 @@ export class FrameBase extends CustomLayoutView {
public _updateBackstack(entry: BackstackEntry, navigationType: NavigationType): void {
const isBack = navigationType === NavigationType.back;
const isReplace = navigationType === NavigationType.replace;
const current = this._currentEntry;
this.raiseCurrentPageNavigatedEvents(isBack);
const current = this._currentEntry;
// Do nothing for Hot Module Replacement
if (isBack) {
@ -303,6 +303,10 @@ export class FrameBase extends CustomLayoutView {
private raiseCurrentPageNavigatedEvents(isBack: boolean) {
const page = this.currentPage;
if (page) {
if (page.isLoaded) {
// Forward navigation does not remove page from frame so we raise unloaded manually.
page.callUnloaded();
}
page.onNavigatedFrom(isBack);
}
}

40
packages/core/ui/frame/index.android.ts
View File

@ -19,7 +19,6 @@ import { Builder } from '../builder';
import { CSSUtils } from '../../css/system-classes';
import { Device } from '../../platform';
import { profile } from '../../profiling';
import { ExpandedEntry } from './fragment.transitions.android';
export * from './frame-common';
@ -326,8 +325,6 @@ export class Frame extends FrameBase {
// If we had real navigation process queue.
this._processNavigationQueue(entry.resolvedPage);
} else {
// Otherwise currentPage was recreated so this wasn't real navigation.
// Continue with next item in the queue.
@ -440,14 +437,7 @@ export class Frame extends FrameBase {
//transaction.setTransition(androidx.fragment.app.FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
}
if (clearHistory || isReplace) {
transaction.replace(this.containerViewId, newFragment, newFragmentTag);
} else {
transaction.add(this.containerViewId, newFragment, newFragmentTag);
}
if (this._currentEntry && this._currentEntry.entry.backstackVisible === false) {
transaction.remove(this._currentEntry.fragment);
}
transaction.replace(this.containerViewId, newFragment, newFragmentTag);
transaction.commitAllowingStateLoss();
}
@ -469,26 +459,8 @@ export class Frame extends FrameBase {
_reverseTransitions(backstackEntry, this._currentEntry);
const currentIndex =this.backStack.length;
const goBackToIndex = this.backStack.indexOf(backstackEntry);
// the order is important so that the transition listener called be
// the one from the current entry we are going back from
if (this._currentEntry !== backstackEntry) {
const entry = this._currentEntry as ExpandedEntry;
// if we are going back we need to store where we are backing to
// so that we can set the current entry
// it only needs to be done on the return transition
if (entry.returnTransitionListener) {
entry.returnTransitionListener.backEntry = backstackEntry;
}
transaction.remove((this._currentEntry).fragment);
}
for (let index = goBackToIndex + 1; index < currentIndex; index++) {
transaction.remove(this.backStack[index].fragment);
}
transaction.replace(this.containerViewId, backstackEntry.fragment, backstackEntry.fragmentTag);
transaction.commitAllowingStateLoss();
}
@ -780,12 +752,6 @@ function findPageForFragment(fragment: androidx.fragment.app.Fragment, frame: Fr
entry = current;
} else if (executingContext && executingContext.entry && executingContext.entry.fragmentTag === fragmentTag) {
entry = executingContext.entry;
} else {
frame.backStack.forEach(e=>{
if (e && e.fragmentTag === fragmentTag) {
entry = e;
}
})
}
let page: Page;