Experiment 5

Author: VickyStash

jestSetup.js

@@ -9,3 +9,6 @@ jest.mock('react-native-nitro-sqlite', () => ({
 }));
 
 jest.useRealTimers();
+
+const unstable_batchedUpdates_jest = require('react-test-renderer').unstable_batchedUpdates;
+require('./lib/batch.native').default = unstable_batchedUpdates_jest;

lib/OnyxUtils.ts

@@ -7,6 +7,7 @@ import * as Logger from './Logger';
 import type Onyx from './Onyx';
 import cache, {TASK} from './OnyxCache';
 import * as Str from './Str';
+import unstable_batchedUpdates from './batch';
 import Storage from './storage';
 import type {
     CollectionKey,
@@ -228,8 +229,14 @@ function maybeFlushBatchUpdates(): Promise<void> {
          * then the batch will be flushed on next frame.
          */
         setTimeout(() => {
+            const updatesCopy = batchUpdatesQueue;
             batchUpdatesQueue = [];
             batchUpdatesPromise = null;
+            unstable_batchedUpdates(() => {
+                for (const applyUpdates of updatesCopy) {
+                    applyUpdates();
+                }
+            });
 
             resolve();
         }, 0);

lib/batch.native.ts

@@ -0,0 +1,3 @@
+import {unstable_batchedUpdates} from 'react-native';
+
+export default unstable_batchedUpdates;

lib/batch.ts

@@ -0,0 +1,3 @@
+import {unstable_batchedUpdates} from 'react-dom';
+
+export default unstable_batchedUpdates;