app: clear timer interval when unmounting App container

u-wave · May 2, 2016 · 8c9a82b · 8c9a82b
1 parent ca7d044
commit 8c9a82b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/src/actions/TickerActionCreators.js b/src/actions/TickerActionCreators.js
@@ -1,6 +1,7 @@
 import { get } from './RequestActionCreators';
 
 import { SET_TIMER, OFFSET } from '../constants/actionTypes/time';
+import { timerSelector } from '../selectors/timeSelectors';
 
 export function syncTimestamps(clientTimeBefore, serverTime) {
   const clientTimeAfter = Date.now();
@@ -30,3 +31,14 @@ export function createTimer() {
     return callbacks;
   };
 }
+
+export function stopTimer() {
+  return (dispatch, getState) => {
+    const timer = timerSelector(getState());
+    clearInterval(timer);
+    dispatch({
+      type: SET_TIMER,
+      payload: null
+    });
+  };
+}
diff --git a/src/containers/App.js b/src/containers/App.js
@@ -6,7 +6,7 @@ import MuiThemeProvider from 'material-ui/styles/MuiThemeProvider';
 
 import { inputMessage } from '../actions/ChatActionCreators';
 import { closeAll } from '../actions/OverlayActionCreators';
-import { createTimer } from '../actions/TickerActionCreators';
+import { createTimer, stopTimer } from '../actions/TickerActionCreators';
 
 import { currentUserSelector } from '../selectors/userSelectors';
 import { settingsSelector, muiThemeSelector } from '../selectors/settingSelectors';
@@ -22,6 +22,7 @@ const mapStateToProps = createStructuredSelector({
 function mapDispatchToProps(dispatch) {
   return bindActionCreators({
     createTimer,
+    stopTimer,
     sendChatMessage: inputMessage,
     onCloseOverlay: closeAll
   }, dispatch);
@@ -31,7 +32,8 @@ function mapDispatchToProps(dispatch) {
 export default class AppContainer extends Component {
   static propTypes = {
     muiTheme: PropTypes.object,
-    createTimer: PropTypes.func.isRequired
+    createTimer: PropTypes.func.isRequired,
+    stopTimer: PropTypes.func.isRequired
   };
 
   static childContextTypes = {
@@ -50,6 +52,11 @@ export default class AppContainer extends Component {
     this.timerCallbacks = this.props.createTimer();
   }
 
+  componentWillUnmount() {
+    this.timerCallbacks = [];
+    this.props.stopTimer();
+  }
+
   render() {
     return (
       <MuiThemeProvider muiTheme={this.props.muiTheme}>

diff --git a/src/selectors/timeSelectors.js b/src/selectors/timeSelectors.js
@@ -4,6 +4,7 @@ const baseSelector = state => state.time;
 
 const timeSelector = () => Date.now();
 const offsetSelector = createSelector(baseSelector, time => time.offset);
+export const timerSelector = createSelector(baseSelector, time => time.timer);
 
 export const currentTimeSelector = createSelector(
   timeSelector,