@saber2pr/react-router 0.0.8 → 0.0.10

package/lib/components/nav-link.js

@@ -37,6 +37,17 @@ function joinClassnames() {
 }
 function NavLink(_a) {
     var _b = _a.activeClassName, activeClassName = _b === void 0 ? "active" : _b, activeStyle = _a.activeStyle, classNameProp = _a.className, exact = _a.exact, isActiveProp = _a.isActive, styleProp = _a.style, to = _a.to, useBrowserLink = _a.useBrowserLink, rest = __rest(_a, ["activeClassName", "activeStyle", "className", "exact", "isActive", "style", "to", "useBrowserLink"]);
+    if (useBrowserLink) {
+        var pathToMatch = window.location.pathname;
+        var isActive = isActiveProp
+            ? isActiveProp(to, pathToMatch)
+            : to === pathToMatch;
+        var className = isActive
+            ? joinClassnames(classNameProp, activeClassName)
+            : classNameProp;
+        var style = isActive ? __assign(__assign({}, styleProp), activeStyle) : styleProp;
+        return react_1.default.createElement("a", __assign({ className: className, style: style, href: to }, rest));
+    }
     return (react_1.default.createElement(context_1.RouterContext.Consumer, null, function (context) {
         var currentLocation = context.location;
         var pathToMatch = currentLocation.pathname;
@@ -47,9 +58,6 @@ function NavLink(_a) {
             ? joinClassnames(classNameProp, activeClassName)
             : classNameProp;
         var style = isActive ? __assign(__assign({}, styleProp), activeStyle) : styleProp;
-        if (useBrowserLink) {
-            return react_1.default.createElement("a", __assign({ className: className, style: style, href: to }, rest));
-        }
         return react_1.default.createElement(link_1.Link, __assign({ className: className, style: style, to: to }, rest));
     }));
 }

package/lib/history/index.d.ts

@@ -7,5 +7,7 @@ export declare type History = {
     location: Location;
     push(url: string): void;
 };
-export declare const createLocation: () => Location;
-export declare const createHashHistory: () => History;
+export declare const createLocation: (init: boolean) => Location;
+export declare const createHashHistory: ({ init }?: {
+    init: boolean;
+}) => History;

package/lib/history/index.js

@@ -18,16 +18,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * @Last Modified time: 2019-10-15 22:59:53
  */
 var utils_1 = require("../utils");
-exports.createLocation = function () {
+exports.createLocation = function (init) {
     if (window.location.hash) {
         return { pathname: utils_1.getHash() };
     }
     else {
-        window.location.hash = "/";
+        if (init) {
+            window.location.hash = "/";
+        }
         return { pathname: "/" };
     }
 };
-exports.createHashHistory = function () {
+exports.createHashHistory = function (_a) {
+    var init = (_a === void 0 ? { init: true } : _a).init;
     var listeners = [];
     var listen = function (listener) {
         listeners.push(listener);
@@ -37,7 +40,7 @@ exports.createHashHistory = function () {
         window.location.hash = pathname;
         listeners.forEach(function (listener) { return listener(__assign(__assign({}, location), { pathname: pathname })); });
     };
-    var location = exports.createLocation();
+    var location = exports.createLocation(init);
     window.addEventListener("popstate", function () { return push(utils_1.getHash()); });
     return {
         listen: listen,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saber2pr/react-router",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "description": "react-router.",
   "scripts": {
     "start": "cross-env NODE_ENV=development webpack -w",