From 693803a9bb3073b2ff5c99f8ae804f855db9aae2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Markb=C3=A5ge?= Date: Thu, 24 Apr 2025 16:53:34 -0400 Subject: [PATCH] Rename Suspense unstable_name to name (#33014) This was only used by Transition Tracing which isn't really used anywhere. However, we want to start using it for other DevTools. --- .../src/ReactFiberCommitWork.js | 6 +- .../__tests__/ReactTransitionTracing-test.js | 72 +++++++++---------- packages/shared/ReactTypes.js | 2 +- 3 files changed, 36 insertions(+), 44 deletions(-) diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.js b/packages/react-reconciler/src/ReactFiberCommitWork.js index 19be377e10..3fb346d4d2 100644 --- a/packages/react-reconciler/src/ReactFiberCommitWork.js +++ b/packages/react-reconciler/src/ReactFiberCommitWork.js @@ -1062,9 +1062,9 @@ function commitTransitionProgress(offscreenFiber: Fiber) { if ( parent !== null && parent.tag === SuspenseComponent && - parent.memoizedProps.unstable_name + parent.memoizedProps.name ) { - name = parent.memoizedProps.unstable_name; + name = parent.memoizedProps.name; } if (!wasHidden && isHidden) { @@ -4952,7 +4952,7 @@ function commitPassiveUnmountInsideDeletedTreeOnFiber( if (transitions !== null) { const abortReason = { reason: 'suspense', - name: current.memoizedProps.unstable_name || null, + name: current.memoizedProps.name || null, }; if ( current.memoizedState === null || diff --git a/packages/react-reconciler/src/__tests__/ReactTransitionTracing-test.js b/packages/react-reconciler/src/__tests__/ReactTransitionTracing-test.js index 64d51a1ff3..772eb98710 100644 --- a/packages/react-reconciler/src/__tests__/ReactTransitionTracing-test.js +++ b/packages/react-reconciler/src/__tests__/ReactTransitionTracing-test.js @@ -412,7 +412,7 @@ describe('ReactInteractionTracing', () => { {navigate ? ( } - unstable_name="suspense page"> + name="suspense page"> ) : ( @@ -498,14 +498,14 @@ describe('ReactInteractionTracing', () => { <> {showText ? ( }> ) : null} } - unstable_name="suspense page"> + name="suspense page"> @@ -605,14 +605,14 @@ describe('ReactInteractionTracing', () => { <> {showText ? ( }> ) : null} } - unstable_name="suspense page"> + name="suspense page"> @@ -719,16 +719,16 @@ describe('ReactInteractionTracing', () => { <> } - unstable_name="suspense page"> + name="suspense page"> }>
}> @@ -848,12 +848,12 @@ describe('ReactInteractionTracing', () => { <> } - unstable_name="suspense page"> + name="suspense page"> {/* showTextOne is entangled with navigate */} {showTextOne ? ( }> @@ -865,7 +865,7 @@ describe('ReactInteractionTracing', () => { from completing */} {showTextTwo ? ( }> @@ -1115,13 +1115,13 @@ describe('ReactInteractionTracing', () => { {navigate ? ( } - unstable_name="suspense page"> + name="suspense page"> } - unstable_name="marker suspense"> + name="marker suspense"> @@ -1226,20 +1226,18 @@ describe('ReactInteractionTracing', () => {
{navigate ? ( - } - unstable_name="outer"> + } name="outer"> } - unstable_name="inner one"> + name="inner one"> } - unstable_name="inner two"> + name="inner two"> @@ -1488,21 +1486,21 @@ describe('ReactInteractionTracing', () => { {showMarker ? ( }> ) : ( }> )} }> @@ -1652,7 +1650,7 @@ describe('ReactInteractionTracing', () => {
}> @@ -1661,7 +1659,7 @@ describe('ReactInteractionTracing', () => { ) : null} }> @@ -1788,12 +1786,12 @@ describe('ReactInteractionTracing', () => { {!deleteOne ? ( }> }> @@ -1803,7 +1801,7 @@ describe('ReactInteractionTracing', () => { }> @@ -1948,11 +1946,11 @@ describe('ReactInteractionTracing', () => { return ( {show ? ( - + ) : null} - + @@ -2068,13 +2066,13 @@ describe('ReactInteractionTracing', () => { {show ? ( {showSuspense ? ( - + ) : null} ) : null} - + @@ -2349,9 +2347,7 @@ describe('ReactInteractionTracing', () => { function App() { return ( - } - unstable_name="suspense page"> + } name="suspense page"> ); @@ -2416,12 +2412,10 @@ describe('ReactInteractionTracing', () => { }); return ( <> - }> + }> - }> + }> @@ -2490,9 +2484,7 @@ describe('ReactInteractionTracing', () => { function App({name}) { return ( <> - }> + }> diff --git a/packages/shared/ReactTypes.js b/packages/shared/ReactTypes.js index c439f1fb4a..e199fa9e7b 100644 --- a/packages/shared/ReactTypes.js +++ b/packages/shared/ReactTypes.js @@ -278,7 +278,7 @@ export type SuspenseProps = { unstable_avoidThisFallback?: boolean, unstable_expectedLoadTime?: number, - unstable_name?: string, + name?: string, }; export type TracingMarkerProps = {