react-native-onyx 1.0.65 → 1.0.67

package/lib/Onyx.d.ts

@@ -45,12 +45,12 @@ type ConnectOptions<TKey extends OnyxKey> = BaseConnectOptions &
     (
         | {
               key: TKey extends CollectionKey ? TKey : never;
-              callback?: (value: OnyxCollection<KeyValueMapping[TKey]>, key?: TKey) => void;
+              callback?: (value: OnyxCollection<KeyValueMapping[TKey]>) => void;
               waitForCollectionCallback: true;
           }
         | {
               key: TKey;
-              callback?: (value: OnyxEntry<KeyValueMapping[TKey]>, key?: TKey) => void;
+              callback?: (value: OnyxEntry<KeyValueMapping[TKey]>, key: TKey) => void;
               waitForCollectionCallback?: false;
           }
     );

package/lib/Onyx.js

@@ -27,8 +27,8 @@ let lastConnectionID = 0;
 // Holds a mapping of all the react components that want their state subscribed to a store key
 const callbackToStateMapping = {};
 
-// Stores all of the keys that Onyx can use. Must be defined in init().
-let onyxKeys = {};
+// Keeps a copy of the values of the onyx collection keys as a map for faster lookups
+let onyxCollectionKeyMap = {};
 
 // Holds a list of keys that have been directly subscribed to or recently modified from least to most recent
 let recentlyAccessedKeys = [];
@@ -141,7 +141,7 @@ function getAllKeys() {
  * @returns {Boolean}
  */
 function isCollectionKey(key) {
-    return _.contains(_.values(onyxKeys.COLLECTION), key);
+    return onyxCollectionKeyMap.has(key);
 }
 
 /**
@@ -1392,8 +1392,13 @@ function init({
         cache.setRecentKeysLimit(maxCachedKeysCount);
     }
 
-    // Let Onyx know about all of our keys
-    onyxKeys = keys;
+    // We need the value of the collection keys later for checking if a
+    // key is a collection. We store it in a map for faster lookup.
+    const collectionValues = _.values(keys.COLLECTION);
+    onyxCollectionKeyMap = _.reduce(collectionValues, (acc, val) => {
+        acc.set(val, true);
+        return acc;
+    }, new Map());
 
     // Set our default key states to use when initializing and clearing Onyx data
     defaultKeyStates = initialKeyStates;

package/package.json

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