Merge pull request #21 from soldotno/deepCompare

Deep compare

bundle-hash.js

@@ -1,6 +1 @@
-/**
- * This is just a placeholder
- * for the bundle hash module
- * (Will be overwritten during builds)
- */
-module.exports = "no-builds-performed-yet";
+module.exports = "2a080b0e7d7a153bc313";

dist/decorators/with-data.js

@@ -9,7 +9,6 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  */
 var React = require('react');
 var hoistStatics = require('hoist-non-react-statics');
-
 /**
  * Aurora mixins
  */
@@ -22,7 +21,7 @@ var DataMixin = require('../mixins/data-mixin');
 module.exports = function (_ref) {
   var _ref$fetchData = _ref.fetchData;
   var fetchData = _ref$fetchData === undefined ? function () {
-    return Promise.resolve;
+    return Promise.resolve();
   } : _ref$fetchData;
   var _ref$dataProp = _ref.dataProp;
   var dataProp = _ref$dataProp === undefined ? 'data' : _ref$dataProp;

dist/decorators/with-visibility.js

@@ -5,6 +5,8 @@
  */
 var React = require('react');
 var hoistStatics = require('hoist-non-react-statics');
+var sortedObject = require('sorted-object');
+var serialize = require('serialize-javascript');
 
 /**
  * Export a decorator that
@@ -55,6 +57,13 @@ module.exports = function (Component) {
         isVisible: !this.props._hideOnServer
       };
     },
+    shouldComponentUpdate: function shouldComponentUpdate(nextProps, nextState) {
+      // const nextPropsAdjusted =  serialize(sortedObject(nextProps));
+      // const thisPropsAdjusted = serialize(sortedObject(this.props));
+      var nextStateAdjusted = serialize(sortedObject(nextState));
+      var thisStateAdjusted = serialize(sortedObject(this.state));
+      return !(nextStateAdjusted === thisStateAdjusted && serialize(sortedObject(nextProps)) === serialize(sortedObject(this.props)));
+    },
 
 
     /**

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aurora-core",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Aurora Application Assembler Core",
   "main": "index.js",
   "engines": {
@@ -31,8 +31,8 @@
   "homepage": "https://github.com/soldotno/aurora-core",
   "dependencies": {
     "async-each": "1.0.0",
-    "aurora-sass-loader": "soldotno/aurora-sass-loader.git#master",
     "aurora-deep-slice-merge": "soldotno/aurora-deep-slice-merge.git#master",
+    "aurora-sass-loader": "soldotno/aurora-sass-loader.git#master",
     "babel-polyfill": "6.9.1",
     "clean-css": "3.4.18",
     "css-loader": "0.23.1",
@@ -51,6 +51,8 @@
     "md5": "2.1.0",
     "no-op": "1.0.3",
     "qs": "6.2.0",
+    "serialize-javascript": "1.3.0",
+    "sorted-object": "2.0.0",
     "stringify-clone": "1.1.1",
     "url": "0.11.0"
   },

src/decorators/with-data.js

@@ -3,7 +3,6 @@
  */
 const React = require('react');
 const hoistStatics = require('hoist-non-react-statics');
-
 /**
  * Aurora mixins
  */

src/decorators/with-visibility.js

@@ -3,6 +3,8 @@
  */
 const React = require('react');
 const hoistStatics = require('hoist-non-react-statics');
+const sortedObject = require('sorted-object');
+const serialize = require('serialize-javascript');
 
 /**
  * Export a decorator that
@@ -53,6 +55,14 @@ module.exports = function(Component) {
       };
     },
 
+    shouldComponentUpdate(nextProps, nextState) {
+      // const nextPropsAdjusted =  serialize(sortedObject(nextProps));
+      // const thisPropsAdjusted = serialize(sortedObject(this.props));
+      const nextStateAdjusted =  serialize(sortedObject(nextState));
+      const thisStateAdjusted = serialize(sortedObject(this.state));
+      return !(nextStateAdjusted === thisStateAdjusted && serialize(sortedObject(nextProps)) ===  serialize(sortedObject(this.props)));
+    },
+
     /**
      * Handle updates with new props
      */