fix(router): Incorrect values passed to route context

Strikersoft · Jan 3, 2018 · 23792c9 · 23792c9
1 parent 1c780ed
commit 23792c9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/examples/simple-ts/pages/root.page.tsx b/examples/simple-ts/pages/root.page.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { Link, Translator, Component, observable, i18n } from '../../../src/poa';
+import { Link, Translator, Component, observable, i18n, Route } from '../../../src/poa';
 
-import { Store, Actions } from '../store';
+import { Store, Actions, RouterHookOpts } from '../store';
 
 @Component({ namespaces: ['common', 'pages'] })
 export class RootPage extends React.Component {
@@ -11,6 +11,16 @@ export class RootPage extends React.Component {
 
   @observable localState = { newHello: '' };
 
+  static canActivate(route: Route) {
+    const { store }: RouterHookOpts = route.context;
+
+    if (!store.helloText) {
+      return false;
+    }
+
+    return true;
+  }
+
   render() {
     return (
       <React.Fragment>

diff --git a/examples/simple-ts/store/index.ts b/examples/simple-ts/store/index.ts
@@ -6,3 +6,4 @@ export type Actions = typeof actions;
 
 export type MutationOpts = { store: Store };
 export type SideEffectOpts = { store: Store; actions: Actions };
+export type RouterHookOpts = { store: Store; actions: Actions };
diff --git a/src/poa.tsx b/src/poa.tsx
@@ -39,8 +39,6 @@ export async function boot(config: PoaBootConfig) {
     await reactDomPromisify(<config.react.loadingComponent />, config.react.htmlNode);
   }
 
-  const { router } = await bootRouter(config);
-
   await bootstrapLocalization(config.i18n || {});
 
   if (config.state) {
@@ -51,6 +49,8 @@ export async function boot(config: PoaBootConfig) {
     await bootstrapState({}, [], config.env);
   }
 
+  const { router } = await bootRouter(config);
+
   await reactDomPromisify(
     <PoaApp config={config} router={router} />,