fix(withEventrixState): race condition on componentDidMount

rstgroup · Apr 7, 2021 · 05f1194 · 05f1194
1 parent ea3bb22
commit 05f1194
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/src/react/hocs/withEventrixState.jsx b/src/react/hocs/withEventrixState.jsx
@@ -20,6 +20,7 @@ const withEventrixState = (BaseComponent, stateNames, mapStateToProps, Context =
             this.getStateNames().forEach((stateName) => {
                 this.context.eventrix.listen(`setState:${stateName}`, this.listeners[stateName]);
             });
+            this.refreshState();
         }
         componentWillUnmount() {
             this.getStateNames().forEach((stateName) => {
@@ -47,6 +48,20 @@ const withEventrixState = (BaseComponent, stateNames, mapStateToProps, Context =
             }
             return this.state;
         }
+        refreshState() {
+            let shouldRefreshState = false;
+            const stateToRefresh = {};
+            this.getStateNames().forEach((stateName) => {
+                const currentState = this.context.eventrix.getState(stateName);
+                if (this.state[stateName] !== currentState) {
+                    shouldRefreshState = true;
+                    stateToRefresh[stateName] = currentState;
+                }
+            });
+            if (shouldRefreshState) {
+                this.setState(stateToRefresh);
+            }
+        }
         render() {
             return <BaseComponent {...this.props} {...this.getStateForProps()} />;
         }