react-native-onyx 1.0.13 → 1.0.16

package/lib/OnyxCache.js

@@ -1,5 +1,6 @@
 import _ from 'underscore';
-import lodashMerge from 'lodash/merge';
+import lodashMergeWith from 'lodash/mergeWith';
+import customizerForMergeWith from './customizerForMergeWith';
 
 const isDefined = _.negate(_.isUndefined);
 
@@ -110,7 +111,7 @@ class OnyxCache {
      * @param {Record<string, *>} data - a map of (cache) key - values
      */
     merge(data) {
-        this.storageMap = lodashMerge({}, this.storageMap, data);
+        this.storageMap = lodashMergeWith({}, this.storageMap, data, customizerForMergeWith);
 
         const storageKeys = this.getAllKeys();
         const mergedKeys = _.keys(data);

package/lib/customizerForMergeWith.js

@@ -0,0 +1,21 @@
+import _ from 'underscore';
+
+/**
+ * When merging 2 objects into onyx that contain an array, we want to completely replace the array instead of the default
+ * behavior which is to merge each item by its index.
+ * ie:
+ * merge({a: [1]}, {a: [2,3]}):
+ *  - In the default implementation would produce {a:[1,3]}
+ *  - With this function would produce: {a: [2,3]}
+ * @param {*} objValue
+ * @param {*} srcValue
+ * @return {*}
+ */
+// eslint-disable-next-line rulesdir/prefer-early-return
+function customizerForMergeWith(objValue, srcValue) {
+    if (_.isArray(objValue)) {
+        return srcValue;
+    }
+}
+
+export default customizerForMergeWith;

package/lib/storage/providers/LocalForage.js

@@ -6,8 +6,9 @@
 
 import localforage from 'localforage';
 import _ from 'underscore';
-import lodashMerge from 'lodash/merge';
+import lodashMergeWith from 'lodash/mergeWith';
 import SyncQueue from '../../SyncQueue';
+import customizerForMergeWith from '../../customizerForMergeWith';
 
 localforage.config({
     name: 'OnyxDB',
@@ -24,7 +25,7 @@ const provider = {
             return localforage.getItem(key)
                 .then((existingValue) => {
                     const newValue = _.isObject(existingValue)
-                        ? lodashMerge({}, existingValue, value)
+                        ? lodashMergeWith({}, existingValue, value, customizerForMergeWith)
                         : value;
                     return localforage.setItem(key, newValue);
                 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-onyx",
-  "version": "1.0.13",
+  "version": "1.0.16",
   "author": "Expensify, Inc.",
   "homepage": "https://expensify.com",
   "description": "State management for React Native",