react-native-onyx 3.0.97 → 3.0.99

package/dist/Onyx.js

@@ -240,11 +240,15 @@ function merge(key, changes) {
             return mergeQueuePromise[key];
         }
         mergeQueue[key] = [changes];
-        mergeQueuePromise[key] = OnyxUtils_1.default.get(key).then((existingValue) => {
+        mergeQueuePromise[key] = OnyxUtils_1.default.get(key).then((valueFromGet) => {
             // Calls to Onyx.set after a merge will terminate the current merge process and clear the merge queue
             if (mergeQueue[key] == null) {
                 return Promise.resolve();
             }
+            // Other writers (notably Onyx.update's mergeCollection path, which doesn't participate in mergeQueue)
+            // can land between get() resolving and this callback running. Applying the delta on top of the value
+            // captured back then and broadcasting it would overwrite those writes wholesale, so re-read the cache.
+            const existingValue = OnyxCache_1.default.hasCacheForKey(key) ? OnyxCache_1.default.get(key) : valueFromGet;
             try {
                 const validChanges = mergeQueue[key].filter((change) => {
                     const { isCompatible, existingValueType, newValueType, isEmptyArrayCoercion } = utils_1.default.checkCompatibilityWithExistingValue(change, existingValue);

package/dist/useOnyx.js

@@ -99,6 +99,12 @@ function useOnyx(key, options) {
         if (!shouldGetCachedValueRef.current) {
             const cachedResult = OnyxSnapshotCache_1.default.getCachedResult(key, cacheKey);
             if (cachedResult !== undefined) {
+                // The slot is shared by all subscribers of the same (key, selector) pair, so it can hold a content-equal
+                // result computed by another subscriber. Keep our own result then, otherwise we would needlessly change
+                // this hook's result identity and re-render its consumer.
+                if (cachedResult !== resultRef.current && (0, memoizedShallowEqual_1.default)(cachedResult[0], resultRef.current[0]) && cachedResult[1].status === resultRef.current[1].status) {
+                    return resultRef.current;
+                }
                 resultRef.current = cachedResult;
                 return cachedResult;
             }

package/package.json

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