react-native-onyx 1.0.116 → 1.0.118

package/dist/web.development.js

@@ -1280,11 +1280,6 @@ function merge(key, changes) {
       // We don't want to remove null values from the "batchedChanges", because SQLite uses them to remove keys from storage natively.
       let batchedChanges = applyMerge(undefined, mergeQueue[key], false);
 
-      if (underscore__WEBPACK_IMPORTED_MODULE_1___default().isNull(batchedChanges)) {
-        remove(key);
-        return;
-      }
-
       // The presence of a `null` in the merge queue instructs us to drop the existing value.
       // In this case, we can't simply merge the batched changes with the existing value, because then the null in the merge queue would have no effect
       const shouldOverwriteExistingValue = underscore__WEBPACK_IMPORTED_MODULE_1___default().includes(mergeQueue[key], null);
@@ -1293,6 +1288,12 @@ function merge(key, changes) {
       delete mergeQueue[key];
       delete mergeQueuePromise[key];
 
+      // If the batched changes equal null, we want to remove the key from storage, to reduce storage size
+      if (underscore__WEBPACK_IMPORTED_MODULE_1___default().isNull(batchedChanges)) {
+        remove(key);
+        return;
+      }
+
       // After that we merge the batched changes with the existing value
       // We can remove null values from the "modifiedData", because "null" implicates that the user wants to remove a value from storage.
       // The "modifiedData" will be directly "set" in storage instead of being merged