refactor: extract async wrapper from waitFor implem

Author: pierrezimmermannbam

src/user-event/utils/asyncWrapper.ts

@@ -0,0 +1,35 @@
+import { act } from 'react-test-renderer';
+import { getIsReactActEnvironment, setReactActEnvironment } from '../../act';
+import { flushMicroTasksLegacy } from '../../flush-micro-tasks';
+import { checkReactVersionAtLeast } from '../../react-versions';
+
+export const asyncWrapper = async <T>(
+  callback: () => Promise<T>
+): Promise<T> => {
+  if (checkReactVersionAtLeast(18, 0)) {
+    const previousActEnvironment = getIsReactActEnvironment();
+    setReactActEnvironment(false);
+
+    try {
+      const result = await callback();
+      // Flush the microtask queue before restoring the `act` environment
+      await flushMicroTasksLegacy();
+      return result;
+    } finally {
+      setReactActEnvironment(previousActEnvironment);
+    }
+  }
+
+  if (!checkReactVersionAtLeast(16, 9)) {
+    return callback();
+  }
+
+  let result: T;
+
+  await act(async () => {
+    result = await callback();
+  });
+
+  // Either we have result or `waitFor` threw error
+  return result!;
+};

src/user-event/utils/wait.ts

@@ -1,4 +1,3 @@
-import act from '../../act';
 import { UserEventConfig } from '../setup';
 
 export function wait(config: UserEventConfig, durationInMs?: number) {
@@ -7,12 +6,10 @@ export function wait(config: UserEventConfig, durationInMs?: number) {
     return;
   }
 
-  return act(async () => {
-    await Promise.all([
-      new Promise<void>((resolve) =>
-        globalThis.setTimeout(() => resolve(), delay)
-      ),
-      config.advanceTimers(delay),
-    ]);
-  });
+  return Promise.all([
+    new Promise<void>((resolve) =>
+      globalThis.setTimeout(() => resolve(), delay)
+    ),
+    config.advanceTimers(delay),
+  ]);
 }