{"body":"","files":[{"status":"M","path":"packages\/react-devtools-shared\/src\/__tests__\/store-test.js"},{"status":"M","path":"packages\/react-devtools-shared\/src\/backend\/fiber\/renderer.js"}],"parents":["8ad773b1f342d20e4773c8d086028c6927445a22"],"patch":"diff --git a\/packages\/react-devtools-shared\/src\/__tests__\/store-test.js b\/packages\/react-devtools-shared\/src\/__tests__\/store-test.js\nindex 4d4d5b6aff..48a42f7104 100644\n--- a\/packages\/react-devtools-shared\/src\/__tests__\/store-test.js\n+++ b\/packages\/react-devtools-shared\/src\/__tests__\/store-test.js\n@@ -3107,4 +3107,45 @@ describe('Store', () => {\n await actAsync(() => render());\n expect(store).toMatchInlineSnapshot(`[root]`);\n });\n+\n+ \/\/ @reactVersion >= 19.0\n+ it('should reconcile promise-as-a-child', async () => {\n+ function Component({children}) {\n+ return

{children}<\/div>;\n+ }\n+\n+ await actAsync(() =>\n+ render(\n+ \n+ {Promise.resolve(A<\/Component>)}\n+ <\/React.Suspense>,\n+ ),\n+ );\n+ expect(store).toMatchInlineSnapshot(`\n+ [root]\n+ ▾ \n+ \n+ [suspense-root] rects={[{x:1,y:2,width:1,height:1}]}\n+ \n+ `);\n+\n+ await actAsync(() =>\n+ render(\n+ \n+ {Promise.resolve(not A<\/Component>)}\n+ <\/React.Suspense>,\n+ ),\n+ );\n+\n+ expect(store).toMatchInlineSnapshot(`\n+ [root]\n+ ▾ \n+ \n+ [suspense-root] rects={[{x:1,y:2,width:5,height:1}]}\n+ \n+ `);\n+\n+ await actAsync(() => render(null));\n+ expect(store).toMatchInlineSnapshot(``);\n+ });\n });\ndiff --git a\/packages\/react-devtools-shared\/src\/backend\/fiber\/renderer.js b\/packages\/react-devtools-shared\/src\/backend\/fiber\/renderer.js\nindex 39179bc6f4..f2b6700163 100644\n--- a\/packages\/react-devtools-shared\/src\/backend\/fiber\/renderer.js\n+++ b\/packages\/react-devtools-shared\/src\/backend\/fiber\/renderer.js\n@@ -2886,9 +2886,16 @@ export function attach(\n previousSuspendedBy: null | Array,\n parentSuspenseNode: null | SuspenseNode,\n ): void {\n- \/\/ Remove any async info from the parent, if they were in the previous set but\n+ \/\/ Remove any async info if they were in the previous set but\n \/\/ is no longer in the new set.\n- if (previousSuspendedBy !== null && parentSuspenseNode !== null) {\n+ \/\/ If we just reconciled a SuspenseNode, we need to remove from that node instead of the parent.\n+ \/\/ This is different from inserting because inserting is done during reconiliation\n+ \/\/ whereas removal is done after we're done reconciling.\n+ const suspenseNode =\n+ instance.suspenseNode === null\n+ ? parentSuspenseNode\n+ : instance.suspenseNode;\n+ if (previousSuspendedBy !== null && suspenseNode !== null) {\n const nextSuspendedBy = instance.suspendedBy;\n for (let i = 0; i < previousSuspendedBy.length; i++) {\n const asyncInfo = previousSuspendedBy[i];\n@@ -2901,7 +2908,7 @@ export function attach(\n \/\/ This IO entry is no longer blocking the current tree.\n \/\/ Let's remove it from the parent SuspenseNode.\n const ioInfo = asyncInfo.awaited;\n- const suspendedBySet = parentSuspenseNode.suspendedBy.get(ioInfo);\n+ const suspendedBySet = suspenseNode.suspendedBy.get(ioInfo);\n \n if (\n suspendedBySet === undefined ||\n@@ -2928,16 +2935,16 @@ export function attach(\n }\n }\n if (suspendedBySet !== undefined && suspendedBySet.size === 0) {\n- parentSuspenseNode.suspendedBy.delete(asyncInfo.awaited);\n+ suspenseNode.suspendedBy.delete(asyncInfo.awaited);\n }\n if (\n- parentSuspenseNode.hasUniqueSuspenders &&\n- !ioExistsInSuspenseAncestor(parentSuspenseNode, ioInfo)\n+ suspenseNode.hasUniqueSuspenders &&\n+ !ioExistsInSuspenseAncestor(suspenseNode, ioInfo)\n ) {\n \/\/ This entry wasn't in any ancestor and is no longer in this suspense boundary.\n \/\/ This means that a child might now be the unique suspender for this IO.\n \/\/ Search the child boundaries to see if we can reveal any of them.\n- unblockSuspendedBy(parentSuspenseNode, ioInfo);\n+ unblockSuspendedBy(suspenseNode, ioInfo);\n }\n }\n }\n","commit":{"revision":"c44fbf43b1e05417619c3b9411d0559824739569","authorEmail":"sebastian.silbermann@vercel.com","subject":"[DevTools] Fix instrumentation error when reconciling promise-as-a-child (#34587)","shortRevision":"c44fbf43b1","authorName":"Sebastian \"Sebbie\" Silbermann","authoredAt":"2025-09-24T22:50:12+02:00"}}

dillon1000/react

Files changed