guard against sync rerenders

phryneas · phryneas · commit fab8705f217b · 2024-12-02T16:53:11.000+01:00
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

Original file line number	Diff line number	Diff line change
`@@ -267,10 +267,15 @@ export function createRenderStream<`
`267`	`267`	`}`
`268`	`268`	`const origRerender = ret.rerender`
`269`	`269`	`ret.rerender = async function rerender(rerenderUi: React.ReactNode) {`
	`270`	`+ const previousRenderCount = stream.renders.length`
`270`	`271`	`try {`
`271`	`272`	`return await origRerender(rerenderUi)`
`272`	`273`	`} finally {`
`273`		`- await stream.waitForNextRender()`
	`274`	`+ // only wait for the next render if the rerender was not`
	`275`	`+ // synchronous (React 17)`
	`276`	`+ if (previousRenderCount === stream.renders.length) {`
	`277`	`+ await stream.waitForNextRender()`
	`278`	`+ }`
`274`	`279`	`}`
`275`	`280`	`}`
`276`	`281`	`return ret`