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: don't keep descriptors for routes that have been removed

Browse Source
This commit is contained in:
satyajit.happy
2019-09-14 15:25:00 +02:00
parent b5b7cb91b2
commit a6872b900a
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/core/src/navigators/createNavigator.js
View File

@@ -34,9 +34,7 @@ function createNavigator(NavigatorView, router, navigationConfig) {
);
}
const descriptors = {};
routes.forEach(route => {
const descriptors = routes.reduce((acc, route) => {
if (
prevDescriptors &&
prevDescriptors[route.key] &&
@@ -44,8 +42,8 @@ function createNavigator(NavigatorView, router, navigationConfig) {
screenProps === currentState.screenProps &&
currentState.themeContext === currentState.theme
) {
descriptors[route.key] = prevDescriptors[route.key];
return;
acc[route.key] = prevDescriptors[route.key];
return acc;
}
const getComponent = router.getComponentForRouteName.bind(
null,
@@ -57,14 +55,15 @@ function createNavigator(NavigatorView, router, navigationConfig) {
screenProps,
currentState.themeContext
);
descriptors[route.key] = {
acc[route.key] = {
key: route.key,
getComponent,
options,
state: route,
navigation: childNavigation,
};
});
return acc;
}, {});
return { descriptors, screenProps, theme: state.themeContext };
}