diff --git a/common/app/routes/Hikes/components/Hike.jsx b/common/app/routes/Hikes/components/Hike.jsx index 687c1474eb..ed42875864 100644 --- a/common/app/routes/Hikes/components/Hike.jsx +++ b/common/app/routes/Hikes/components/Hike.jsx @@ -6,6 +6,7 @@ import { createSelector } from 'reselect'; import Lecture from './Lecture.jsx'; import Questions from './Questions.jsx'; import { resetHike } from '../redux/actions'; +import { updateTitle } from '../../../redux/actions'; import { getCurrentHike } from '../redux/selectors'; const mapStateToProps = createSelector( @@ -27,9 +28,15 @@ export class Hike extends React.Component { // ui title: PropTypes.string, params: PropTypes.object, - shouldShowQuestions: PropTypes.bool + shouldShowQuestions: PropTypes.bool, + updateTitle: PropTypes.func }; + componentWillMount() { + const { updateTitle } = this.props; + updateTitle(this.props.title); + } + componentWillUnmount() { this.props.resetHike(); } @@ -71,4 +78,4 @@ export class Hike extends React.Component { } // export redux aware component -export default connect(mapStateToProps, { resetHike })(Hike); +export default connect(mapStateToProps, { resetHike, updateTitle })(Hike); diff --git a/common/app/routes/Hikes/components/Hikes.jsx b/common/app/routes/Hikes/components/Hikes.jsx index 1b34251659..94e185e2b0 100644 --- a/common/app/routes/Hikes/components/Hikes.jsx +++ b/common/app/routes/Hikes/components/Hikes.jsx @@ -6,7 +6,6 @@ import { createSelector } from 'reselect'; // import debug from 'debug'; import HikesMap from './Map.jsx'; -import { updateTitle } from '../../../redux/actions'; import { fetchHikes } from '../redux/actions'; import contain from '../../../utils/professor-x'; @@ -41,15 +40,9 @@ export class Hikes extends PureComponent { static propTypes = { children: PropTypes.element, hikes: PropTypes.array, - params: PropTypes.object, - updateTitle: PropTypes.func + params: PropTypes.object }; - componentWillMount() { - const { updateTitle } = this.props; - updateTitle('Hikes'); - } - renderMap(hikes) { return ( @@ -73,6 +66,6 @@ export class Hikes extends PureComponent { // export redux and fetch aware component export default compose( - connect(mapStateToProps, { fetchHikes, updateTitle }), + connect(mapStateToProps, { fetchHikes }), contain(fetchOptions) )(Hikes);