Support hashRoot in HashHistoryOptions

packages/history/__tests__/hash-root-test.js

@@ -0,0 +1,6 @@
+import expect from 'expect';
+import { testHashHistory } from './hash-test.js';
+
+describe('a hash history with no slash', () => {
+  testHashHistory('#', {hashRoot: ""})
+});

packages/history/__tests__/hash-test.js

@@ -1,5 +1,5 @@
 import expect from 'expect';
-import { createHashHistory } from 'history';
+import { createHashHistory, createPath } from 'history';
 
 import Listen from './TestSequences/Listen.js';
 import InitialLocationDefaultKey from './TestSequences/InitialLocationDefaultKey.js';
@@ -21,12 +21,19 @@ import BlockPopWithoutListening from './TestSequences/BlockPopWithoutListening.j
 // const canGoWithoutReload = window.navigator.userAgent.indexOf('Firefox') === -1;
 // const describeGo = canGoWithoutReload ? describe : describe.skip;
 
-describe('a hash history', () => {
+export const testHashHistory = (initialRoot, options) => {
   let history;
   beforeEach(() => {
-    window.history.replaceState(null, null, '#/');
-    history = createHashHistory();
+    window.history.replaceState(null, null, initialRoot);
+    history = createHashHistory(options);
   });
+  afterEach(() => {
+    // Test window location at every step
+    const { hashRoot = "/" } = options || {};
+    const historyHref = createPath(history.location);
+    const windowHref = window.location.hash.substr(1);
+    expect(historyHref.replace(/^\//, hashRoot)).toEqual(windowHref);
+  })
 
   it('knows how to create hrefs from location objects', () => {
     const href = history.createHref({
@@ -144,4 +151,8 @@ describe('a hash history', () => {
       BlockPopWithoutListening(history, done);
     });
   });
+}
+
+describe('a hash history', () => {
+  testHashHistory('#/')
 });

packages/history/index.ts

@@ -573,7 +573,7 @@ export function createBrowserHistory(
 // HASH
 ////////////////////////////////////////////////////////////////////////////////
 
-export type HashHistoryOptions = { window?: Window };
+export type HashHistoryOptions = { window?: Window, hashRoot?: string };
 
 /**
  * Hash history stores the location in window.location.hash. This makes it ideal
@@ -589,12 +589,23 @@ export function createHashHistory(
   let { window = document.defaultView! } = options;
   let globalHistory = window.history;
 
+  let { hashRoot = '/' } = options;
+
+  function prefixPathname([base, root]: string[], partial: Partial<Path>) {
+    const input = partial.pathname || base;
+    return input.match(/^\.+\//) ? partial : {
+      ...partial, pathname: input.replace(base, root)
+    };
+  }
+  const pathFromGlobal = prefixPathname.bind(null, [hashRoot, '/']);
+  const pathToGlobal = prefixPathname.bind(null, ['/', hashRoot]);
+
   function getIndexAndLocation(): [number, Location] {
     let {
       pathname = '/',
       search = '',
       hash = ''
-    } = parsePath(window.location.hash.substr(1));
+    } = pathFromGlobal(parsePath(window.location.hash.substr(1)));
     let state = globalHistory.state || {};
     return [
       state.idx,
@@ -714,7 +725,7 @@ export function createHashHistory(
         key: nextLocation.key,
         idx: index
       },
-      createHref(nextLocation)
+      createHref(pathToGlobal(nextLocation))
     ];
   }