kylefang/react-navigation
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-navigation.git synced 2026-03-06 17:34:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make the actions available on the navigator navigation prop the same as its children (#4467)

Browse Source 
* Make the actions available on the navigator navigation prop the same as its children

* Fix test and improve code clarity
This commit is contained in:
Brent Vatne
2018-06-09 14:13:21 -07:00
committed by GitHub
parent c91e8206a5
commit 470eaf3b08
2 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/__tests__/getNavigation-test.js
View File

@@ -77,7 +77,12 @@ test('getNavigation get child navigation with router', () => {
const initState = {
index: 0,
routes: [
{ key: 'a', routeName: 'RouteA' },
{
key: 'a',
routeName: 'RouteA',
routes: [{ key: 'c', routeName: 'RouteC' }],
index: 0,
},
{ key: 'b', routeName: 'RouteB' },
],
};

30
src/getChildNavigation.js
View File

@@ -1,5 +1,6 @@
import getChildEventSubscriber from './getChildEventSubscriber';
import getChildRouter from './getChildRouter';
import invariant from './utils/invariant';
const createParamGetter = route => (paramName, defaultValue) => {
const params = route.params;
@@ -15,17 +16,30 @@ function getChildNavigation(navigation, childKey, getCurrentParentNavigation) {
const children =
navigation._childrenNavigation || (navigation._childrenNavigation = {});
const route = navigation.state.routes.find(r => r.key === childKey);
const childRoute = navigation.state.routes.find(r => r.key === childKey);
if (children[childKey] && children[childKey].state === route) {
if (children[childKey] && children[childKey].state === childRoute) {
return children[childKey];
}
const childRouter = getChildRouter(navigation.router, route.routeName);
const childRouter = getChildRouter(navigation.router, childRoute.routeName);
// If the route has children, we'll use this to pass in to the action creators
// for the childRouter so that any action that depends on the active route will
// behave as expected. We don't explicitly require that routers implement routes
// and index properties, but if we did then we would put an invariant here to
// ensure that a focusedGrandChildRoute exists if childRouter is defined.
const focusedGrandChildRoute =
childRoute.routes && typeof childRoute.index === 'number'
? childRoute.routes[childRoute.index]
: null;
const actionCreators = {
...navigation.actions,
...navigation.router.getActionCreators(route, navigation.state.key),
...navigation.router.getActionCreators(childRoute, navigation.state.key),
...(childRouter
? childRouter.getActionCreators(focusedGrandChildRoute, childRoute.key)
: {}),
};
const actionHelpers = {};
Object.keys(actionCreators).forEach(actionName => {
@@ -40,10 +54,10 @@ function getChildNavigation(navigation, childKey, getCurrentParentNavigation) {
children[childKey] = {
...children[childKey],
...actionHelpers,
state: route,
state: childRoute,
router: childRouter,
actions: actionCreators,
getParam: createParamGetter(route),
getParam: createParamGetter(childRoute),
};
return children[childKey];
}
@@ -56,10 +70,10 @@ function getChildNavigation(navigation, childKey, getCurrentParentNavigation) {
children[childKey] = {
...actionHelpers,
state: route,
state: childRoute,
router: childRouter,
actions: actionCreators,
getParam: createParamGetter(route),
getParam: createParamGetter(childRoute),
getChildNavigation: grandChildKey =>
getChildNavigation(children[childKey], grandChildKey, () =>