Merge pull request #3858 from ReactTraining/you-so-basic

Fix basename support

Author: mjackson

modules/BrowserRouter.js

@@ -11,6 +11,7 @@ const BrowserRouter = ({ basename, keyLength, ...rest }) => (
       <StaticRouter
         action={action}
         location={location}
+        basename={basename}
         onPush={history.push}
         onReplace={history.replace}
         blockTransitions={history.block}

modules/HashRouter.js

@@ -11,6 +11,7 @@ const HashRouter = ({ basename, hashType, ...rest }) => (
       <StaticRouter
         action={action}
         location={location}
+        basename={basename}
         onPush={history.push}
         onReplace={history.replace}
         onGo={history.go}

modules/StaticRouter.js

@@ -20,6 +20,7 @@ class StaticRouter extends React.Component {
     children: PropTypes.oneOfType([ PropTypes.node, PropTypes.func ]),
     createHref: PropTypes.func.isRequired,
     location: PropTypes.oneOfType([ PropTypes.object, PropTypes.string ]).isRequired,
+    basename: PropTypes.string,
     onPush: PropTypes.func.isRequired,
     onReplace: PropTypes.func.isRequired,
     stringifyQuery: PropTypes.func.isRequired,
@@ -45,7 +46,8 @@ class StaticRouter extends React.Component {
 
   getChildContext() {
     const createHref = (to) => {
-      const path = createRouterPath(to, this.props.stringifyQuery)
+      let path = createRouterPath(to, this.props.stringifyQuery)
+      if (this.props.basename) path = this.props.basename + path
       return this.props.createHref(path)
     }
 

modules/__tests__/StaticRouter-test.js

@@ -1,6 +1,7 @@
 import expect from 'expect'
 import React from 'react'
 import StaticRouter from '../StaticRouter'
+import { router as routerType } from '../PropTypes'
 import { renderToString } from 'react-dom/server'
 
 //console.error = () => {}
@@ -187,4 +188,32 @@ describe('StaticRouter', () => {
 
     })
   })
+
+  describe('basename support', () => {
+    class Test extends React.Component {
+      static contextTypes = {
+        router: routerType
+      }
+
+      render() {
+        return <div>{this.context.router.createHref('/bar')}</div>
+      }
+    }
+
+    const BASENAME = "/foo"
+    const routerProps = {
+      location: '/',
+      action: 'POP',
+      onPush: () => {},
+      onReplace: () => {}
+    }
+
+    it('uses the basename when creating hrefs', () => {
+      expect(renderToString(
+        <StaticRouter {...routerProps} basename={BASENAME}>
+          <Test />
+        </StaticRouter>
+      )).toContain(BASENAME)
+    })
+  })
 })