Merge pull request #1716 from FormidableLabs/bug/events-in-strict-mode

Bug/events in strict mode

Author: boygirl

demo/js/app.js

@@ -121,7 +121,9 @@ class App extends React.Component {
             );
           })}
         </ul>
-        <Child />
+        <React.StrictMode>
+          <Child />
+        </React.StrictMode>
       </div>
     );
   }

packages/victory-core/src/victory-util/add-events.js

@@ -45,17 +45,21 @@ export default (WrappedComponent, options) => {
       }
       const calculatedState = this.getStateChanges(nextProps, calculatedValues);
       if (!isEqual(this.calculatedState, calculatedState)) {
-        this.calculatedState = calculatedState;
-        this.cacheValues(calculatedValues);
         return true;
       }
       if (!isEqual(this.props, nextProps)) {
-        this.cacheValues(calculatedValues);
         return true;
       }
       return false;
     }
 
+    componentDidUpdate(prevProps) {
+      const calculatedValues = this.getCalculatedValues(prevProps);
+      const calculatedState = this.getStateChanges(prevProps, calculatedValues);
+      this.calculatedState = calculatedState;
+      this.cacheValues(calculatedValues);
+    }
+
     // compile all state changes from own and parent state. Order doesn't matter, as any state
     // state change should trigger a re-render
     getStateChanges(props, calculatedValues) {