react-native-onyx 3.0.31 → 3.0.32

package/dist/Onyx.js

@@ -289,8 +289,10 @@ function clear(keysToPreserve = []) {
         var _a;
         OnyxCache_1.default.clearNullishStorageKeys();
         const keysToBeClearedFromStorage = [];
-        const keyValuesToResetAsCollection = {};
         const keyValuesToResetIndividually = {};
+        // We need to store old and new values for collection keys to properly notify subscribers when clearing Onyx
+        // because the notification process needs the old values in cache but at that point they will be already removed from it.
+        const keyValuesToResetAsCollection = {};
         const allKeys = new Set([...cachedKeys, ...initialKeys]);
         // The only keys that should not be cleared are:
         // 1. Anything specifically passed in keysToPreserve (because some keys like language preferences, offline
@@ -320,9 +322,10 @@ function clear(keysToPreserve = []) {
                     }
                     if (collectionKey) {
                         if (!keyValuesToResetAsCollection[collectionKey]) {
-                            keyValuesToResetAsCollection[collectionKey] = {};
+                            keyValuesToResetAsCollection[collectionKey] = { oldValues: {}, newValues: {} };
                         }
-                        keyValuesToResetAsCollection[collectionKey][key] = newValue !== null && newValue !== void 0 ? newValue : undefined;
+                        keyValuesToResetAsCollection[collectionKey].oldValues[key] = oldValue;
+                        keyValuesToResetAsCollection[collectionKey].newValues[key] = newValue !== null && newValue !== void 0 ? newValue : undefined;
                     }
                     else {
                         keyValuesToResetIndividually[key] = newValue !== null && newValue !== void 0 ? newValue : undefined;
@@ -341,7 +344,7 @@ function clear(keysToPreserve = []) {
             updatePromises.push(OnyxUtils_1.default.scheduleSubscriberUpdate(key, value));
         }
         for (const [key, value] of Object.entries(keyValuesToResetAsCollection)) {
-            updatePromises.push(OnyxUtils_1.default.scheduleNotifyCollectionSubscribers(key, value));
+            updatePromises.push(OnyxUtils_1.default.scheduleNotifyCollectionSubscribers(key, value.newValues, value.oldValues));
         }
         const defaultKeyValuePairs = Object.entries(Object.keys(defaultKeyStates)
             .filter((key) => !keysToPreserve.includes(key))

package/dist/useOnyx.js

@@ -254,7 +254,7 @@ function useOnyx(key, options, dependencies = []) {
             OnyxSnapshotCache_1.default.setCachedResult(key, cacheKey, resultRef.current);
         }
         return resultRef.current;
-    }, [options === null || options === void 0 ? void 0 : options.initWithStoredValues, options === null || options === void 0 ? void 0 : options.allowStaleData, options === null || options === void 0 ? void 0 : options.canBeMissing, key, memoizedSelector, cacheKey]);
+    }, [options === null || options === void 0 ? void 0 : options.initWithStoredValues, options === null || options === void 0 ? void 0 : options.allowStaleData, options === null || options === void 0 ? void 0 : options.canBeMissing, key, memoizedSelector, cacheKey, previousKey]);
     const subscribe = (0, react_1.useCallback)((onStoreChange) => {
         isConnectingRef.current = true;
         onStoreChangeFnRef.current = onStoreChange;

package/package.json

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