react-native-onyx 1.0.59 → 1.0.61

package/dist/web.development.js

@@ -983,7 +983,6 @@ function broadcastUpdate(key, value, hasChanged, method) {
 }
 
 /**
- * @private
  * @param {String} key
  * @returns {Boolean}
  */
@@ -1490,7 +1489,8 @@ const Onyx = {
   isSafeEvictionKey,
   METHOD,
   setMemoryOnlyKeys,
-  tryGetCachedValue
+  tryGetCachedValue,
+  hasPendingMergeForKey
 };
 
 /**
@@ -2460,7 +2460,18 @@ function getDisplayName(component) {
           const key = _Str__WEBPACK_IMPORTED_MODULE_3__.result(mapping.key, props);
           const value = _Onyx__WEBPACK_IMPORTED_MODULE_4__["default"].tryGetCachedValue(key, mapping);
 
-          if (value !== undefined) {
+          /**
+           * If we have a pending merge for a key it could mean that data is being set via Onyx.merge() and someone expects a component to have this data immediately.
+           *
+           * @example
+           *
+           * Onyx.merge('report_123', value);
+           * Navigation.navigate(route); // Where "route" expects the "value" to be available immediately once rendered.
+           *
+           * In reality, Onyx.merge() will only update the subscriber after all merges have been batched and the previous value is retrieved via a get() (returns a promise).
+           * So, we won't use the cache optimization here as it will lead us to arbitrarily defer various actions in the application code.
+           */
+          if (value !== undefined && !_Onyx__WEBPACK_IMPORTED_MODULE_4__["default"].hasPendingMergeForKey(key)) {
             // eslint-disable-next-line no-param-reassign
             resultObj[propertyName] = value;
           }