@tanstack/react-router 0.0.1-beta.250 → 0.0.1-beta.251

package/build/umd/index.development.js

@@ -167,9 +167,9 @@
    */
   function createBrowserHistory(opts) {
     const win = opts?.window ?? (typeof document !== 'undefined' ? window : undefined);
-    const getHref = opts?.getHref ?? (() => `${win.location.pathname}${win.location.search}${win.location.hash}`);
     const createHref = opts?.createHref ?? (path => path);
-    let currentLocation = parseLocation(getHref(), win.history.state);
+    const parseLocation = opts?.parseLocation ?? (() => parseHref(`${win.location.pathname}${win.location.search}${win.location.hash}`, win.history.state));
+    let currentLocation = parseLocation();
     let rollbackLocation;
     const getLocation = () => currentLocation;
     let next;
@@ -206,14 +206,15 @@
     };
 
     // This function queues up a call to update the browser history
-    const queueHistoryAction = (type, path, state, onUpdate) => {
-      const href = createHref(path);
+    const queueHistoryAction = (type, destHref, state, onUpdate) => {
+      console.log(destHref);
+      const href = createHref(destHref);
       if (!scheduled) {
         rollbackLocation = currentLocation;
       }
 
       // Update the location in memory
-      currentLocation = parseLocation(href, state);
+      currentLocation = parseHref(destHref, state);
 
       // Keep track of the next location we need to flush to the URL
       next = {
@@ -230,19 +231,19 @@
       }
     };
     const onPushPop = () => {
-      currentLocation = parseLocation(getHref(), win.history.state);
+      currentLocation = parseLocation();
       history.notify();
     };
     var originalPushState = win.history.pushState;
     var originalReplaceState = win.history.replaceState;
     const history = createHistory({
       getLocation,
-      pushState: (path, state, onUpdate) => queueHistoryAction('push', path, state, onUpdate),
-      replaceState: (path, state, onUpdate) => queueHistoryAction('replace', path, state, onUpdate),
+      pushState: (href, state, onUpdate) => queueHistoryAction('push', href, state, onUpdate),
+      replaceState: (href, state, onUpdate) => queueHistoryAction('replace', href, state, onUpdate),
       back: () => win.history.back(),
       forward: () => win.history.forward(),
       go: n => win.history.go(n),
-      createHref: path => createHref(path),
+      createHref: href => createHref(href),
       flush,
       destroy: () => {
         win.history.pushState = originalPushState;
@@ -277,9 +278,13 @@
   function createHashHistory(opts) {
     const win = opts?.window ?? (typeof document !== 'undefined' ? window : undefined);
     return createBrowserHistory({
-      getHref: () => win.location.hash.substring(1),
-      createHref: path => `#${path}`,
-      window: win
+      window: win,
+      parseLocation: () => {
+        const hashHref = win.location.hash.split('#').slice(1).join('#') ?? '/';
+        console.log(hashHref);
+        return parseHref(hashHref, win.history.state);
+      },
+      createHref: href => `${win.location.pathname}${win.location.search}#${href}`
     });
   }
   function createMemoryHistory(opts = {
@@ -290,7 +295,7 @@
     let currentState = {
       key: createRandomKey()
     };
-    const getLocation = () => parseLocation(entries[index], currentState);
+    const getLocation = () => parseHref(entries[index], currentState);
     return createHistory({
       getLocation,
       pushState: (path, state) => {
@@ -314,7 +319,7 @@
       createHref: path => path
     });
   }
-  function parseLocation(href, state) {
+  function parseHref(href, state) {
     let hashIndex = href.indexOf('#');
     let searchIndex = href.indexOf('?');
     return {
@@ -2262,7 +2267,7 @@
           searchStr,
           state: nextState,
           hash,
-          href: this.history.createHref(`${pathname}${searchStr}${hashStr}`),
+          href: `${pathname}${searchStr}${hashStr}`,
           unmaskOnReload: dest.unmaskOnReload
         };
       };