From 19a58c25ef1e036ffdcb39eac577387043a19eb9 Mon Sep 17 00:00:00 2001
From: Jonathan Lehman <jonathan.lehman91@gmail.com>
Date: Fri, 1 Apr 2016 12:25:10 -0400
Subject: [PATCH] Set dynamic values for component on mount

- Fixes bug when a component is remounted but there is no switch change
  and the dynamic values were not set
---
 dist/switcheroo.min.js | 2 +-
 src/index.js           | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dist/switcheroo.min.js b/dist/switcheroo.min.js
index c366060..63a645d 100644
--- a/dist/switcheroo.min.js
+++ b/dist/switcheroo.min.js
@@ -1 +1 @@
-!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t(require("react")):"function"==typeof define&&define.amd?define(["react"],t):"object"==typeof exports?exports.switcheroo=t(require("react")):e.switcheroo=t(e.React)}(this,function(e){return function(e){function t(o){if(n[o])return n[o].exports;var r=n[o]={exports:{},id:o,loaded:!1};return e[o].call(r.exports,r,r.exports,t),r.loaded=!0,r.exports}var n={};return t.m=e,t.c=n,t.p="",t(0)}([function(e,t,n){"use strict";function o(e){return e&&e.__esModule?e:{"default":e}}function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function a(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(t,"__esModule",{value:!0});var s=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(e[o]=n[o])}return e},c=function(){function e(e,t){for(var n=0;n<t.length;n++){var o=t[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}return function(t,n,o){return n&&e(t.prototype,n),o&&e(t,o),t}}(),p=n(2),u=o(p),h=n(1),l=function(e){function t(e){r(this,t);var n=a(this,Object.getPrototypeOf(t).call(this,e));f.call(n);var o=(0,h.currentPath)(e.location),i=(0,h.getSwitch)(o,e);return n.state={visibleSwitch:i,dynamicValues:{}},n}return i(t,e),c(t,[{key:"componentDidMount",value:function(){this.props.load&&window.addEventListener("load",this.handleRouteChange),this.props.pushState&&window.addEventListener("popstate",this.handleRouteChange),this.props.hashChange&&window.addEventListener("hashchange",this.handleRouteChange)}},{key:"componentWillReceiveProps",value:function(e){this.handleSwitchChange(e)}},{key:"shouldComponentUpdate",value:function(e){return!e.preventUpdate()}},{key:"componentWillUnmount",value:function(){this.props.load&&window.removeEventListener("load",this.handleRouteChange),this.props.pushState&&window.removeEventListener("popstate",this.handleRouteChange),this.props.hashChange&&window.removeEventListener("hashchange",this.handleRouteChange)}},{key:"render",value:function(){var e=this.state.visibleSwitch||{},t=e.props,n=this.state.visibleSwitch&&u["default"].cloneElement(this.state.visibleSwitch,s({},t,this.props.mapDynamicSegments(this.state.dynamicValues)));return this.props.wrapper?u["default"].createElement(this.props.wrapper,this.props,n):n}}]),t}(p.Component);l.displayName="Switcher",l.propTypes={children:p.PropTypes.oneOfType([p.PropTypes.arrayOf(p.PropTypes.node),p.PropTypes.node]),pushState:p.PropTypes.bool,hashChange:p.PropTypes.bool,load:p.PropTypes.bool,onChange:p.PropTypes.func,wrapper:p.PropTypes.any,location:p.PropTypes.string,basePath:p.PropTypes.string,preventUpdate:p.PropTypes.func,mapDynamicSegments:p.PropTypes.func},l.defaultProps={pushState:!1,hashChange:!0,load:!0,location:"hash",basePath:"",preventUpdate:function(){return!1},mapDynamicSegments:function(e){return e}};var f=function(){var e=this;this.handleSwitchChange=function(t){var n=(0,h.currentPath)(t.location),o=(0,h.getSwitch)(n,t),r=(0,h.getDynamicSegments)(n,t.basePath,o);"function"==typeof t.onChange&&t.onChange(!!o,n,r),e.setState({visibleSwitch:o,dynamicValues:r})},this.handleRouteChange=function(t){e.handleSwitchChange(e.props)}};t["default"]=l},function(e,t){"use strict";function n(e){var t=decodeURI(window.location[e].slice(1).split("?")[0]);return"/"!==t.charAt(0)?"/"+t:t}function o(e){return"/"===e?e:"/"!==e.slice(-1)?e:e.slice(0,-1)}function r(e){return e.replace(/\/:[^\/]+/g,"/([^/]+)")}function a(e){var t=e.match(/:[^\/]+/g)||[];return t.map(function(e){return e.substr(1)})}function i(e,t){return r(o(e+t)+"/?")}function s(e){return new RegExp("^("+e.join("|")+")$")}function c(e,t){var n=t.children,r=t.basePath,a=o(e),c=[].concat(n||[]);return c.filter(function(e){var t=[].concat(e.props.path).map(function(e){return i(r,e)}),n=s(t);return n.test(a)})[0]||null}function p(e,t,n){var r={},s=o(e);return n&&[].concat(n.props.path).forEach(function(e){var n=a(t+e),o=i(t,e),c=s.match(new RegExp("^"+o+"$"));c&&(c.shift(),n.forEach(function(e,t){r[e]=c[t]}))}),r}Object.defineProperty(t,"__esModule",{value:!0}),t.currentPath=n,t.removeTrailingSlash=o,t.replaceDynamicSegments=r,t.getDynamicSegmentNames=a,t.formatPathRegex=i,t.createRegexFromPaths=s,t.getSwitch=c,t.getDynamicSegments=p},function(t,n){t.exports=e}])});
\ No newline at end of file
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t(require("react")):"function"==typeof define&&define.amd?define(["react"],t):"object"==typeof exports?exports.switcheroo=t(require("react")):e.switcheroo=t(e.React)}(this,function(e){return function(e){function t(o){if(n[o])return n[o].exports;var r=n[o]={exports:{},id:o,loaded:!1};return e[o].call(r.exports,r,r.exports,t),r.loaded=!0,r.exports}var n={};return t.m=e,t.c=n,t.p="",t(0)}([function(e,t,n){"use strict";function o(e){return e&&e.__esModule?e:{"default":e}}function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function a(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(t,"__esModule",{value:!0});var s=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(e[o]=n[o])}return e},c=function(){function e(e,t){for(var n=0;n<t.length;n++){var o=t[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}return function(t,n,o){return n&&e(t.prototype,n),o&&e(t,o),t}}(),p=n(2),u=o(p),h=n(1),l=function(e){function t(e){r(this,t);var n=a(this,Object.getPrototypeOf(t).call(this,e));f.call(n);var o=(0,h.currentPath)(e.location),i=(0,h.getSwitch)(o,e),s=(0,h.getDynamicSegments)(o,e.basePath,i);return n.state={visibleSwitch:i,dynamicValues:s},n}return i(t,e),c(t,[{key:"componentDidMount",value:function(){this.props.load&&window.addEventListener("load",this.handleRouteChange),this.props.pushState&&window.addEventListener("popstate",this.handleRouteChange),this.props.hashChange&&window.addEventListener("hashchange",this.handleRouteChange)}},{key:"componentWillReceiveProps",value:function(e){this.handleSwitchChange(e)}},{key:"shouldComponentUpdate",value:function(e){return!e.preventUpdate()}},{key:"componentWillUnmount",value:function(){this.props.load&&window.removeEventListener("load",this.handleRouteChange),this.props.pushState&&window.removeEventListener("popstate",this.handleRouteChange),this.props.hashChange&&window.removeEventListener("hashchange",this.handleRouteChange)}},{key:"render",value:function(){var e=this.state.visibleSwitch||{},t=e.props,n=this.state.visibleSwitch&&u["default"].cloneElement(this.state.visibleSwitch,s({},t,this.props.mapDynamicSegments(this.state.dynamicValues)));return this.props.wrapper?u["default"].createElement(this.props.wrapper,this.props,n):n}}]),t}(p.Component);l.displayName="Switcher",l.propTypes={children:p.PropTypes.oneOfType([p.PropTypes.arrayOf(p.PropTypes.node),p.PropTypes.node]),pushState:p.PropTypes.bool,hashChange:p.PropTypes.bool,load:p.PropTypes.bool,onChange:p.PropTypes.func,wrapper:p.PropTypes.any,location:p.PropTypes.string,basePath:p.PropTypes.string,preventUpdate:p.PropTypes.func,mapDynamicSegments:p.PropTypes.func},l.defaultProps={pushState:!1,hashChange:!0,load:!0,location:"hash",basePath:"",preventUpdate:function(){return!1},mapDynamicSegments:function(e){return e}};var f=function(){var e=this;this.handleSwitchChange=function(t){var n=(0,h.currentPath)(t.location),o=(0,h.getSwitch)(n,t),r=(0,h.getDynamicSegments)(n,t.basePath,o);"function"==typeof t.onChange&&t.onChange(!!o,n,r),e.setState({visibleSwitch:o,dynamicValues:r})},this.handleRouteChange=function(t){e.handleSwitchChange(e.props)}};t["default"]=l},function(e,t){"use strict";function n(e){var t=decodeURI(window.location[e].slice(1).split("?")[0]);return"/"!==t.charAt(0)?"/"+t:t}function o(e){return"/"===e?e:"/"!==e.slice(-1)?e:e.slice(0,-1)}function r(e){return e.replace(/\/:[^\/]+/g,"/([^/]+)")}function a(e){var t=e.match(/:[^\/]+/g)||[];return t.map(function(e){return e.substr(1)})}function i(e,t){return r(o(e+t)+"/?")}function s(e){return new RegExp("^("+e.join("|")+")$")}function c(e,t){var n=t.children,r=t.basePath,a=o(e),c=[].concat(n||[]);return c.filter(function(e){var t=[].concat(e.props.path).map(function(e){return i(r,e)}),n=s(t);return n.test(a)})[0]||null}function p(e,t,n){var r={},s=o(e);return n&&[].concat(n.props.path).forEach(function(e){var n=a(t+e),o=i(t,e),c=s.match(new RegExp("^"+o+"$"));c&&(c.shift(),n.forEach(function(e,t){r[e]=c[t]}))}),r}Object.defineProperty(t,"__esModule",{value:!0}),t.currentPath=n,t.removeTrailingSlash=o,t.replaceDynamicSegments=r,t.getDynamicSegmentNames=a,t.formatPathRegex=i,t.createRegexFromPaths=s,t.getSwitch=c,t.getDynamicSegments=p},function(t,n){t.exports=e}])});
\ No newline at end of file
diff --git a/src/index.js b/src/index.js
index 8d60cd8..1921a70 100644
--- a/src/index.js
+++ b/src/index.js
@@ -39,9 +39,10 @@ export default class Switcher extends Component {
 
     var currPath = currentPath(props.location);
     var switchElement = getSwitch(currPath, props);
+    var dynamicValues = getDynamicSegments(currPath, props.basePath, switchElement);
     this.state = {
       visibleSwitch: switchElement,
-      dynamicValues: {}
+      dynamicValues
     };
   }