Add basePath prop

- Allows specifying a base path for all paths in Switcher
jdlehman · Apr 25, 2015 · 862f5fd · 862f5fd
1 parent a91e604
commit 862f5fd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/dist/switcheroo.min.js b/dist/switcheroo.min.js
diff --git a/docs/components/Switcher.md b/docs/components/Switcher.md
@@ -63,3 +63,7 @@ onChange(match, pathname) { ... }
 ### wrapper
 
 If the `wrapper` prop is defined, the rendered `Switch` will be wrapped in the specified React component. Any additional props passed to the `Switcher` will also be properties of this component.
+
+### basePath (default: '')
+
+`basePath` is prepended to all path properties in the components inside `Switcher`. If `basePath` is set to `/base/path` then a component with path, `/home` will match the path `/base/path/home`.
diff --git a/modules/components/Switcher.js b/modules/components/Switcher.js
@@ -53,7 +53,7 @@ export default class Switcher extends Component {
   getSwitch(path) {
     var children = [].concat(this.props.children);
     return children.filter((child) => {
-      return child.props.path === path;
+      return `${this.props.basePath}${child.props.path}` === path;
     })[0];
   }
 
@@ -97,12 +97,14 @@ Switcher.propTypes = {
   defaultHandlerProps: React.PropTypes.object,
   onChange: React.PropTypes.func,
   wrapper: React.PropTypes.any,
-  location: React.PropTypes.string
+  location: React.PropTypes.string,
+  baseURL: React.PropTypes.string
 };
 
 Switcher.defaultProps = {
   pushState: false,
   hashChange: true,
   load: true,
-  location: 'hash'
+  location: 'hash',
+  basePath: ''
 };