react-native-onyx 3.0.70 → 3.0.71

package/dist/useOnyx.js

@@ -96,6 +96,9 @@ function useOnyx(key, options, dependencies = []) {
     // after cleanup), so the hook automatically enters first-connection mode for the new key without any
     // explicit reset logic — eliminating the race condition where cleanup could clobber a boolean flag.
     const connectedKeyRef = (0, react_1.useRef)(null);
+    // Tracks whether the hook has completed its initial mount subscription.
+    // Unlike connectedKeyRef (which gets nulled by cleanup), this persists across re-subscriptions.
+    const hasMountedRef = (0, react_1.useRef)(false);
     // Indicates if the hook is connecting to an Onyx key.
     const isConnectingRef = (0, react_1.useRef)(false);
     // Stores the `onStoreChange()` function, which can be used to trigger a `getSnapshot()` update when desired.
@@ -211,11 +214,19 @@ function useOnyx(key, options, dependencies = []) {
     const subscribe = (0, react_1.useCallback)((onStoreChange) => {
         // Reset internal state so the hook properly transitions through loading
         // for the new key instead of preserving stale state from the previous one.
-        previousValueRef.current = null;
-        newValueRef.current = null;
+        // Only reset when the key has actually changed (not on initial mount).
+        if (hasMountedRef.current) {
+            previousValueRef.current = null;
+            newValueRef.current = null;
+            sourceValueRef.current = undefined;
+            resultRef.current = [undefined, { status: (options === null || options === void 0 ? void 0 : options.initWithStoredValues) === false ? 'loaded' : 'loading' }];
+        }
+        // Force a cache re-read on every (re)subscription so any side effects from
+        // subscribeToKey (e.g. addNullishStorageKey for skippable collection member ids)
+        // are reflected in the next getSnapshot. Resetting this flag does not change
+        // resultRef by itself, so it doesn't cause an extra mount render.
         shouldGetCachedValueRef.current = true;
-        sourceValueRef.current = undefined;
-        resultRef.current = [undefined, { status: (options === null || options === void 0 ? void 0 : options.initWithStoredValues) === false ? 'loaded' : 'loading' }];
+        hasMountedRef.current = true;
         isConnectingRef.current = true;
         onStoreChangeFnRef.current = onStoreChange;
         connectionRef.current = OnyxConnectionManager_1.default.connect({

package/package.json

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