react-native-onyx 1.0.26 → 1.0.28

package/dist/web.development.js

@@ -501,6 +501,14 @@ var _createDeferredTask = _interopRequireDefault(__webpack_require__(/*! ./creat
 var _fastMerge = _interopRequireDefault(__webpack_require__(/*! ./fastMerge */ "./lib/fastMerge.js"));
 var PerformanceUtils = _interopRequireWildcard(__webpack_require__(/*! ./metrics/PerformanceUtils */ "./lib/metrics/PerformanceUtils.js"));function _getRequireWildcardCache(nodeInterop) {if (typeof WeakMap !== "function") return null;var cacheBabelInterop = new WeakMap();var cacheNodeInterop = new WeakMap();return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) {return nodeInterop ? cacheNodeInterop : cacheBabelInterop;})(nodeInterop);}function _interopRequireWildcard(obj, nodeInterop) {if (!nodeInterop && obj && obj.__esModule) {return obj;}if (obj === null || typeof obj !== "object" && typeof obj !== "function") {return { default: obj };}var cache = _getRequireWildcardCache(nodeInterop);if (cache && cache.has(obj)) {return cache.get(obj);}var newObj = {};var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;for (var key in obj) {if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;if (desc && (desc.get || desc.set)) {Object.defineProperty(newObj, key, desc);} else {newObj[key] = obj[key];}}}newObj.default = obj;if (cache) {cache.set(obj, newObj);}return newObj;} /* eslint-disable no-continue */
 
+// Method constants
+var METHOD = {
+  SET: 'set',
+  MERGE: 'merge',
+  MERGE_COLLECTION: 'mergecollection',
+  CLEAR: 'clear' };
+
+
 // Keeps track of the last connectionID that was used so we can keep incrementing it
 var lastConnectionID = 0;
 
@@ -1006,7 +1014,7 @@ function keyChanged(key, data, canUpdateSubscriber) {
       // returned by the selector and only if the selected data has changed.
       if (subscriber.selector) {
         subscriber.withOnyxInstance.setState(function (prevState) {
-          var previousValue = getSubsetOfData(prevState, subscriber.selector);
+          var previousValue = getSubsetOfData(prevState[subscriber.statePropertyName], subscriber.selector);
           var newValue = getSubsetOfData(data, subscriber.selector);
           if (!(0, _fastEquals.deepEqual)(previousValue, newValue)) {
             return (0, _defineProperty2.default)({},
@@ -1592,36 +1600,41 @@ function mergeCollection(collectionKey, collection) {
  * Insert API responses and lifecycle data into Onyx
  *
  * @param {Array} data An array of objects with shape {onyxMethod: oneOf('set', 'merge', 'mergeCollection'), key: string, value: *}
+ * @returns {Promise} resolves when all operations are complete
  */
 function update(data) {
   // First, validate the Onyx object is in the format we expect
   _underscore.default.each(data, function (_ref9) {var onyxMethod = _ref9.onyxMethod,key = _ref9.key;
-    if (!_underscore.default.contains(['clear', 'set', 'merge', 'mergecollection'], onyxMethod)) {
+    if (!_underscore.default.contains([METHOD.CLEAR, METHOD.SET, METHOD.MERGE, METHOD.MERGE_COLLECTION], onyxMethod)) {
       throw new Error("Invalid onyxMethod " + onyxMethod + " in Onyx update.");
     }
-    if (onyxMethod !== 'clear' && !_underscore.default.isString(key)) {
+    if (onyxMethod !== METHOD.CLEAR && !_underscore.default.isString(key)) {
       throw new Error("Invalid " + typeof key + " key provided in Onyx update. Onyx key must be of type string.");
     }
   });
 
+  var promises = [];
+
   _underscore.default.each(data, function (_ref10) {var onyxMethod = _ref10.onyxMethod,key = _ref10.key,value = _ref10.value;
     switch (onyxMethod) {
-      case 'set':
-        set(key, value);
+      case METHOD.SET:
+        promises.push(set(key, value));
         break;
-      case 'merge':
-        merge(key, value);
+      case METHOD.MERGE:
+        promises.push(merge(key, value));
         break;
-      case 'mergecollection':
-        mergeCollection(key, value);
+      case METHOD.MERGE_COLLECTION:
+        promises.push(mergeCollection(key, value));
         break;
-      case 'clear':
-        clear();
+      case METHOD.CLEAR:
+        promises.push(clear());
         break;
       default:
         break;}
 
   });
+
+  return Promise.all(promises);
 }
 
 /**
@@ -1709,7 +1722,8 @@ var Onyx = {
   registerLogger: Logger.registerLogger,
   addToEvictionBlockList: addToEvictionBlockList,
   removeFromEvictionBlockList: removeFromEvictionBlockList,
-  isSafeEvictionKey: isSafeEvictionKey };
+  isSafeEvictionKey: isSafeEvictionKey,
+  METHOD: METHOD };
 
 
 /**