dataflux 1.19.1 → 1.19.4

package/dist/ReactStore.js

@@ -99,24 +99,32 @@ var ReactStore = exports["default"] = /*#__PURE__*/function (_ObserverStore) {
       // I know...
       (_context$___obs_subke = context.___obs_subkeys) !== null && _context$___obs_subke !== void 0 ? _context$___obs_subke : context.___obs_subkeys = [];
       context.___obs_subkeys.push(subKey);
-      context.___obs_unsubscribe_context = _this;
-      context.___obs_unsubscribe = function () {
-        var _iterator = _createForOfIteratorHelper(context.___obs_subkeys || []),
-          _step;
-        try {
-          for (_iterator.s(); !(_step = _iterator.n()).done;) {
-            var key = _step.value;
-            context.___obs_unsubscribe_context.unsubscribe(key);
+      if (!context.___obs_unsubscribe_attached) {
+        context.___obs_unsubscribe_context = _this;
+        context.___obs_original_componentWillUnmount = context === null || context === void 0 ? void 0 : context.componentWillUnmount;
+        context.___obs_unsubscribe = function () {
+          var _iterator = _createForOfIteratorHelper(context.___obs_subkeys || []),
+            _step;
+          try {
+            for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              var key = _step.value;
+              context.___obs_unsubscribe_context.unsubscribe(key);
+            }
+          } catch (err) {
+            _iterator.e(err);
+          } finally {
+            _iterator.f();
           }
-        } catch (err) {
-          _iterator.e(err);
-        } finally {
-          _iterator.f();
-        }
-      };
-      context.componentWillUnmount = function () {
-        context.___obs_unsubscribe();
-      };
+        };
+        context.componentWillUnmount = function () {
+          context._isMounted = false;
+          context.___obs_unsubscribe();
+          if (context.___obs_original_componentWillUnmount) {
+            context.___obs_original_componentWillUnmount();
+          }
+        };
+      }
+      context.___obs_unsubscribe_attached = true;
     });
     _defineProperty(_this, "handleChange", function (object, name, cast) {
       return function (event, rawValue) {

package/dist/Store.js

@@ -155,7 +155,7 @@ var Store = exports["default"] = /*#__PURE__*/function () {
                   if (force) {
                     _classPrivateFieldGet(_wipe, _this).call(_this, currentObject.object);
                     _classPrivateFieldGet(_merge, _this).call(_this, currentObject.object, wrapper.toJSON());
-                    currentObject.fingerprint = newFingerprint;
+                    currentObject.fingerprint = currentObject.object.getFingerprint();
                     updated.push(currentObject.object);
                   } else if (_this.hasChanged(type, currentObject.object)) {// Was the object edited locally?
 
@@ -163,7 +163,7 @@ var Store = exports["default"] = /*#__PURE__*/function () {
                   } else {
                     // Update with the new object
                     _classPrivateFieldGet(_merge, _this).call(_this, currentObject.object, wrapper.toJSON());
-                    currentObject.fingerprint = newFingerprint;
+                    currentObject.fingerprint = currentObject.object.getFingerprint();
                     updated.push(currentObject.object);
                   }
                 }