handle all possible types for To

remix-run · Dec 21, 2021 · 821d40c · 821d40c
1 parent 2bf3314
commit 821d40c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/packages/history/__tests__/hash-root-test.js b/packages/history/__tests__/hash-root-test.js
@@ -18,5 +18,5 @@ describe('a hash history with no slash', () => {
         return Reflect.get(target, prop, _);
       }
     });
-  })  
+  })
 });
diff --git a/packages/history/__tests__/hash-test.js b/packages/history/__tests__/hash-test.js
@@ -149,5 +149,5 @@ export const testHashHistory = (root, createHistory) => {
 describe('a hash history', () => {
   testHashHistory('#/', () => {
     return createHashHistory();
-  })  
+  })
 });
diff --git a/packages/history/index.ts b/packages/history/index.ts
@@ -591,20 +591,19 @@ export function createHashHistory(
 
   let { hashRoot = '/' } = options;
 
-  function parsePathInput(pathname) {
-    return parsePath(pathname.replace(hashRoot, '/'));
-  }
-
-  function parsePathOutput(pathname) {
-    return parsePath(pathname.replace('/', hashRoot));
+  function prefixPathname([base, root]: string[], partial: Partial<Path>) {
+    const pathname = (partial.pathname || base).replace(base, root);
+    return { pathname, ...partial };
   }
+  const pathFromGlobal = prefixPathname.bind(null, [hashRoot, '/']);
+  const pathToGlobal = prefixPathname.bind(null, ['/', hashRoot]);
 
   function getIndexAndLocation(): [number, Location] {
     let {
       pathname = '/',
       search = '',
       hash = ''
-    } = parsePathInput(window.location.hash.substr(1));
+    } = pathFromGlobal(parsePath(window.location.hash.substr(1)))
     let state = globalHistory.state || {};
     return [
       state.idx,
@@ -708,7 +707,7 @@ export function createHashHistory(
       pathname: location.pathname,
       hash: '',
       search: '',
-      ...(typeof to === 'string' ? parsePathOutput(to) : to),
+      ...(typeof to === 'string' ? parsePath(to) : to),
       state,
       key: createKey()
     });
@@ -724,7 +723,7 @@ export function createHashHistory(
         key: nextLocation.key,
         idx: index
       },
-      createHref(nextLocation)
+      createHref(pathToGlobal(nextLocation))
     ];
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,5 +18,5 @@ describe('a hash history with no slash', () => { @@
             return Reflect.get(target, prop, _);
           }
         });
-      })
+      })
     });