spinning-router 0.0.3 → 0.0.5

package/dist/SpinningRouter.js

@@ -18,48 +18,63 @@ const DefaultErrorPage_1 = require("./components/DefaultErrorPage");
 const DefaultNotFoundPage_1 = require("./components/DefaultNotFoundPage");
 const matchRoute_1 = require("./matchRoute");
 const SpinningRouter = ({ routes, errorPage = DefaultErrorPage_1.DefaultErrorPage, notFoundPage = DefaultNotFoundPage_1.DefaultNotFoundPage, loadingIndicator = DefaultLoadingIndicator_1.DefaultLoadingIndicator }) => {
-    const [hash, setHash] = (0, react_1.useState)(() => location.hash.substring(1));
+    const [path, setPath] = (0, react_1.useState)(() => location.hash.substring(1));
+    const [match, setMatch] = (0, react_1.useState)("");
     const [element, setElement] = (0, react_1.useState)(undefined);
     const [overlay, setOverlay] = (0, react_1.useState)(undefined);
     const [parameters, setParameters] = (0, react_1.useState)({});
     const invokeRoute = (path) => __awaiter(void 0, void 0, void 0, function* () {
-        setOverlay(loadingIndicator);
         try {
             const match = yield (0, matchRoute_1.matchRoute)(routes, path);
             if (match) {
+                setMatch(match.path);
                 setElement(match.element);
                 setParameters(match.parameters);
             }
             else {
+                setMatch("");
+                window.scrollTo(0, 0);
                 setElement(notFoundPage);
                 setParameters({});
             }
-            window.scrollTo(0, 0);
         }
         catch (error) {
+            setMatch("");
             window.scrollTo(0, 0);
             setElement(errorPage({ error }));
             setParameters({});
         }
+    });
+    const invokeRouteWithSpinner = () => __awaiter(void 0, void 0, void 0, function* () {
+        const path = location.hash.substring(1);
+        setOverlay(loadingIndicator);
+        setPath(path);
+        try {
+            yield invokeRoute(path);
+            window.scrollTo(0, 0);
+        }
         finally {
             setOverlay(undefined);
         }
     });
     (0, react_1.useEffect)(() => {
-        invokeRoute(hash);
+        invokeRouteWithSpinner();
     }, []);
     (0, react_1.useEffect)(() => {
         const updateHash = () => __awaiter(void 0, void 0, void 0, function* () {
-            setHash(location.hash.substring(1));
+            yield invokeRouteWithSpinner();
+        });
+        const doSoftRefresh = () => __awaiter(void 0, void 0, void 0, function* () {
             yield invokeRoute(location.hash.substring(1));
         });
         window.addEventListener("hashchange", updateHash);
-        window.addEventListener("softRefresh", updateHash);
+        window.addEventListener("softRefresh", doSoftRefresh);
         return () => {
             window.removeEventListener("hashchange", updateHash);
-            window.removeEventListener("softRefresh", updateHash);
+            window.removeEventListener("softRefresh", doSoftRefresh);
         };
     }, []);
-    return ((0, jsx_runtime_1.jsxs)(Location_1.Location.Provider, { value: { path: hash, match: "", parameters }, children: [element, overlay] }));
+    window.SpinningRouterLocation = { path, match, parameters };
+    return ((0, jsx_runtime_1.jsxs)(Location_1.Location.Provider, { value: Object.assign({}, window.SpinningRouterLocation), children: [element, overlay] }));
 };
 exports.SpinningRouter = SpinningRouter;

package/dist/link.js

@@ -1,14 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.link = exports.unsafeLink = void 0;
-const Location_1 = require("./Location");
-const react_1 = require("react");
 const unsafeLink = (path, values) => {
     let result = [];
     for (let part of path.split("/")) {
         if (part.startsWith(":")) {
             const key = part.substring(1);
-            let value = values && values[key] !== undefined ? values[key] : (0, react_1.useContext)(Location_1.Location).parameters[key];
+            let value = values && values[key] !== undefined ? values[key] : window.SpinningRouterLocation.parameters[key];
             result.push(encodeURIComponent(value));
         }
         else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spinning-router",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "n/a",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",