kylefang/react-navigation
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-navigation.git synced 2026-02-09 09:13:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix SwitchRouter depending on previous state to be defined when performing navigate

Browse Source
This commit is contained in:
Brent Vatne
2019-04-16 16:55:06 -07:00
parent a461168493
commit c828cb128c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/core/src/routers/SwitchRouter.js
View File

@@ -93,14 +93,14 @@ export default (routeConfigs, config = {}) => {
if (backBehavior !== 'history') {
return nextState;
}
let nextRouteKeyHistory = prevState.routeKeyHistory;
let nextRouteKeyHistory = prevState ? prevState.routeKeyHistory : [];
if (action.type === NavigationActions.NAVIGATE) {
nextRouteKeyHistory = [...prevState.routeKeyHistory]; // copy
nextRouteKeyHistory = [...nextRouteKeyHistory]; // copy
const keyToAdd = nextState.routes[nextState.index].key;
nextRouteKeyHistory = nextRouteKeyHistory.filter(k => k !== keyToAdd); // dedup
nextRouteKeyHistory.push(keyToAdd);
} else if (action.type === NavigationActions.BACK) {
nextRouteKeyHistory = [...prevState.routeKeyHistory]; // copy
nextRouteKeyHistory = [...nextRouteKeyHistory]; // copy
nextRouteKeyHistory.pop();
}
return {