guard against sync rerenders

testing-library · Dec 2, 2024 · fab8705 · fab8705
1 parent e1cb39d
commit fab8705
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/renderStream/createRenderStream.tsx b/src/renderStream/createRenderStream.tsx
@@ -267,10 +267,15 @@ export function createRenderStream<
     }
     const origRerender = ret.rerender
     ret.rerender = async function rerender(rerenderUi: React.ReactNode) {
+      const previousRenderCount = stream.renders.length
       try {
         return await origRerender(rerenderUi)
       } finally {
-        await stream.waitForNextRender()
+        // only wait for the next render if the rerender was not
+        // synchronous (React 17)
+        if (previousRenderCount === stream.renders.length) {
+          await stream.waitForNextRender()
+        }
       }
     }
     return ret