react-native-onyx 1.0.90 → 1.0.92

package/lib/Onyx.js

@@ -802,7 +802,19 @@ function connect(mapping) {
     // Commit connection only after init passes
     deferredInitTask.promise
         .then(() => addKeyToRecentlyAccessedIfNeeded(mapping))
-        .then(getAllKeys)
+        .then(() => {
+            // Performance improvement
+            // If the mapping is connected to an onyx key that is not a collection
+            // we can skip the call to getAllKeys() and return an array with a single item
+            if (Boolean(mapping.key)
+                && typeof mapping.key === 'string'
+                && !(mapping.key.endsWith('_'))
+                && cache.storageKeys.has(mapping.key)
+            ) {
+                return [mapping.key];
+            }
+            return getAllKeys();
+        })
         .then((keys) => {
             // We search all the keys in storage to see if any are a "match" for the subscriber we are connecting so that we
             // can send data back to the subscriber. Note that multiple keys can match as a subscriber could either be

package/lib/OnyxCache.js

@@ -179,12 +179,21 @@ class OnyxCache {
      * Remove keys that don't fall into the range of recently used keys
      */
     removeLeastRecentlyUsedKeys() {
-        while (this.recentKeys.size > this.maxRecentKeysSize) {
-            const iterator = this.recentKeys.values();
+        let numKeysToRemove = this.recentKeys.size - this.maxRecentKeysSize;
+        if (numKeysToRemove <= 0) {
+            return;
+        }
+        const iterator = this.recentKeys.values();
+        const temp = [];
+        while (numKeysToRemove > 0) {
             const value = iterator.next().value;
-            if (value !== undefined) {
-                this.drop(value);
-            }
+            temp.push(value);
+            numKeysToRemove--;
+        }
+
+        for (let i = 0; i < temp.length; ++i) {
+            delete this.storageMap[temp[i]];
+            this.recentKeys.delete(temp[i]);
         }
     }
 

package/package.json

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