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

refactor: rename names to routeNames for clarity

Browse Source
This commit is contained in:
satyajit.happy
2019-07-14 14:57:02 +02:00
parent 86890b2b33
commit 43bc406c00
4 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
example/StackNavigator.tsx
View File

@@ -76,10 +76,10 @@ const StackRouter: Router<CommonAction | Action> = {
};
}
if (state.names === undefined || state.key === undefined) {
if (state.routeNames === undefined || state.key === undefined) {
state = {
...state,
names: state.names || routeNames,
routeNames: state.routeNames || routeNames,
key: state.key || `stack-${shortid()}`,
};
}
@@ -90,7 +90,7 @@ const StackRouter: Router<CommonAction | Action> = {
getStateForAction(state, action) {
switch (action.type) {
case 'PUSH':
if (state.names.includes(action.payload.name)) {
if (state.routeNames.includes(action.payload.name)) {
return {
...state,
index: state.index + 1,
@@ -128,7 +128,7 @@ const StackRouter: Router<CommonAction | Action> = {
});
case 'NAVIGATE':
if (state.names.includes(action.payload.name)) {
if (state.routeNames.includes(action.payload.name)) {
// If the route already exists, navigate to that
let index = -1;
@@ -199,7 +199,7 @@ const StackRouter: Router<CommonAction | Action> = {
return {
...action.payload,
key: state.key,
names: state.names,
routeNames: state.routeNames,
};
}