dataflux 1.19.8 → 1.21.0

package/dist/PersistentStore.js

@@ -71,7 +71,6 @@ var PersistentStore = exports["default"] = /*#__PURE__*/function (_Store) {
     _defineProperty(_this, "_save", function () {
       var force = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
       _this._busy = true;
-      _this.pubSub.publish("save", "start");
       if (_this._delayedSaveTimer) {
         clearTimeout(_this._delayedSaveTimer);
       }
@@ -82,11 +81,9 @@ var PersistentStore = exports["default"] = /*#__PURE__*/function (_Store) {
         return _this._saveByType(i, true);
       })).then(function (data) {
         _this._busy = false;
-        _this.pubSub.publish("save", "end");
         return data;
       })["catch"](function (error) {
         _this._busy = false;
-        _this.pubSub.publish("save", "end");
         _this.pubSub.publish("error", error);
         return Promise.reject(error);
       });
@@ -137,8 +134,18 @@ var PersistentStore = exports["default"] = /*#__PURE__*/function (_Store) {
       });
     });
     _defineProperty(_this, "_saveByType", function (type, ifLoaded) {
+      _this.pubSub.publish("save", {
+        status: "start",
+        model: type
+      });
       return _this.getDiff(type, ifLoaded).then(function (diff) {
         return _this._saveDiff(type, diff);
+      }).then(function (data) {
+        _this.pubSub.publish("save", {
+          status: "end",
+          model: type
+        });
+        return data;
       });
     });
     _defineProperty(_this, "delayedSave", function () {

package/dist/ReactStore.js

@@ -81,7 +81,11 @@ var ReactStore = exports["default"] = /*#__PURE__*/function (_ObserverStore) {
         }
         return context.___obs_sync_state[key];
       } else {
-        context.setState(_objectSpread(_objectSpread({}, context.state), {}, _defineProperty({}, key, null)));
+        setTimeout(function () {
+          return context.setState(function (prev) {
+            return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, key, null));
+          });
+        }, 0);
       }
     });
     _defineProperty(_this, "didUpdate", function (context) {
@@ -140,9 +144,14 @@ var ReactStore = exports["default"] = /*#__PURE__*/function (_ObserverStore) {
     key: "findAll",
     value: function findAll(type, stateAttribute, context, filterFunction) {
       _assertClassBrand(_ReactStore_brand, this, _fixState).call(this, stateAttribute, context, false);
+      context._isMounted = true;
       var subKey = this.subscribe(type, function (data) {
-        if (context._isMounted === undefined || context._isMounted) {
-          context.setState(_objectSpread(_objectSpread({}, context.state), {}, _defineProperty({}, stateAttribute, data || [])));
+        if (context._isMounted) {
+          setTimeout(function () {
+            return context.setState(function (prev) {
+              return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, stateAttribute, data || []));
+            });
+          }, 0);
         }
       }, filterFunction);
       _classPrivateFieldGet(_addSubscriptionToContext, this).call(this, context, subKey);
@@ -152,9 +161,12 @@ var ReactStore = exports["default"] = /*#__PURE__*/function (_ObserverStore) {
     key: "findOne",
     value: function findOne(type, stateAttribute, context, filterFunction) {
       _assertClassBrand(_ReactStore_brand, this, _fixState).call(this, stateAttribute, context, true);
+      context._isMounted = true;
       var subKey = this.subscribe(type, function (data) {
-        if (context._isMounted === undefined || context._isMounted) {
-          context.setState(_objectSpread(_objectSpread({}, context.state), {}, _defineProperty({}, stateAttribute, data && data.length ? data[0] : null)));
+        if (context._isMounted) {
+          setTimeout(context.setState(function (prev) {
+            return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, stateAttribute, data && data.length ? data[0] : null));
+          }), 0);
         }
       }, filterFunction);
       _classPrivateFieldGet(_addSubscriptionToContext, this).call(this, context, subKey);