fix: add fixes from PR #940

alexsasharegan · alexsasharegan · commit c57dc8f22eb8 · 2017-09-07T21:34:17.000-07:00
diff --git a/lib/components/link.js b/lib/components/link.js
@@ -85,19 +85,29 @@ export const computed = {
     }
 };
 
-function computeTag(props) {
-    return props.to && !props.disabled ? "router-link" : "a";
+function computeTag(props, parent) {
+    return Boolean(parent.$router) && props.to && !props.disabled ? "router-link" : "a";
 }
 
 function computeHref({ disabled, href, to }, tag) {
+    // We've already checked the parent.$router in computeTag,
+    // so router-link means live router.
     // When deferring to Vue Router's router-link,
     // don't use the href attr at all.
-    if (tag === "router-link") return null;
+    // Must return undefined for router-link to populate href.
+    if (tag === "router-link") return void 0;
     if (disabled) return "#";
     // If href explicitly provided
     if (href) return href;
+    // Reconstruct href when `to` used, but no router
+    if (to) {
+        // Fallback to `to` prop (if `to` is a string)
+        if (typeof to === "string") return to;
+        // Fallback to `to.path` prop (if `to` is an object)
+        if (typeof to === "object" && typeof to.path === "string") return to.path;
+    }
     // If nothing is provided use '#'
-    return '#'
+    return "#";
 }
 
 function computeRel({ target, rel }) {
@@ -138,7 +148,7 @@ export default {
     functional: true,
     props: propsFactory(),
     render(h, { props, data, parent, children }) {
-        const tag = computeTag(props),
+        const tag = computeTag(props, parent),
             rel = computeRel(props),
             href = computeHref(props, tag),
             eventType = tag === "router-link" ? "nativeOn" : "on",
