fix(observers): Fix problems with observers triggering before mount

Thram · Feb 20, 2017 · 29850e1 · 29850e1
1 parent ef28c46
commit 29850e1
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -50,14 +50,17 @@ var connect = exports.connect = function connect(stateKey, ReactComponent) {
         (0, _thrux.observe)(key, _this.observers[key]);
       };
 
+      _this.componentDidMount = function () {
+        return (0, _isArray2.default)(stateKey) ? (0, _forEach2.default)(stateKey, _this.addObserver) : _this.addObserver(stateKey);
+      };
+
       _this.componentWillUnmount = function () {
         return (0, _forEach2.default)(_this.observers, function (observer, key) {
           return (0, _thrux.removeObserver)(key, observer);
         });
       };
 
       _this.state = (0, _assign2.default)(_this.state || {}, (0, _thrux.state)([].concat(stateKey)));
-      (0, _isArray2.default)(stateKey) ? (0, _forEach2.default)(stateKey, _this.addObserver) : _this.addObserver(stateKey);
       return _this;
     }
 

diff --git a/dist/react-thrux.umd.js b/dist/react-thrux.umd.js
diff --git a/dist/react-thrux.umd.js.map b/dist/react-thrux.umd.js.map
diff --git a/dist/react-thrux.umd.min.js b/dist/react-thrux.umd.min.js
diff --git a/dist/react-thrux.umd.min.js.map b/dist/react-thrux.umd.min.js.map
diff --git a/src/index.js b/src/index.js
@@ -14,7 +14,6 @@ export const connect = (stateKey, ReactComponent) => {
     constructor(props) {
       super(props);
       this.state = assign(this.state || {}, state([].concat(stateKey)));
-      isArray(stateKey) ? forEach(stateKey, this.addObserver) : this.addObserver(stateKey);
     }
 
     addObserver = (key) => {
@@ -26,6 +25,8 @@ export const connect = (stateKey, ReactComponent) => {
       observe(key, this.observers[key]);
     };
 
+    componentDidMount = () => isArray(stateKey) ? forEach(stateKey, this.addObserver) : this.addObserver(stateKey);
+
     componentWillUnmount = () => forEach(this.observers, (observer, key) => removeObserver(key, observer));
   }
   return ThruxComponent;