[changed] Give ActiveState a chance to update state before mounting

danieljuhl · Sep 25, 2014 · 6af24bd · 6af24bd
1 parent 517e460
commit 6af24bd
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/modules/mixins/ActiveState.js b/modules/mixins/ActiveState.js
@@ -45,6 +45,11 @@ var ActiveState = {
     return this.context.activeDelegate;
   },
 
+  componentWillMount: function () {
+    if (this.updateActiveState)
+      this.updateActiveState();
+  },
+
   componentDidMount: function () {
     this.getActiveDelegate().addChangeListener(this.handleActiveStateChange);
     this.handleActiveStateChange();
@@ -55,7 +60,7 @@ var ActiveState = {
   },
 
   handleActiveStateChange: function () {
-    if (this.isMounted() && typeof this.updateActiveState === 'function')
+    if (this.isMounted() && this.updateActiveState)
       this.updateActiveState();
   },