fix: names of routers

react-navigation · Jul 23, 2019 · 6637ae0 · 6637ae0
1 parent e81116a
commit 6637ae0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/example/StackNavigator.tsx b/example/StackNavigator.tsx
@@ -69,8 +69,8 @@ export type StackNavigationProp<
   popToTop(): void;
 };
 
-function CurrentRouter(options: DefaultRouterOptions) {
-  const StackRouter: Router<NavigationState, CommonAction | Action> = {
+function StackRouter(options: DefaultRouterOptions) {
+  const router: Router<NavigationState, CommonAction | Action> = {
     ...BaseRouter,
 
     getInitialState({ routeNames, routeParamList }) {
@@ -163,7 +163,7 @@ function CurrentRouter(options: DefaultRouterOptions) {
           return null;
 
         case 'POP_TO_TOP':
-          return StackRouter.getStateForAction(state, {
+          return router.getStateForAction(state, {
             type: 'POP',
             payload: { count: state.routes.length - 1 },
           });
@@ -199,7 +199,7 @@ function CurrentRouter(options: DefaultRouterOptions) {
             }
 
             if (index === -1 && action.payload.name !== undefined) {
-              return StackRouter.getStateForAction(state, {
+              return router.getStateForAction(state, {
                 type: 'PUSH',
                 payload: {
                   name: action.payload.name,
@@ -228,7 +228,7 @@ function CurrentRouter(options: DefaultRouterOptions) {
           return null;
 
         case 'GO_BACK':
-          return StackRouter.getStateForAction(state, {
+          return router.getStateForAction(state, {
             type: 'POP',
             payload: { count: 1 },
           });
@@ -250,14 +250,14 @@ function CurrentRouter(options: DefaultRouterOptions) {
       },
     },
   };
-  return StackRouter;
+  return router;
 }
 
 export function StackNavigator(props: Props) {
   const { state, descriptors } = useNavigationBuilder<
     NavigationState,
     StackNavigationOptions
-  >(CurrentRouter, props);
+  >(StackRouter, props);
 
   return (
     <div style={{ position: 'relative' }}>

diff --git a/example/TabNavigator.tsx b/example/TabNavigator.tsx
@@ -53,8 +53,8 @@ export type TabNavigationProp<
   ): void;
 };
 
-function CurrentRouter(options: DefaultRouterOptions) {
-  const TabRouter: Router<NavigationState, Action | CommonAction> = {
+function TabRouter(options: DefaultRouterOptions) {
+  const router: Router<NavigationState, Action | CommonAction> = {
     ...BaseRouter,
 
     getInitialState({ routeNames, routeParamList }) {
@@ -174,14 +174,14 @@ function CurrentRouter(options: DefaultRouterOptions) {
       },
     },
   };
-  return TabRouter;
+  return router;
 }
 
 export function TabNavigator(props: Props) {
   const { state, descriptors } = useNavigationBuilder<
     NavigationState,
     TabNavigationOptions
-  >(CurrentRouter, props);
+  >(TabRouter, props);
 
   return (
     <div style={{ display: 'flex', flexDirection: 'row', height: '100%' }}>

diff --git a/src/__tests__/__fixtures__/MockRouter.tsx b/src/__tests__/__fixtures__/MockRouter.tsx
@@ -7,8 +7,8 @@ export type MockActions = CommonAction & {
 
 export const MockRouterKey = { current: 0 };
 
-export default function CurrentRouter(options: DefaultRouterOptions) {
-  const MockRouter: Router<NavigationState, MockActions> = {
+export default function MockRouter(options: DefaultRouterOptions) {
+  const router: Router<NavigationState, MockActions> = {
     getInitialState({ routeNames, routeParamList }) {
       const index =
         options.initialRouteName === undefined
@@ -84,5 +84,5 @@ export default function CurrentRouter(options: DefaultRouterOptions) {
     actionCreators: {},
   };
 
-  return MockRouter;
+  return router;
 }