do not normalize to if already a route in getMatchedComponents() (fix #…

…1381)
vuejs · May 1, 2017 · 34b9abc · 34b9abc
1 parent 90ba1cc
commit 34b9abc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/index.js b/src/index.js
@@ -158,9 +158,11 @@ export default class VueRouter {
     this.go(1)
   }
 
-  getMatchedComponents (to?: RawLocation): Array<any> {
-    const route = to
-      ? this.resolve(to).route
+  getMatchedComponents (to?: RawLocation | Route): Array<any> {
+    const route: any = to
+      ? to.matched
+        ? to
+        : this.resolve(to).route
       : this.currentRoute
     if (!route) {
       return []

diff --git a/types/router.d.ts b/types/router.d.ts
@@ -28,7 +28,7 @@ declare class VueRouter {
   go (n: number): void;
   back (): void;
   forward (): void;
-  getMatchedComponents (to?: RawLocation): Component[];
+  getMatchedComponents (to?: RawLocation | Route): Component[];
   onReady (cb: Function, errorCb?: Function): void;
   onError (cb: Function): void;
   addRoutes (routes: RouteConfig[]): void;