When receiving an update to crouton via props, clear ttd before updat…

…ing state so that the old timeout that we lose reference to won't dismiss our new message early.
xeodou · May 21, 2015 · 372b39a · 372b39a
1 parent 55d2ea4
commit 372b39a
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/index.js b/index.js
@@ -120,16 +120,22 @@ module.exports = React.createClass({
     if (typeof message === 'string')
       message = [message];
     var autoMiss = nextProps.autoMiss ? (buttons ? false : true) : nextProps.autoMiss;
-    this.setState({
-      hidden: nextProps.hidden,
-      buttons: buttons,
-      message: message,
-      type: nextProps.type
-    });
     if (autoMiss && !nextProps.hidden) {
       var ttd = setTimeout(this.dismiss, nextProps.timeout || this.props.timeout);
+      this.dismiss();
+      this.setState({
+        ttd: ttd,
+        hidden: nextProps.hidden,
+        buttons: buttons,
+        message: message,
+        type: nextProps.type
+      });
+    } else {
       this.setState({
-        ttd: ttd
+        hidden: nextProps.hidden,
+        buttons: buttons,
+        message: message,
+        type: nextProps.type
       });
     }
   },