react-native-onyx 2.0.131 → 2.0.133

package/dist/OnyxUtils.js

@@ -1126,7 +1126,7 @@ function subscribeToKey(connectOptions) {
         // since there are none matched. In withOnyx() we wait for all connected keys to return a value before rendering the child
         // component. This null value will be filtered out so that the connected component can utilize defaultProps.
         if (matchingKeys.length === 0) {
-            if (mapping.key && !isCollectionKey(mapping.key)) {
+            if (mapping.key) {
                 OnyxCache_1.default.addNullishStorageKey(mapping.key);
             }
             // Here we cannot use batching because the nullish value is expected to be set immediately for default props

package/dist/useOnyx.js

@@ -45,30 +45,41 @@ const GlobalSettings = __importStar(require("./GlobalSettings"));
 const usePrevious_1 = __importDefault(require("./usePrevious"));
 const metrics_1 = __importDefault(require("./metrics"));
 const Logger = __importStar(require("./Logger"));
+const useLiveRef_1 = __importDefault(require("./useLiveRef"));
 function useOnyx(key, options, dependencies = []) {
     const connectionRef = (0, react_1.useRef)(null);
     const previousKey = (0, usePrevious_1.default)(key);
+    const currentDependenciesRef = (0, useLiveRef_1.default)(dependencies);
+    const currentSelectorRef = (0, useLiveRef_1.default)(options === null || options === void 0 ? void 0 : options.selector);
     // Create memoized version of selector for performance
     const memoizedSelector = (0, react_1.useMemo)(() => {
         if (!(options === null || options === void 0 ? void 0 : options.selector))
             return null;
         let lastInput;
         let lastOutput;
+        let lastDependencies = [];
         let hasComputed = false;
         return (input) => {
-            // Always recompute when input changes
-            if (!hasComputed || lastInput !== input) {
-                const newOutput = options.selector(input);
-                // Deep equality mode: only update if output actually changed
-                if (!hasComputed || !(0, fast_equals_1.deepEqual)(lastOutput, newOutput)) {
-                    lastInput = input;
-                    lastOutput = newOutput;
-                    hasComputed = true;
+            const currentDependencies = currentDependenciesRef.current;
+            const currentSelector = currentSelectorRef.current;
+            // Recompute if input changed, dependencies changed, or first time
+            const dependenciesChanged = !(0, fast_equals_1.shallowEqual)(lastDependencies, currentDependencies);
+            if (!hasComputed || lastInput !== input || dependenciesChanged) {
+                // Only proceed if we have a valid selector
+                if (currentSelector) {
+                    const newOutput = currentSelector(input);
+                    // Deep equality mode: only update if output actually changed
+                    if (!hasComputed || !(0, fast_equals_1.deepEqual)(lastOutput, newOutput) || dependenciesChanged) {
+                        lastInput = input;
+                        lastOutput = newOutput;
+                        lastDependencies = [...currentDependencies];
+                        hasComputed = true;
+                    }
                 }
             }
             return lastOutput;
         };
-    }, [options === null || options === void 0 ? void 0 : options.selector]);
+    }, [currentDependenciesRef, currentSelectorRef, options === null || options === void 0 ? void 0 : options.selector]);
     // Stores the previous cached value as it's necessary to compare with the new value in `getSnapshot()`.
     // We initialize it to `null` to simulate that we don't have any value from cache yet.
     const previousValueRef = (0, react_1.useRef)(null);
@@ -111,10 +122,18 @@ function useOnyx(key, options, dependencies = []) {
         }
         throw new Error(`'${previousKey}' key can't be changed to '${key}'. useOnyx() only supports dynamic keys if they are both collection member keys from the same collection e.g. from 'collection_id1' to 'collection_id2'.`);
     }, [previousKey, key, options === null || options === void 0 ? void 0 : options.allowDynamicKey]);
+    // Track previous dependencies to prevent infinite loops
+    const previousDependenciesRef = (0, react_1.useRef)([]);
     (0, react_1.useEffect)(() => {
         // This effect will only run if the `dependencies` array changes. If it changes it will force the hook
         // to trigger a `getSnapshot()` update by calling the stored `onStoreChange()` function reference, thus
         // re-running the hook and returning the latest value to the consumer.
+        // Deep equality check to prevent infinite loops when dependencies array reference changes
+        // but content remains the same
+        if ((0, fast_equals_1.shallowEqual)(previousDependenciesRef.current, dependencies)) {
+            return;
+        }
+        previousDependenciesRef.current = dependencies;
         if (connectionRef.current === null || isConnectingRef.current || !onStoreChangeFnRef.current) {
             return;
         }

package/package.json

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