react-native-onyx 1.0.106 → 1.0.108

package/lib/Onyx.js

@@ -235,8 +235,14 @@ function tryGetCachedValue(key, mapping = {}) {
     let val = cache.getValue(key);
 
     if (isCollectionKey(key)) {
-        const allKeys = cache.getAllKeys();
-        const matchingKeys = _.filter(allKeys, k => k.startsWith(key));
+        const allCacheKeys = cache.getAllKeys();
+
+        // It is possible we haven't loaded all keys yet so we do not know if the
+        // collection actually exists.
+        if (allCacheKeys.length === 0) {
+            return;
+        }
+        const matchingKeys = _.filter(allCacheKeys, k => k.startsWith(key));
         const values = _.reduce(matchingKeys, (finalObject, matchedKey) => {
             const cachedValue = cache.getValue(matchedKey);
             if (cachedValue) {
@@ -246,9 +252,7 @@ function tryGetCachedValue(key, mapping = {}) {
             }
             return finalObject;
         }, {});
-        if (_.isEmpty(values)) {
-            return;
-        }
+
         val = values;
     }
 
@@ -826,6 +830,10 @@ function connect(mapping) {
             // 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)) {
+                    cache.set(mapping.key, null);
+                }
+
                 // Here we cannot use batching because the null value is expected to be set immediately for default props
                 // or they will be undefined.
                 sendDataToConnection(mapping, null, undefined, false);

package/lib/withOnyx.d.ts

@@ -7,6 +7,15 @@ import {CollectionKeyBase, KeyValueMapping, OnyxCollection, OnyxEntry, OnyxKey,
 type BaseMapping<TComponentProps, TOnyxProps> = {
     canEvict?: boolean | ((props: Omit<TComponentProps, keyof TOnyxProps>) => boolean);
     initWithStoredValues?: boolean;
+    allowStaleData?: boolean;
+};
+
+type CollectionBaseMapping<TOnyxKey extends CollectionKeyBase> = {
+    initialValue?: OnyxCollection<KeyValueMapping[TOnyxKey]>;
+};
+
+type EntryBaseMapping<TOnyxKey extends OnyxKey> = {
+    initialValue?: OnyxEntry<KeyValueMapping[TOnyxKey]>;
 };
 
 /**
@@ -99,7 +108,7 @@ type BaseMappingFunctionKeyAndSelector<
 type Mapping<TComponentProps, TOnyxProps, TOnyxProp extends keyof TOnyxProps, TOnyxKey extends OnyxKey> = BaseMapping<
     TComponentProps,
     TOnyxProps
-> &
+> & EntryBaseMapping<TOnyxKey> &
     (
         | BaseMappingKey<TComponentProps, TOnyxProps, TOnyxProp, TOnyxKey, OnyxEntry<KeyValueMapping[TOnyxKey]>>
         | BaseMappingStringKeyAndSelector<TComponentProps, TOnyxProps, TOnyxProp, TOnyxKey>
@@ -114,7 +123,7 @@ type CollectionMapping<
     TOnyxProps,
     TOnyxProp extends keyof TOnyxProps,
     TOnyxKey extends CollectionKeyBase
-> = BaseMapping<TComponentProps, TOnyxProps> &
+> = BaseMapping<TComponentProps, TOnyxProps> & CollectionBaseMapping<TOnyxKey> &
     (
         | BaseMappingKey<TComponentProps, TOnyxProps, TOnyxProp, TOnyxKey, OnyxCollection<KeyValueMapping[TOnyxKey]>>
         | BaseMappingStringKeyAndSelector<TComponentProps, TOnyxProps, TOnyxProp, TOnyxKey>

package/package.json

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