react-native-onyx 2.0.58 → 2.0.60

package/dist/Onyx.js

@@ -482,21 +482,24 @@ function mergeCollection(collectionKey, collection) {
  * @param keysToPreserve is a list of ONYXKEYS that should not be cleared with the rest of the data
  */
 function clear(keysToPreserve = []) {
+    const defaultKeyStates = OnyxUtils_1.default.getDefaultKeyStates();
+    const initialKeys = Object.keys(defaultKeyStates);
     return OnyxUtils_1.default.getAllKeys()
-        .then((keys) => {
+        .then((cachedKeys) => {
         OnyxCache_1.default.clearNullishStorageKeys();
         const keysToBeClearedFromStorage = [];
         const keyValuesToResetAsCollection = {};
         const keyValuesToResetIndividually = {};
+        const allKeys = new Set([...cachedKeys, ...initialKeys]);
         // The only keys that should not be cleared are:
         // 1. Anything specifically passed in keysToPreserve (because some keys like language preferences, offline
         //      status, or activeClients need to remain in Onyx even when signed out)
         // 2. Any keys with a default state (because they need to remain in Onyx as their default, and setting them
         //      to null would cause unknown behavior)
-        keys.forEach((key) => {
+        //   2.1 However, if a default key was explicitly set to null, we need to reset it to the default value
+        allKeys.forEach((key) => {
             var _a;
             const isKeyToPreserve = keysToPreserve.includes(key);
-            const defaultKeyStates = OnyxUtils_1.default.getDefaultKeyStates();
             const isDefaultKey = key in defaultKeyStates;
             // If the key is being removed or reset to default:
             // 1. Update it in the cache
@@ -533,7 +536,6 @@ function clear(keysToPreserve = []) {
         Object.entries(keyValuesToResetAsCollection).forEach(([key, value]) => {
             updatePromises.push(OnyxUtils_1.default.scheduleNotifyCollectionSubscribers(key, value));
         });
-        const defaultKeyStates = OnyxUtils_1.default.getDefaultKeyStates();
         const defaultKeyValuePairs = Object.entries(Object.keys(defaultKeyStates)
             .filter((key) => !keysToPreserve.includes(key))
             .reduce((obj, key) => {

package/dist/OnyxUtils.js

@@ -280,6 +280,7 @@ function deleteKeyByConnections(connectionID) {
         const updatedConnectionIDs = onyxKeyToConnectionIDs.get(subscriber.key).filter((id) => id !== connectionID);
         onyxKeyToConnectionIDs.set(subscriber.key, updatedConnectionIDs);
     }
+    lastConnectionCallbackData.delete(connectionID);
 }
 /** Returns current key names stored in persisted storage */
 function getAllKeys() {

package/package.json

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