feat (easyComp): throw on error on user defined shouldComponentUpdate

Author: solkimicreb

__tests__/errors.test.js

@@ -1,16 +1,29 @@
+import { Component, PureComponent } from 'react'
 import { easyComp, easyStore } from 'react-easy-state'
 
 describe('errors', () => {
-  test('easyComp should throw on non function arguments', () => {
-    expect(() => easyComp()).toThrow('easyComp expects a component class or function as argument.')
-    expect(() => easyComp(12)).toThrow('easyComp expects a component class or function as argument.')
-    expect(() => easyComp(() => {})).not.toThrow()
-    expect(() => easyComp(class {})).not.toThrow()
+  test('easyComp should throw on non component or function arguments', () => {
+    class Comp extends Component {}
+    class PureComp extends PureComponent {}
+    function FuncComp () {}
+
+    expect(() => easyComp()).toThrow()
+    expect(() => easyComp(12)).toThrow()
+    expect(() => easyComp(Comp)).not.toThrow()
+    expect(() => easyComp(PureComp)).not.toThrow()
+    expect(() => easyComp(FuncComp)).not.toThrow()
+  })
+
+  test('easyComp should throw when shouldComponentUpdate is defined', () => {
+    class DefinedComp extends Component {
+      shouldComponentUpdate () {}
+    }
+    expect(() => easyComp(DefinedComp)).toThrow()
   })
 
   test('easyStore should throw on non object argument', () => {
-    expect(() => easyStore()).toThrow('easyStore expects an object as argument.')
-    expect(() => easyStore(null)).toThrow('easyStore expects an object as argument.')
+    expect(() => easyStore()).toThrow()
+    expect(() => easyStore(null)).toThrow()
     expect(() => easyStore({})).not.toThrow()
   })
 })

dist/clock.js

@@ -27111,6 +27111,10 @@ function easyCompHOC(WrappedComp) {
     WrappedComp.defaultProps = renderer.defaultProps;
   }
 
+  if (typeof WrappedComp.prototype.shouldComponentUpdate === 'function') {
+    throw new Error('Do not implement shouldComponentUpdate, easyState already optimizes it for you!');
+  }
+
   return function (_WrappedComp) {
     _inherits(EasyCompWrapper, _WrappedComp);
 
@@ -27147,11 +27151,7 @@ function easyCompHOC(WrappedComp) {
       }
     }, {
       key: 'shouldComponentUpdate',
-      value: function shouldComponentUpdate(nextProps) {
-        if (_get(EasyCompWrapper.prototype.__proto__ || Object.getPrototypeOf(EasyCompWrapper.prototype), 'shouldComponentUpdate', this)) {
-          return _get(EasyCompWrapper.prototype.__proto__ || Object.getPrototypeOf(EasyCompWrapper.prototype), 'shouldComponentUpdate', this).call(this);
-        }
-
+      value: function shouldComponentUpdate(nextProps, nextState) {
         var props = this.props;
 
         var keys = Object.keys(props);
@@ -38893,8 +38893,8 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen
 
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 
-var App = function (_Component) {
-  _inherits(App, _Component);
+var App = function (_PureComponent) {
+  _inherits(App, _PureComponent);
 
   function App() {
     _classCallCheck(this, App);
@@ -38941,7 +38941,7 @@ var App = function (_Component) {
   }]);
 
   return App;
-}(_react.Component);
+}(_react.PureComponent);
 
 // wrap the component with easyComp before exporting it
 

dist/contacts.js

@@ -22748,6 +22748,10 @@ function easyCompHOC(WrappedComp) {
     WrappedComp.defaultProps = renderer.defaultProps;
   }
 
+  if (typeof WrappedComp.prototype.shouldComponentUpdate === 'function') {
+    throw new Error('Do not implement shouldComponentUpdate, easyState already optimizes it for you!');
+  }
+
   return function (_WrappedComp) {
     _inherits(EasyCompWrapper, _WrappedComp);
 
@@ -22784,11 +22788,7 @@ function easyCompHOC(WrappedComp) {
       }
     }, {
       key: 'shouldComponentUpdate',
-      value: function shouldComponentUpdate(nextProps) {
-        if (_get(EasyCompWrapper.prototype.__proto__ || Object.getPrototypeOf(EasyCompWrapper.prototype), 'shouldComponentUpdate', this)) {
-          return _get(EasyCompWrapper.prototype.__proto__ || Object.getPrototypeOf(EasyCompWrapper.prototype), 'shouldComponentUpdate', this).call(this);
-        }
-
+      value: function shouldComponentUpdate(nextProps, nextState) {
         var props = this.props;
 
         var keys = Object.keys(props);

dist/easyState.js

@@ -507,6 +507,10 @@ function easyCompHOC (WrappedComp) {
     WrappedComp.defaultProps = renderer.defaultProps
   }
 
+  if (typeof WrappedComp.prototype.shouldComponentUpdate === 'function') {
+    throw new Error('Do not implement shouldComponentUpdate, easyState already optimizes it for you!')
+  }
+
   return class EasyCompWrapper extends WrappedComp {
     constructor (props) {
       super(props)
@@ -532,11 +536,7 @@ function easyCompHOC (WrappedComp) {
       return this[RENDER_RESULT]
     }
 
-    shouldComponentUpdate (nextProps) {
-      if (super.shouldComponentUpdate) {
-        return super.shouldComponentUpdate()
-      }
-
+    shouldComponentUpdate (nextProps, nextState) {
       const { props } = this
       const keys = Object.keys(props)
       const nextKeys = Object.keys(nextProps)

dist/todoMVC.js

@@ -22748,6 +22748,10 @@ function easyCompHOC(WrappedComp) {
     WrappedComp.defaultProps = renderer.defaultProps;
   }
 
+  if (typeof WrappedComp.prototype.shouldComponentUpdate === 'function') {
+    throw new Error('Do not implement shouldComponentUpdate, easyState already optimizes it for you!');
+  }
+
   return function (_WrappedComp) {
     _inherits(EasyCompWrapper, _WrappedComp);
 
@@ -22784,11 +22788,7 @@ function easyCompHOC(WrappedComp) {
       }
     }, {
       key: 'shouldComponentUpdate',
-      value: function shouldComponentUpdate(nextProps) {
-        if (_get(EasyCompWrapper.prototype.__proto__ || Object.getPrototypeOf(EasyCompWrapper.prototype), 'shouldComponentUpdate', this)) {
-          return _get(EasyCompWrapper.prototype.__proto__ || Object.getPrototypeOf(EasyCompWrapper.prototype), 'shouldComponentUpdate', this).call(this);
-        }
-
+      value: function shouldComponentUpdate(nextProps, nextState) {
         var props = this.props;
 
         var keys = Object.keys(props);

examples/clock/App.jsx

@@ -1,8 +1,8 @@
-import React, { Component } from 'react'
+import React, { PureComponent } from 'react'
 import moment from 'moment'
 import { easyComp } from 'react-easy-state'
 
-class App extends Component {
+class App extends PureComponent {
   constructor () {
     super()
 

src/easyComp.js

@@ -24,6 +24,10 @@ export default function easyCompHOC (WrappedComp) {
     WrappedComp.defaultProps = renderer.defaultProps
   }
 
+  if (typeof WrappedComp.prototype.shouldComponentUpdate === 'function') {
+    throw new Error('Do not implement shouldComponentUpdate, easyState already optimizes it for you!')
+  }
+
   return class EasyCompWrapper extends WrappedComp {
     constructor (props) {
       super(props)
@@ -49,11 +53,7 @@ export default function easyCompHOC (WrappedComp) {
       return this[RENDER_RESULT]
     }
 
-    shouldComponentUpdate (nextProps) {
-      if (super.shouldComponentUpdate) {
-        return super.shouldComponentUpdate()
-      }
-
+    shouldComponentUpdate (nextProps, nextState) {
       const { props } = this
       const keys = Object.keys(props)
       const nextKeys = Object.keys(nextProps)