react-native-onyx 1.0.103 → 1.0.105

package/dist/web.development.js

@@ -1505,42 +1505,6 @@ function mergeCollection(collectionKey, collection) {
   });
 }
 
-/**
- * Internal recursive function to execute the functions in the correct order
- *
- * @param {Array} data An array of objects with shape {onyxMethod: oneOf('set', 'merge', 'mergeCollection', 'multiSet', 'clear'), key: string, value: *}
- * @returns {Promise<Void>}
- */
-function innerUpdate(data) {
-  if (data.length === 0) {
-    return Promise.resolve();
-  }
-
-  const { onyxMethod, key, value } = data.shift();
-  let promise = Promise.resolve();
-  switch (onyxMethod) {
-    case METHOD.SET:
-      promise = set(key, value);
-      break;
-    case METHOD.MERGE:
-      promise = merge(key, value);
-      break;
-    case METHOD.MERGE_COLLECTION:
-      promise = mergeCollection(key, value);
-      break;
-    case METHOD.MULTI_SET:
-      promise = multiSet(value);
-      break;
-    case METHOD.CLEAR:
-      promise = clear();
-      break;
-    default:
-      break;}
-
-
-  return promise.then(() => innerUpdate(data));
-}
-
 /**
  * Insert API responses and lifecycle data into Onyx
  *
@@ -1549,9 +1513,8 @@ function innerUpdate(data) {
  */
 function update(data) {
   // First, validate the Onyx object is in the format we expect
-  const validMethods = [METHOD.CLEAR, METHOD.SET, METHOD.MERGE, METHOD.MERGE_COLLECTION, METHOD.MULTI_SET];
   underscore__WEBPACK_IMPORTED_MODULE_1___default().each(data, (_ref3) => {let { onyxMethod, key, value } = _ref3;
-    if (!underscore__WEBPACK_IMPORTED_MODULE_1___default().contains(validMethods, onyxMethod)) {
+    if (!underscore__WEBPACK_IMPORTED_MODULE_1___default().contains([METHOD.CLEAR, METHOD.SET, METHOD.MERGE, METHOD.MERGE_COLLECTION, METHOD.MULTI_SET], onyxMethod)) {
       throw new Error(`Invalid onyxMethod ${onyxMethod} in Onyx update.`);
     }
     if (onyxMethod === METHOD.MULTI_SET) {
@@ -1564,10 +1527,32 @@ function update(data) {
     }
   });
 
-  // Put clear operation on top
-  data.sort((a) => a.onyxMethod === METHOD.CLEAR ? -1 : 1);
+  const promises = [];
+  let clearPromise = Promise.resolve();
+
+  underscore__WEBPACK_IMPORTED_MODULE_1___default().each(data, (_ref4) => {let { onyxMethod, key, value } = _ref4;
+    switch (onyxMethod) {
+      case METHOD.SET:
+        promises.push(() => set(key, value));
+        break;
+      case METHOD.MERGE:
+        promises.push(() => merge(key, value));
+        break;
+      case METHOD.MERGE_COLLECTION:
+        promises.push(() => mergeCollection(key, value));
+        break;
+      case METHOD.MULTI_SET:
+        promises.push(() => multiSet(value));
+        break;
+      case METHOD.CLEAR:
+        clearPromise = clear();
+        break;
+      default:
+        break;}
+
+  });
 
-  return innerUpdate(data);
+  return clearPromise.then(() => Promise.all(underscore__WEBPACK_IMPORTED_MODULE_1___default().map(promises, (p) => p())));
 }
 
 /**
@@ -2601,6 +2586,15 @@ function getDisplayName(component) {
   return component.displayName || component.name || 'Component';
 }
 
+/**
+ * Removes all the keys from state that are unrelated to the onyx data being mapped to the component.
+ *
+ * @param {Object} state of the component
+ * @param {Object} onyxToStateMapping the object holding all of the mapping configuration for the component
+ * @returns {Object}
+ */
+const getOnyxDataFromState = (state, onyxToStateMapping) => underscore__WEBPACK_IMPORTED_MODULE_2___default().pick(state, underscore__WEBPACK_IMPORTED_MODULE_2___default().keys(onyxToStateMapping));
+
 /* harmony default export */ function __WEBPACK_DEFAULT_EXPORT__(mapOnyxToState) {let shouldDelayUpdates = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   // A list of keys that must be present in tempState before we can render the WrappedComponent
   const requiredKeysForInit = underscore__WEBPACK_IMPORTED_MODULE_2___default().chain(mapOnyxToState).
@@ -2673,16 +2667,20 @@ function getDisplayName(component) {
         this.checkEvictableKeys();
       }
 
-      componentDidUpdate(prevProps) {
+      componentDidUpdate() {
+        // When the state is passed to the key functions with Str.result(), omit anything
+        // from state that was not part of the mapped keys.
+        const onyxDataFromState = getOnyxDataFromState(this.state, mapOnyxToState);
+
         // If any of the mappings use data from the props, then when the props change, all the
         // connections need to be reconnected with the new props
-        underscore__WEBPACK_IMPORTED_MODULE_2___default().each(mapOnyxToState, (mapping, propertyName) => {
-          const previousKey = _Str__WEBPACK_IMPORTED_MODULE_3__.result(mapping.key, prevProps);
-          const newKey = _Str__WEBPACK_IMPORTED_MODULE_3__.result(mapping.key, this.props);
+        underscore__WEBPACK_IMPORTED_MODULE_2___default().each(mapOnyxToState, (mapping, propName) => {
+          const previousKey = mapping.previousKey;
+          const newKey = _Str__WEBPACK_IMPORTED_MODULE_3__.result(mapping.key, { ...this.props, ...onyxDataFromState });
           if (previousKey !== newKey) {
             _Onyx__WEBPACK_IMPORTED_MODULE_4__["default"].disconnect(this.activeConnectionIDs[previousKey], previousKey);
             delete this.activeConnectionIDs[previousKey];
-            this.connectMappingToOnyx(mapping, propertyName);
+            this.connectMappingToOnyx(mapping, propName);
           }
         });
         this.checkEvictableKeys();
@@ -2691,9 +2689,8 @@ function getDisplayName(component) {
       componentWillUnmount() {
         // Disconnect everything from Onyx
         underscore__WEBPACK_IMPORTED_MODULE_2___default().each(mapOnyxToState, (mapping) => {
-          const key = _Str__WEBPACK_IMPORTED_MODULE_3__.result(mapping.key, this.props);
-          const connectionID = this.activeConnectionIDs[key];
-          _Onyx__WEBPACK_IMPORTED_MODULE_4__["default"].disconnect(connectionID, key);
+          const key = _Str__WEBPACK_IMPORTED_MODULE_3__.result(mapping.key, { ...this.props, ...getOnyxDataFromState(this.state, mapOnyxToState) });
+          _Onyx__WEBPACK_IMPORTED_MODULE_4__["default"].disconnect(this.activeConnectionIDs[key], key);
         });
       }
 
@@ -2825,7 +2822,14 @@ function getDisplayName(component) {
        *  component
        */
       connectMappingToOnyx(mapping, statePropertyName) {
-        const key = _Str__WEBPACK_IMPORTED_MODULE_3__.result(mapping.key, this.props);
+        const key = _Str__WEBPACK_IMPORTED_MODULE_3__.result(mapping.key, { ...this.props, ...getOnyxDataFromState(this.state, mapOnyxToState) });
+
+        // Remember the previous key so that if it ever changes, the component will reconnect to Onyx
+        // in componentDidUpdate
+        if (statePropertyName !== 'initialValue' && mapOnyxToState[statePropertyName]) {
+          // eslint-disable-next-line no-param-reassign
+          mapOnyxToState[statePropertyName].previousKey = key;
+        }
 
         // eslint-disable-next-line rulesdir/prefer-onyx-connect-in-libs
         this.activeConnectionIDs[key] = _Onyx__WEBPACK_IMPORTED_MODULE_4__["default"].connect({