react-native-onyx 3.0.19 → 3.0.21

package/dist/Onyx.d.ts

@@ -139,7 +139,7 @@ declare function clear(keysToPreserve?: OnyxKey[]): Promise<void>;
  * @param data An array of objects with update expressions
  * @returns resolves when all operations are complete
  */
-declare function update(data: OnyxUpdate[]): Promise<void>;
+declare function update<TKey extends OnyxKey>(data: Array<OnyxUpdate<TKey>>): Promise<void>;
 /**
  * Sets a collection by replacing all existing collection members with new values.
  * Any existing collection members not included in the new data will be removed.

package/dist/OnyxUtils.d.ts

@@ -241,7 +241,7 @@ declare function subscribeToKey<TKey extends OnyxKey>(connectOptions: ConnectOpt
  * @param subscriptionID Subscription ID returned by calling `OnyxUtils.subscribeToKey()`.
  */
 declare function unsubscribeFromKey(subscriptionID: number): void;
-declare function updateSnapshots(data: OnyxUpdate[], mergeFn: typeof Onyx.merge): Array<() => Promise<void>>;
+declare function updateSnapshots<TKey extends OnyxKey>(data: Array<OnyxUpdate<TKey>>, mergeFn: typeof Onyx.merge): Array<() => Promise<void>>;
 /**
  * Writes a value to our store with the given key.
  * Serves as core implementation for `Onyx.set()` public function, the difference being

package/dist/types.d.ts

@@ -175,9 +175,7 @@ type NullishObjectDeep<ObjectType extends object> = {
  * Also, the `TMap` type is inferred automatically in `mergeCollection()` method and represents
  * the object of collection keys/values specified in the second parameter of the method.
  */
-type Collection<TKey extends CollectionKeyBase, TValue> = Record<`${TKey}${string}`, TValue> & {
-    [P in TKey]?: never;
-};
+type Collection<TKey extends CollectionKeyBase, TValue> = Record<`${TKey}${string}`, TValue>;
 /** Represents the base options used in `Onyx.connect()` method. */
 type BaseConnectOptions = {
     /** If set to `false`, then the initial data will be only sent to the callback function if it changes. */
@@ -270,40 +268,39 @@ type OnyxMergeCollectionInput<TKey extends OnyxKey> = Collection<TKey, NonNullab
  */
 type OnyxSetCollectionInput<TKey extends OnyxKey> = Collection<TKey, OnyxInput<TKey>>;
 type OnyxMethodMap = typeof OnyxUtils.METHOD;
+type ExpandOnyxKeys<TKey extends OnyxKey> = TKey extends CollectionKeyBase ? NoInfer<`${TKey}${string}`> : TKey;
 /**
  * OnyxUpdate type includes all onyx methods used in OnyxMethodValueMap.
  * If a new method is added to OnyxUtils.METHOD constant, it must be added to OnyxMethodValueMap type.
  * Otherwise it will show static type errors.
  */
-type OnyxUpdate = {
-    [TKey in OnyxKey]: {
+type OnyxUpdate<TKey extends OnyxKey = OnyxKey> = {
+    [K in TKey]: {
         onyxMethod: typeof OnyxUtils.METHOD.SET;
-        key: TKey;
-        value: OnyxSetInput<TKey>;
+        key: ExpandOnyxKeys<K>;
+        value: OnyxSetInput<K>;
     } | {
         onyxMethod: typeof OnyxUtils.METHOD.MULTI_SET;
-        key: TKey;
+        key: ExpandOnyxKeys<K>;
         value: OnyxMultiSetInput;
     } | {
         onyxMethod: typeof OnyxUtils.METHOD.MERGE;
-        key: TKey;
-        value: OnyxMergeInput<TKey>;
+        key: ExpandOnyxKeys<K>;
+        value: OnyxMergeInput<K>;
     } | {
         onyxMethod: typeof OnyxUtils.METHOD.CLEAR;
-        key: TKey;
-        value?: undefined;
-    };
-}[OnyxKey] | {
-    [TKey in CollectionKeyBase]: {
+        key: ExpandOnyxKeys<K>;
+        value?: never;
+    } | {
         onyxMethod: typeof OnyxUtils.METHOD.MERGE_COLLECTION;
-        key: TKey;
-        value: OnyxMergeCollectionInput<TKey>;
+        key: K;
+        value: OnyxMergeCollectionInput<K>;
     } | {
         onyxMethod: typeof OnyxUtils.METHOD.SET_COLLECTION;
-        key: TKey;
-        value: OnyxSetCollectionInput<TKey>;
+        key: K;
+        value: OnyxSetCollectionInput<K>;
     };
-}[CollectionKeyBase];
+}[TKey];
 /**
  * Represents the options used in `Onyx.set()` method.
  */

package/dist/useOnyx.js

@@ -234,22 +234,24 @@ function useOnyx(key, options, dependencies = []) {
         if (shouldUpdateResult) {
             previousValueRef.current = newValueRef.current;
             // If the new value is `null` we default it to `undefined` to ensure the consumer gets a consistent result from the hook.
-            const newStatus = newFetchStatus !== null && newFetchStatus !== void 0 ? newFetchStatus : 'loaded';
+            newFetchStatus = newFetchStatus !== null && newFetchStatus !== void 0 ? newFetchStatus : 'loaded';
             resultRef.current = [
                 (_d = previousValueRef.current) !== null && _d !== void 0 ? _d : undefined,
                 {
-                    status: newStatus,
+                    status: newFetchStatus,
                     sourceValue: sourceValueRef.current,
                 },
             ];
             // If `canBeMissing` is set to `false` and the Onyx value of that key is not defined,
             // we log an alert so it can be acknowledged by the consumer. Additionally, we won't log alerts
             // if there's a `Onyx.clear()` task in progress.
-            if ((options === null || options === void 0 ? void 0 : options.canBeMissing) === false && newStatus === 'loaded' && !isOnyxValueDefined && !OnyxCache_1.default.hasPendingTask(OnyxCache_1.TASK.CLEAR)) {
+            if ((options === null || options === void 0 ? void 0 : options.canBeMissing) === false && newFetchStatus === 'loaded' && !isOnyxValueDefined && !OnyxCache_1.default.hasPendingTask(OnyxCache_1.TASK.CLEAR)) {
                 Logger.logAlert(`useOnyx returned no data for key with canBeMissing set to false for key ${key}`, { showAlert: true });
             }
         }
-        OnyxSnapshotCache_1.default.setCachedResult(key, cacheKey, resultRef.current);
+        if (newFetchStatus !== 'loading') {
+            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]);
     const subscribe = (0, react_1.useCallback)((onStoreChange) => {

package/package.json

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