fix(RouterStore): Match RouterAction type parameters (#562)

ngrx · Nov 15, 2017 · 980a653 · 980a653
1 parent ab5ad56
commit 980a653
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -51,6 +51,7 @@ __build__/**
 
 # IDE #
 .idea/
+*.iml
 *.swp
 !/typings/custom.d.ts
 .vscode/

diff --git a/modules/router-store/src/router_store_module.ts b/modules/router-store/src/router_store_module.ts
@@ -86,7 +86,7 @@ export type RouterErrorAction<T, V = RouterStateSnapshot> = {
  * An union type of router actions.
  */
 export type RouterAction<T, V = RouterStateSnapshot> =
-  | RouterNavigationAction<T>
+  | RouterNavigationAction<V>
   | RouterCancelAction<T, V>
   | RouterErrorAction<T, V>;
 
@@ -97,7 +97,7 @@ export type RouterReducerState<T = RouterStateSnapshot> = {
 
 export function routerReducer<T = RouterStateSnapshot>(
   state: RouterReducerState<T>,
-  action: RouterAction<any>
+  action: RouterAction<any, T>
 ): RouterReducerState<T> {
   switch (action.type) {
     case ROUTER_NAVIGATION:
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,6 +51,7 @@ __build__/** @@
     # IDE #
     .idea/
+    *.iml
     *.swp
     !/typings/custom.d.ts
     .vscode/
@@ Expand Down @@