react-native-onyx 2.0.61 → 2.0.63

package/dist/Onyx.js

@@ -560,6 +560,7 @@ function updateSnapshots(data) {
         return;
     const promises = [];
     const snapshotCollection = OnyxUtils_1.default.getCachedCollection(snapshotCollectionKey);
+    const snapshotCollectionKeyLength = snapshotCollectionKey.length;
     Object.entries(snapshotCollection).forEach(([snapshotKey, snapshotValue]) => {
         // Snapshots may not be present in cache. We don't know how to update them so we skip.
         if (!snapshotValue) {
@@ -568,7 +569,7 @@ function updateSnapshots(data) {
         let updatedData = {};
         data.forEach(({ key, value }) => {
             // snapshots are normal keys so we want to skip update if they are written to Onyx
-            if (OnyxUtils_1.default.isCollectionMemberKey(snapshotCollectionKey, key)) {
+            if (OnyxUtils_1.default.isCollectionMemberKey(snapshotCollectionKey, key, snapshotCollectionKeyLength)) {
                 return;
             }
             if (typeof snapshotValue !== 'object' || !('data' in snapshotValue)) {

package/dist/OnyxUtils.d.ts

@@ -79,7 +79,7 @@ declare function getCollectionKeys(): Set<OnyxKey>;
  * is associated with a collection of keys.
  */
 declare function isCollectionKey(key: OnyxKey): key is CollectionKeyBase;
-declare function isCollectionMemberKey<TCollectionKey extends CollectionKeyBase>(collectionKey: TCollectionKey, key: string): key is `${TCollectionKey}${string}`;
+declare function isCollectionMemberKey<TCollectionKey extends CollectionKeyBase>(collectionKey: TCollectionKey, key: string, collectionKeyLength: number): key is `${TCollectionKey}${string}`;
 /**
  * Splits a collection member key into the collection key part and the ID part.
  * @param key - The collection member key to split.

package/dist/OnyxUtils.js

@@ -315,8 +315,8 @@ function getCollectionKeys() {
 function isCollectionKey(key) {
     return onyxCollectionKeySet.has(key);
 }
-function isCollectionMemberKey(collectionKey, key) {
-    return Str.startsWith(key, collectionKey) && key.length > collectionKey.length;
+function isCollectionMemberKey(collectionKey, key, collectionKeyLength) {
+    return key.startsWith(collectionKey) && key.length > collectionKeyLength;
 }
 /**
  * Splits a collection member key into the collection key part and the ID part.
@@ -450,12 +450,13 @@ function addAllSafeEvictionKeysToRecentlyAccessedList() {
 function getCachedCollection(collectionKey, collectionMemberKeys) {
     const allKeys = collectionMemberKeys || OnyxCache_1.default.getAllKeys();
     const collection = {};
+    const collectionKeyLength = collectionKey.length;
     // forEach exists on both Set and Array
     allKeys.forEach((key) => {
         // If we don't have collectionMemberKeys array then we have to check whether a key is a collection member key.
         // Because in that case the keys will be coming from `cache.getAllKeys()` and we need to filter out the keys that
         // are not part of the collection.
-        if (!collectionMemberKeys && !isCollectionMemberKey(collectionKey, key)) {
+        if (!collectionMemberKeys && !isCollectionMemberKey(collectionKey, key, collectionKeyLength)) {
             return;
         }
         const cachedValue = OnyxCache_1.default.get(key);
@@ -478,6 +479,7 @@ function keysChanged(collectionKey, partialCollection, partialPreviousCollection
     // individual collection key member for the collection that is being updated. It is important to note that the collection parameter cane be a PARTIAL collection
     // and does not represent all of the combined keys and values for a collection key. It is just the "new" data that was merged in via mergeCollection().
     const stateMappingKeys = Object.keys(callbackToStateMapping);
+    const collectionKeyLength = collectionKey.length;
     for (let i = 0; i < stateMappingKeys.length; i++) {
         const subscriber = callbackToStateMapping[stateMappingKeys[i]];
         if (!subscriber) {
@@ -494,7 +496,7 @@ function keysChanged(collectionKey, partialCollection, partialPreviousCollection
         /**
          * e.g. Onyx.connect({key: `${ONYXKEYS.COLLECTION.REPORT}{reportID}`, callback: ...});
          */
-        const isSubscribedToCollectionMemberKey = isCollectionMemberKey(collectionKey, subscriber.key);
+        const isSubscribedToCollectionMemberKey = isCollectionMemberKey(collectionKey, subscriber.key, collectionKeyLength);
         // Regular Onyx.connect() subscriber found.
         if (typeof subscriber.callback === 'function') {
             if (!notifyRegularSubscibers) {
@@ -653,6 +655,7 @@ function keyChanged(key, value, previousValue, canUpdateSubscriber = () => true,
             return;
         }
     }
+    const cachedCollections = {};
     for (let i = 0; i < stateMappingKeys.length; i++) {
         const subscriber = callbackToStateMapping[stateMappingKeys[i]];
         if (!subscriber || !isKeyMatch(subscriber.key, key) || !canUpdateSubscriber(subscriber)) {
@@ -667,7 +670,11 @@ function keyChanged(key, value, previousValue, canUpdateSubscriber = () => true,
                 continue;
             }
             if (isCollectionKey(subscriber.key) && subscriber.waitForCollectionCallback) {
-                const cachedCollection = getCachedCollection(subscriber.key);
+                let cachedCollection = cachedCollections[subscriber.key];
+                if (!cachedCollection) {
+                    cachedCollection = getCachedCollection(subscriber.key);
+                    cachedCollections[subscriber.key] = cachedCollection;
+                }
                 cachedCollection[key] = value;
                 subscriber.callback(cachedCollection);
                 continue;

package/dist/useOnyx.js

@@ -46,7 +46,9 @@ function useOnyx(key, options) {
         try {
             const previousCollectionKey = OnyxUtils_1.default.splitCollectionMemberKey(previousKey)[0];
             const collectionKey = OnyxUtils_1.default.splitCollectionMemberKey(key)[0];
-            if (OnyxUtils_1.default.isCollectionMemberKey(previousCollectionKey, previousKey) && OnyxUtils_1.default.isCollectionMemberKey(collectionKey, key) && previousCollectionKey === collectionKey) {
+            if (OnyxUtils_1.default.isCollectionMemberKey(previousCollectionKey, previousKey, previousCollectionKey.length) &&
+                OnyxUtils_1.default.isCollectionMemberKey(collectionKey, key, collectionKey.length) &&
+                previousCollectionKey === collectionKey) {
                 return;
             }
         }

package/package.json

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