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

fix(react): improve view matching logic (#22569)

Browse Source
This commit is contained in:
Ely Lucas
2020-12-15 09:03:08 -07:00
committed by GitHub
parent a01bdb8c8d
commit f891f66708
7 changed files with 246 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/react-router/src/ReactRouter/IonRouter.tsx
View File

@ -118,15 +118,14 @@ class IonRouterInner extends React.PureComponent<IonRouteProps, IonRouteState> {
};
}
if (action === 'POP') {
const ri = this.locationHistory.current();
if (ri && ri.pushedByRoute) {
const prevInfo = this.locationHistory.findLastLocation(ri);
const currentRoute = this.locationHistory.current();
if (currentRoute && currentRoute.pushedByRoute) {
const prevInfo = this.locationHistory.findLastLocation(currentRoute);
this.incomingRouteParams = { ...prevInfo, routeAction: 'pop', routeDirection: 'back' };
} else {
const direction = 'none';
this.incomingRouteParams = {
routeAction: 'pop',
routeDirection: direction,
routeDirection: 'none',
tab: this.currentTab,
};
}