Add expertimental optimisticKey behind a flag (#35162)

When dealing with optimistic state, a common problem is not knowing the
id of the thing we're waiting on. Items in lists need keys (and single
items should often have keys too to reset their state). As a result you
have to generate fake keys. It's a pain to manage those and when the
real item comes in, you often end up rendering that with a different
`key` which resets the state of the component tree. That in turns works
against the grain of React and a lot of negatives fall out of it.
This adds a special `optimisticKey` symbol that can be used in place of
a `string` key.
```js
import {optimisticKey} from 'react';
...
const [optimisticItems, setOptimisticItems] = useOptimistic([]);
const children = savedItems.concat(
optimisticItems.map(item =>
<Item key={optimisticKey} item={item} />
)
);
return <div>{children}</div>;
```
The semantics of this `optimisticKey` is that the assumption is that the
newly saved item will be rendered in the same slot as the previous
optimistic items. State is transferred into whatever real key ends up in
the same slot.
This might lead to some incorrect transferring of state in some cases
where things don't end up lining up - but it's worth it for simplicity
in many cases since dealing with true matching of optimistic state is
often very complex for something that only lasts a blink of an eye.
If a new item matches a `key` elsewhere in the set, then that's favored
over reconciling against the old slot.
One quirk with the current algorithm is if the `savedItems` has items
removed, then the slots won't line up by index anymore and will be
skewed. We might be able to add something where the optimistic set is
always reconciled against the end. However, it's probably better to just
assume that the set will line up perfectly and otherwise it's just best
effort that can lead to weird artifacts.
An `optimisticKey` will match itself for updates to the same slot, but
it will not match any existing slot that is not an `optimisticKey`. So
it's not an `any`, which I originally called it, because it doesn't
match existing real keys against new optimistic keys. Only one
direction.

Author: sebmarkbage

packages/react-client/src/__tests__/ReactFlight-test.js

@@ -3884,4 +3884,19 @@ describe('ReactFlight', () => {
 </main>,
 );
 });
+
+// @gate enableOptimisticKey
+it('collapses optimistic keys to an optimistic key',async()=>{
+functionBar({text}){
+return<div/>;
+}
+functionFoo(){
+return<Barkey={ReactServer.optimisticKey}/>;
+}
+consttransport=ReactNoopFlightServer.render({
+element: <Fookey="Outer Key"/>,
+});
+constmodel=awaitReactNoopFlightClient.read(transport);
+expect(model.element.key).toBe(React.optimisticKey);
+});
 });

packages/react-devtools-shared/src/backend/fiber/renderer.js

@@ -120,6 +120,7 @@ import {
 MEMO_SYMBOL_STRING,
 SERVER_CONTEXT_SYMBOL_STRING,
 LAZY_SYMBOL_STRING,
+REACT_OPTIMISTIC_KEY,
 }from'../shared/ReactSymbols';
 import{enableStyleXFeatures}from'react-devtools-feature-flags';
 
@@ -4849,7 +4850,10 @@ export function attach(
  }
  let previousSiblingOfBestMatch = null;
  let bestMatch = remainingReconcilingChildren;
- if (componentInfo.key != null) {
+ if (
+ componentInfo.key != null &&
+ componentInfo.key !== REACT_OPTIMISTIC_KEY
+ ) {
  // If there is a key try to find a matching key in the set.
  bestMatch = remainingReconcilingChildren;
  while (bestMatch !== null) {
@@ -6145,7 +6149,7 @@ export function attach(
  return {
  displayName: getDisplayNameForFiber(fiber) || 'Anonymous',
  id: instance.id,
- key: fiber.key,
+ key: fiber.key === REACT_OPTIMISTIC_KEY ? null : fiber.key,
  env: null,
  stack:
  fiber._debugOwner == null || fiber._debugStack == null
@@ -6158,7 +6162,11 @@ export function attach(
  return {
  displayName: componentInfo.name || 'Anonymous',
  id: instance.id,
- key: componentInfo.key == null ? null : componentInfo.key,
+ key:
+ componentInfo.key == null ||
+ componentInfo.key === REACT_OPTIMISTIC_KEY
+ ? null
+ : componentInfo.key,
  env: componentInfo.env == null ? null : componentInfo.env,
  stack:
  componentInfo.owner == null || componentInfo.debugStack == null
@@ -7082,7 +7090,7 @@ export function attach(
  // Does the component have legacy context attached to it.
  hasLegacyContext,
 
- key: key != null ? key : null,
+ key: key != null && key !== REACT_OPTIMISTIC_KEY ? key : null,
 
  type: elementType,
 
@@ -8641,15 +8649,19 @@ export function attach(
 }
 return{
  displayName,
- key,
+key: key===REACT_OPTIMISTIC_KEY ? null : key,
  index,
 };
 }
 
 functiongetVirtualPathFrame(virtualInstance: VirtualInstance): PathFrame{
 return{
 displayName: virtualInstance.data.name||'',
-key: virtualInstance.data.key==null ? null : virtualInstance.data.key,
+key:
+virtualInstance.data.key==null||
+virtualInstance.data.key===REACT_OPTIMISTIC_KEY
+ ? null
+ : virtualInstance.data.key,
 index: -1,// We use -1 to indicate that this is a virtual path frame.
 };
 }

packages/react-devtools-shared/src/backend/shared/ReactSymbols.js

@@ -72,3 +72,9 @@ export const SERVER_CONTEXT_DEFAULT_VALUE_NOT_LOADED_SYMBOL_STRING =
 exportconstREACT_MEMO_CACHE_SENTINEL: symbol=Symbol.for(
 'react.memo_cache_sentinel',
 );
+
+importtype{ReactOptimisticKey}from'shared/ReactTypes';
+
+exportconstREACT_OPTIMISTIC_KEY: ReactOptimisticKey=(Symbol.for(
+'react.optimistic_key',
+): any);

packages/react-dom/src/__tests__/ReactDOMFizzStaticBrowser-test.js

@@ -1111,4 +1111,64 @@ describe('ReactDOMFizzStaticBrowser', () => {
 </div>,
 );
 });
+
+// @gate enableHalt && enableOptimisticKey
+it('can resume an optimistic keyed slot',async()=>{
+consterrors=[];
+
+letresolve;
+constpromise=newPromise(r=>(resolve=r));
+
+asyncfunctionComponent(){
+awaitpromise;
+return'Hi';
+}
+
+if(React.optimisticKey===undefined){
+thrownewError('optimisticKey missing');
+}
+
+functionApp(){
+return(
+<div>
+<Suspensefallback="Loading">
+<Componentkey={React.optimisticKey}/>
+</Suspense>
+</div>
+);
+}
+
+constcontroller=newAbortController();
+constpendingResult=serverAct(()=>
+ReactDOMFizzStatic.prerender(<App/>,{
+signal: controller.signal,
+onError(x){
+errors.push(x.message);
+},
+}),
+);
+
+awaitserverAct(()=>{
+controller.abort();
+});
+
+constprerendered=awaitpendingResult;
+
+constpostponedState=JSON.stringify(prerendered.postponed);
+
+awaitreadIntoContainer(prerendered.prelude);
+expect(getVisibleChildren(container)).toEqual(<div>Loading</div>);
+
+expect(prerendered.postponed).not.toBe(null);
+
+awaitresolve();
+
+constdynamic=awaitserverAct(()=>
+ReactDOMFizzServer.resume(<App/>,JSON.parse(postponedState)),
+);
+
+awaitreadIntoContainer(dynamic);
+
+expect(getVisibleChildren(container)).toEqual(<div>Hi</div>);
+});
 });

packages/react-client/src/__tests__/ReactFlight-test.js

@@ -3884,4 +3884,19 @@ describe('ReactFlight', () => {
 </main>,
 );
 });
+
+// @gate enableOptimisticKey
+it('collapses optimistic keys to an optimistic key',async()=>{
+functionBar({text}){
+return<div/>;
+}
+functionFoo(){
+return<Barkey={ReactServer.optimisticKey}/>;
+}
+consttransport=ReactNoopFlightServer.render({
+element: <Fookey="Outer Key"/>,
+});
+constmodel=awaitReactNoopFlightClient.read(transport);
+expect(model.element.key).toBe(React.optimisticKey);
+});
 });

packages/react-devtools-shared/src/backend/fiber/renderer.js

@@ -120,6 +120,7 @@ import {
 MEMO_SYMBOL_STRING,
 SERVER_CONTEXT_SYMBOL_STRING,
 LAZY_SYMBOL_STRING,
+REACT_OPTIMISTIC_KEY,
 }from'../shared/ReactSymbols';
 import{enableStyleXFeatures}from'react-devtools-feature-flags';
 
@@ -4849,7 +4850,10 @@ export function attach(
  }
  let previousSiblingOfBestMatch = null;
  let bestMatch = remainingReconcilingChildren;
- if (componentInfo.key != null) {
+ if (
+ componentInfo.key != null &&
+ componentInfo.key !== REACT_OPTIMISTIC_KEY
+ ) {
  // If there is a key try to find a matching key in the set.
  bestMatch = remainingReconcilingChildren;
  while (bestMatch !== null) {
@@ -6145,7 +6149,7 @@ export function attach(
  return {
  displayName: getDisplayNameForFiber(fiber) || 'Anonymous',
  id: instance.id,
- key: fiber.key,
+ key: fiber.key === REACT_OPTIMISTIC_KEY ? null : fiber.key,
  env: null,
  stack:
  fiber._debugOwner == null || fiber._debugStack == null
@@ -6158,7 +6162,11 @@ export function attach(
  return {
  displayName: componentInfo.name || 'Anonymous',
  id: instance.id,
- key: componentInfo.key == null ? null : componentInfo.key,
+ key:
+ componentInfo.key == null ||
+ componentInfo.key === REACT_OPTIMISTIC_KEY
+ ? null
+ : componentInfo.key,
  env: componentInfo.env == null ? null : componentInfo.env,
  stack:
  componentInfo.owner == null || componentInfo.debugStack == null
@@ -7082,7 +7090,7 @@ export function attach(
  // Does the component have legacy context attached to it.
  hasLegacyContext,
 
- key: key != null ? key : null,
+ key: key != null && key !== REACT_OPTIMISTIC_KEY ? key : null,
 
  type: elementType,
 
@@ -8641,15 +8649,19 @@ export function attach(
 }
 return{
  displayName,
- key,
+key: key===REACT_OPTIMISTIC_KEY ? null : key,
  index,
 };
 }
 
 functiongetVirtualPathFrame(virtualInstance: VirtualInstance): PathFrame{
 return{
 displayName: virtualInstance.data.name||'',
-key: virtualInstance.data.key==null ? null : virtualInstance.data.key,
+key:
+virtualInstance.data.key==null||
+virtualInstance.data.key===REACT_OPTIMISTIC_KEY
+ ? null
+ : virtualInstance.data.key,
 index: -1,// We use -1 to indicate that this is a virtual path frame.
 };
 }

packages/react-devtools-shared/src/backend/shared/ReactSymbols.js

@@ -72,3 +72,9 @@ export const SERVER_CONTEXT_DEFAULT_VALUE_NOT_LOADED_SYMBOL_STRING =
 exportconstREACT_MEMO_CACHE_SENTINEL: symbol=Symbol.for(
 'react.memo_cache_sentinel',
 );
+
+importtype{ReactOptimisticKey}from'shared/ReactTypes';
+
+exportconstREACT_OPTIMISTIC_KEY: ReactOptimisticKey=(Symbol.for(
+'react.optimistic_key',
+): any);

packages/react-dom/src/__tests__/ReactDOMFizzStaticBrowser-test.js

@@ -1111,4 +1111,64 @@ describe('ReactDOMFizzStaticBrowser', () => {
 </div>,
 );
 });
+
+// @gate enableHalt && enableOptimisticKey
+it('can resume an optimistic keyed slot',async()=>{
+consterrors=[];
+
+letresolve;
+constpromise=newPromise(r=>(resolve=r));
+
+asyncfunctionComponent(){
+awaitpromise;
+return'Hi';
+}
+
+if(React.optimisticKey===undefined){
+thrownewError('optimisticKey missing');
+}
+
+functionApp(){
+return(
+<div>
+<Suspensefallback="Loading">
+<Componentkey={React.optimisticKey}/>
+</Suspense>
+</div>
+);
+}
+
+constcontroller=newAbortController();
+constpendingResult=serverAct(()=>
+ReactDOMFizzStatic.prerender(<App/>,{
+signal: controller.signal,
+onError(x){
+errors.push(x.message);
+},
+}),
+);
+
+awaitserverAct(()=>{
+controller.abort();
+});
+
+constprerendered=awaitpendingResult;
+
+constpostponedState=JSON.stringify(prerendered.postponed);
+
+awaitreadIntoContainer(prerendered.prelude);
+expect(getVisibleChildren(container)).toEqual(<div>Loading</div>);
+
+expect(prerendered.postponed).not.toBe(null);
+
+awaitresolve();
+
+constdynamic=awaitserverAct(()=>
+ReactDOMFizzServer.resume(<App/>,JSON.parse(postponedState)),
+);
+
+awaitreadIntoContainer(dynamic);
+
+expect(getVisibleChildren(container)).toEqual(<div>Hi</div>);
+});
 });

packages/react-client/src/__tests__/ReactFlight-test.js

@@ -3884,4 +3884,19 @@ describe('ReactFlight', () => {
 </main>,
 );
 });
+
+// @gate enableOptimisticKey
+it('collapses optimistic keys to an optimistic key',async()=>{
+functionBar({text}){
+return<div/>;
+}
+functionFoo(){
+return<Barkey={ReactServer.optimisticKey}/>;
+}
+consttransport=ReactNoopFlightServer.render({
+element: <Fookey="Outer Key"/>,
+});
+constmodel=awaitReactNoopFlightClient.read(transport);
+expect(model.element.key).toBe(React.optimisticKey);
+});
 });

packages/react-devtools-shared/src/backend/fiber/renderer.js

@@ -120,6 +120,7 @@ import {
 MEMO_SYMBOL_STRING,
 SERVER_CONTEXT_SYMBOL_STRING,
 LAZY_SYMBOL_STRING,
+REACT_OPTIMISTIC_KEY,
 }from'../shared/ReactSymbols';
 import{enableStyleXFeatures}from'react-devtools-feature-flags';
 
@@ -4849,7 +4850,10 @@ export function attach(
  }
  let previousSiblingOfBestMatch = null;
  let bestMatch = remainingReconcilingChildren;
- if (componentInfo.key != null) {
+ if (
+ componentInfo.key != null &&
+ componentInfo.key !== REACT_OPTIMISTIC_KEY
+ ) {
  // If there is a key try to find a matching key in the set.
  bestMatch = remainingReconcilingChildren;
  while (bestMatch !== null) {
@@ -6145,7 +6149,7 @@ export function attach(
  return {
  displayName: getDisplayNameForFiber(fiber) || 'Anonymous',
  id: instance.id,
- key: fiber.key,
+ key: fiber.key === REACT_OPTIMISTIC_KEY ? null : fiber.key,
  env: null,
  stack:
  fiber._debugOwner == null || fiber._debugStack == null
@@ -6158,7 +6162,11 @@ export function attach(
  return {
  displayName: componentInfo.name || 'Anonymous',
  id: instance.id,
- key: componentInfo.key == null ? null : componentInfo.key,
+ key:
+ componentInfo.key == null ||
+ componentInfo.key === REACT_OPTIMISTIC_KEY
+ ? null
+ : componentInfo.key,
  env: componentInfo.env == null ? null : componentInfo.env,
  stack:
  componentInfo.owner == null || componentInfo.debugStack == null
@@ -7082,7 +7090,7 @@ export function attach(
  // Does the component have legacy context attached to it.
  hasLegacyContext,
 
- key: key != null ? key : null,
+ key: key != null && key !== REACT_OPTIMISTIC_KEY ? key : null,
 
  type: elementType,
 
@@ -8641,15 +8649,19 @@ export function attach(
 }
 return{
  displayName,
- key,
+key: key===REACT_OPTIMISTIC_KEY ? null : key,
  index,
 };
 }
 
 functiongetVirtualPathFrame(virtualInstance: VirtualInstance): PathFrame{
 return{
 displayName: virtualInstance.data.name||'',
-key: virtualInstance.data.key==null ? null : virtualInstance.data.key,
+key:
+virtualInstance.data.key==null||
+virtualInstance.data.key===REACT_OPTIMISTIC_KEY
+ ? null
+ : virtualInstance.data.key,
 index: -1,// We use -1 to indicate that this is a virtual path frame.
 };
 }

packages/react-devtools-shared/src/backend/shared/ReactSymbols.js

@@ -72,3 +72,9 @@ export const SERVER_CONTEXT_DEFAULT_VALUE_NOT_LOADED_SYMBOL_STRING =
 exportconstREACT_MEMO_CACHE_SENTINEL: symbol=Symbol.for(
 'react.memo_cache_sentinel',
 );
+
+importtype{ReactOptimisticKey}from'shared/ReactTypes';
+
+exportconstREACT_OPTIMISTIC_KEY: ReactOptimisticKey=(Symbol.for(
+'react.optimistic_key',
+): any);

packages/react-dom/src/__tests__/ReactDOMFizzStaticBrowser-test.js

@@ -1111,4 +1111,64 @@ describe('ReactDOMFizzStaticBrowser', () => {
 </div>,
 );
 });
+
+// @gate enableHalt && enableOptimisticKey
+it('can resume an optimistic keyed slot',async()=>{
+consterrors=[];
+
+letresolve;
+constpromise=newPromise(r=>(resolve=r));
+
+asyncfunctionComponent(){
+awaitpromise;
+return'Hi';
+}
+
+if(React.optimisticKey===undefined){
+thrownewError('optimisticKey missing');
+}
+
+functionApp(){
+return(
+<div>
+<Suspensefallback="Loading">
+<Componentkey={React.optimisticKey}/>
+</Suspense>
+</div>
+);
+}
+
+constcontroller=newAbortController();
+constpendingResult=serverAct(()=>
+ReactDOMFizzStatic.prerender(<App/>,{
+signal: controller.signal,
+onError(x){
+errors.push(x.message);
+},
+}),
+);
+
+awaitserverAct(()=>{
+controller.abort();
+});
+
+constprerendered=awaitpendingResult;
+
+constpostponedState=JSON.stringify(prerendered.postponed);
+
+awaitreadIntoContainer(prerendered.prelude);
+expect(getVisibleChildren(container)).toEqual(<div>Loading</div>);
+
+expect(prerendered.postponed).not.toBe(null);
+
+awaitresolve();
+
+constdynamic=awaitserverAct(()=>
+ReactDOMFizzServer.resume(<App/>,JSON.parse(postponedState)),
+);
+
+awaitreadIntoContainer(dynamic);
+
+expect(getVisibleChildren(container)).toEqual(<div>Hi</div>);
+});
 });

packages/react-client/src/__tests__/ReactFlight-test.js

@@ -3884,4 +3884,19 @@ describe('ReactFlight', () => {
 </main>,
 );
 });
+
+// @gate enableOptimisticKey
+it('collapses optimistic keys to an optimistic key',async()=>{
+functionBar({text}){
+return<div/>;
+}
+functionFoo(){
+return<Barkey={ReactServer.optimisticKey}/>;
+}
+consttransport=ReactNoopFlightServer.render({
+element: <Fookey="Outer Key"/>,
+});
+constmodel=awaitReactNoopFlightClient.read(transport);
+expect(model.element.key).toBe(React.optimisticKey);
+});
 });

packages/react-devtools-shared/src/backend/fiber/renderer.js

@@ -120,6 +120,7 @@ import {
 MEMO_SYMBOL_STRING,
 SERVER_CONTEXT_SYMBOL_STRING,
 LAZY_SYMBOL_STRING,
+REACT_OPTIMISTIC_KEY,
 }from'../shared/ReactSymbols';
 import{enableStyleXFeatures}from'react-devtools-feature-flags';
 
@@ -4849,7 +4850,10 @@ export function attach(
  }
  let previousSiblingOfBestMatch = null;
  let bestMatch = remainingReconcilingChildren;
- if (componentInfo.key != null) {
+ if (
+ componentInfo.key != null &&
+ componentInfo.key !== REACT_OPTIMISTIC_KEY
+ ) {
  // If there is a key try to find a matching key in the set.
  bestMatch = remainingReconcilingChildren;
  while (bestMatch !== null) {
@@ -6145,7 +6149,7 @@ export function attach(
  return {
  displayName: getDisplayNameForFiber(fiber) || 'Anonymous',
  id: instance.id,
- key: fiber.key,
+ key: fiber.key === REACT_OPTIMISTIC_KEY ? null : fiber.key,
  env: null,
  stack:
  fiber._debugOwner == null || fiber._debugStack == null
@@ -6158,7 +6162,11 @@ export function attach(
  return {
  displayName: componentInfo.name || 'Anonymous',
  id: instance.id,
- key: componentInfo.key == null ? null : componentInfo.key,
+ key:
+ componentInfo.key == null ||
+ componentInfo.key === REACT_OPTIMISTIC_KEY
+ ? null
+ : componentInfo.key,
  env: componentInfo.env == null ? null : componentInfo.env,
  stack:
  componentInfo.owner == null || componentInfo.debugStack == null
@@ -7082,7 +7090,7 @@ export function attach(
  // Does the component have legacy context attached to it.
  hasLegacyContext,
 
- key: key != null ? key : null,
+ key: key != null && key !== REACT_OPTIMISTIC_KEY ? key : null,
 
  type: elementType,
 
@@ -8641,15 +8649,19 @@ export function attach(
 }
 return{
  displayName,
- key,
+key: key===REACT_OPTIMISTIC_KEY ? null : key,
  index,
 };
 }
 
 functiongetVirtualPathFrame(virtualInstance: VirtualInstance): PathFrame{
 return{
 displayName: virtualInstance.data.name||'',
-key: virtualInstance.data.key==null ? null : virtualInstance.data.key,
+key:
+virtualInstance.data.key==null||
+virtualInstance.data.key===REACT_OPTIMISTIC_KEY
+ ? null
+ : virtualInstance.data.key,
 index: -1,// We use -1 to indicate that this is a virtual path frame.
 };
 }

packages/react-devtools-shared/src/backend/shared/ReactSymbols.js

@@ -72,3 +72,9 @@ export const SERVER_CONTEXT_DEFAULT_VALUE_NOT_LOADED_SYMBOL_STRING =
 exportconstREACT_MEMO_CACHE_SENTINEL: symbol=Symbol.for(
 'react.memo_cache_sentinel',
 );
+
+importtype{ReactOptimisticKey}from'shared/ReactTypes';
+
+exportconstREACT_OPTIMISTIC_KEY: ReactOptimisticKey=(Symbol.for(
+'react.optimistic_key',
+): any);

packages/react-dom/src/__tests__/ReactDOMFizzStaticBrowser-test.js

@@ -1111,4 +1111,64 @@ describe('ReactDOMFizzStaticBrowser', () => {
 </div>,
 );
 });
+
+// @gate enableHalt && enableOptimisticKey
+it('can resume an optimistic keyed slot',async()=>{
+consterrors=[];
+
+letresolve;
+constpromise=newPromise(r=>(resolve=r));
+
+asyncfunctionComponent(){
+awaitpromise;
+return'Hi';
+}
+
+if(React.optimisticKey===undefined){
+thrownewError('optimisticKey missing');
+}
+
+functionApp(){
+return(
+<div>
+<Suspensefallback="Loading">
+<Componentkey={React.optimisticKey}/>
+</Suspense>
+</div>
+);
+}
+
+constcontroller=newAbortController();
+constpendingResult=serverAct(()=>
+ReactDOMFizzStatic.prerender(<App/>,{
+signal: controller.signal,
+onError(x){
+errors.push(x.message);
+},
+}),
+);
+
+awaitserverAct(()=>{
+controller.abort();
+});
+
+constprerendered=awaitpendingResult;
+
+constpostponedState=JSON.stringify(prerendered.postponed);
+
+awaitreadIntoContainer(prerendered.prelude);
+expect(getVisibleChildren(container)).toEqual(<div>Loading</div>);
+
+expect(prerendered.postponed).not.toBe(null);
+
+awaitresolve();
+
+constdynamic=awaitserverAct(()=>
+ReactDOMFizzServer.resume(<App/>,JSON.parse(postponedState)),
+);
+
+awaitreadIntoContainer(dynamic);
+
+expect(getVisibleChildren(container)).toEqual(<div>Hi</div>);
+});
 });

packages/react-client/src/__tests__/ReactFlight-test.js

@@ -3884,4 +3884,19 @@ describe('ReactFlight', () => {
 </main>,
 );
 });
+
+// @gate enableOptimisticKey
+it('collapses optimistic keys to an optimistic key',async()=>{
+functionBar({text}){
+return<div/>;
+}
+functionFoo(){
+return<Barkey={ReactServer.optimisticKey}/>;
+}
+consttransport=ReactNoopFlightServer.render({
+element: <Fookey="Outer Key"/>,
+});
+constmodel=awaitReactNoopFlightClient.read(transport);
+expect(model.element.key).toBe(React.optimisticKey);
+});
 });

packages/react-devtools-shared/src/backend/fiber/renderer.js

@@ -120,6 +120,7 @@ import {
 MEMO_SYMBOL_STRING,
 SERVER_CONTEXT_SYMBOL_STRING,
 LAZY_SYMBOL_STRING,
+REACT_OPTIMISTIC_KEY,
 }from'../shared/ReactSymbols';
 import{enableStyleXFeatures}from'react-devtools-feature-flags';
 
@@ -4849,7 +4850,10 @@ export function attach(
  }
  let previousSiblingOfBestMatch = null;
  let bestMatch = remainingReconcilingChildren;
- if (componentInfo.key != null) {
+ if (
+ componentInfo.key != null &&
+ componentInfo.key !== REACT_OPTIMISTIC_KEY
+ ) {
  // If there is a key try to find a matching key in the set.
  bestMatch = remainingReconcilingChildren;
  while (bestMatch !== null) {
@@ -6145,7 +6149,7 @@ export function attach(
  return {
  displayName: getDisplayNameForFiber(fiber) || 'Anonymous',
  id: instance.id,
- key: fiber.key,
+ key: fiber.key === REACT_OPTIMISTIC_KEY ? null : fiber.key,
  env: null,
  stack:
  fiber._debugOwner == null || fiber._debugStack == null
@@ -6158,7 +6162,11 @@ export function attach(
  return {
  displayName: componentInfo.name || 'Anonymous',
  id: instance.id,
- key: componentInfo.key == null ? null : componentInfo.key,
+ key:
+ componentInfo.key == null ||
+ componentInfo.key === REACT_OPTIMISTIC_KEY
+ ? null
+ : componentInfo.key,
  env: componentInfo.env == null ? null : componentInfo.env,
  stack:
  componentInfo.owner == null || componentInfo.debugStack == null
@@ -7082,7 +7090,7 @@ export function attach(
  // Does the component have legacy context attached to it.
  hasLegacyContext,
 
- key: key != null ? key : null,
+ key: key != null && key !== REACT_OPTIMISTIC_KEY ? key : null,
 
  type: elementType,
 
@@ -8641,15 +8649,19 @@ export function attach(
 }
 return{
  displayName,
- key,
+key: key===REACT_OPTIMISTIC_KEY ? null : key,
  index,
 };
 }
 
 functiongetVirtualPathFrame(virtualInstance: VirtualInstance): PathFrame{
 return{
 displayName: virtualInstance.data.name||'',
-key: virtualInstance.data.key==null ? null : virtualInstance.data.key,
+key:
+virtualInstance.data.key==null||
+virtualInstance.data.key===REACT_OPTIMISTIC_KEY
+ ? null
+ : virtualInstance.data.key,
 index: -1,// We use -1 to indicate that this is a virtual path frame.
 };
 }

packages/react-devtools-shared/src/backend/shared/ReactSymbols.js

@@ -72,3 +72,9 @@ export const SERVER_CONTEXT_DEFAULT_VALUE_NOT_LOADED_SYMBOL_STRING =
 exportconstREACT_MEMO_CACHE_SENTINEL: symbol=Symbol.for(
 'react.memo_cache_sentinel',
 );
+
+importtype{ReactOptimisticKey}from'shared/ReactTypes';
+
+exportconstREACT_OPTIMISTIC_KEY: ReactOptimisticKey=(Symbol.for(
+'react.optimistic_key',
+): any);

packages/react-dom/src/__tests__/ReactDOMFizzStaticBrowser-test.js

@@ -1111,4 +1111,64 @@ describe('ReactDOMFizzStaticBrowser', () => {
 </div>,
 );
 });
+
+// @gate enableHalt && enableOptimisticKey
+it('can resume an optimistic keyed slot',async()=>{
+consterrors=[];
+
+letresolve;
+constpromise=newPromise(r=>(resolve=r));
+
+asyncfunctionComponent(){
+awaitpromise;
+return'Hi';
+}
+
+if(React.optimisticKey===undefined){
+thrownewError('optimisticKey missing');
+}
+
+functionApp(){
+return(
+<div>
+<Suspensefallback="Loading">
+<Componentkey={React.optimisticKey}/>
+</Suspense>
+</div>
+);
+}
+
+constcontroller=newAbortController();
+constpendingResult=serverAct(()=>
+ReactDOMFizzStatic.prerender(<App/>,{
+signal: controller.signal,
+onError(x){
+errors.push(x.message);
+},
+}),
+);
+
+awaitserverAct(()=>{
+controller.abort();
+});
+
+constprerendered=awaitpendingResult;
+
+constpostponedState=JSON.stringify(prerendered.postponed);
+
+awaitreadIntoContainer(prerendered.prelude);
+expect(getVisibleChildren(container)).toEqual(<div>Loading</div>);
+
+expect(prerendered.postponed).not.toBe(null);
+
+awaitresolve();
+
+constdynamic=awaitserverAct(()=>
+ReactDOMFizzServer.resume(<App/>,JSON.parse(postponedState)),
+);
+
+awaitreadIntoContainer(dynamic);
+
+expect(getVisibleChildren(container)).toEqual(<div>Hi</div>);
+});
 });

packages/react-client/src/__tests__/ReactFlight-test.js

@@ -3884,4 +3884,19 @@ describe('ReactFlight', () => {
 </main>,
 );
 });
+
+// @gate enableOptimisticKey
+it('collapses optimistic keys to an optimistic key',async()=>{
+functionBar({text}){
+return<div/>;
+}
+functionFoo(){
+return<Barkey={ReactServer.optimisticKey}/>;
+}
+consttransport=ReactNoopFlightServer.render({
+element: <Fookey="Outer Key"/>,
+});
+constmodel=awaitReactNoopFlightClient.read(transport);
+expect(model.element.key).toBe(React.optimisticKey);
+});
 });

packages/react-devtools-shared/src/backend/fiber/renderer.js

@@ -120,6 +120,7 @@ import {
 MEMO_SYMBOL_STRING,
 SERVER_CONTEXT_SYMBOL_STRING,
 LAZY_SYMBOL_STRING,
+REACT_OPTIMISTIC_KEY,
 }from'../shared/ReactSymbols';
 import{enableStyleXFeatures}from'react-devtools-feature-flags';
 
@@ -4849,7 +4850,10 @@ export function attach(
  }
  let previousSiblingOfBestMatch = null;
  let bestMatch = remainingReconcilingChildren;
- if (componentInfo.key != null) {
+ if (
+ componentInfo.key != null &&
+ componentInfo.key !== REACT_OPTIMISTIC_KEY
+ ) {
  // If there is a key try to find a matching key in the set.
  bestMatch = remainingReconcilingChildren;
  while (bestMatch !== null) {
@@ -6145,7 +6149,7 @@ export function attach(
  return {
  displayName: getDisplayNameForFiber(fiber) || 'Anonymous',
  id: instance.id,
- key: fiber.key,
+ key: fiber.key === REACT_OPTIMISTIC_KEY ? null : fiber.key,
  env: null,
  stack:
  fiber._debugOwner == null || fiber._debugStack == null
@@ -6158,7 +6162,11 @@ export function attach(
  return {
  displayName: componentInfo.name || 'Anonymous',
  id: instance.id,
- key: componentInfo.key == null ? null : componentInfo.key,
+ key:
+ componentInfo.key == null ||
+ componentInfo.key === REACT_OPTIMISTIC_KEY
+ ? null
+ : componentInfo.key,
  env: componentInfo.env == null ? null : componentInfo.env,
  stack:
  componentInfo.owner == null || componentInfo.debugStack == null
@@ -7082,7 +7090,7 @@ export function attach(
  // Does the component have legacy context attached to it.
  hasLegacyContext,
 
- key: key != null ? key : null,
+ key: key != null && key !== REACT_OPTIMISTIC_KEY ? key : null,
 
  type: elementType,
 
@@ -8641,15 +8649,19 @@ export function attach(
 }
 return{
  displayName,
- key,
+key: key===REACT_OPTIMISTIC_KEY ? null : key,
  index,
 };
 }
 
 functiongetVirtualPathFrame(virtualInstance: VirtualInstance): PathFrame{
 return{
 displayName: virtualInstance.data.name||'',
-key: virtualInstance.data.key==null ? null : virtualInstance.data.key,
+key:
+virtualInstance.data.key==null||
+virtualInstance.data.key===REACT_OPTIMISTIC_KEY
+ ? null
+ : virtualInstance.data.key,
 index: -1,// We use -1 to indicate that this is a virtual path frame.
 };
 }

packages/react-devtools-shared/src/backend/shared/ReactSymbols.js

@@ -72,3 +72,9 @@ export const SERVER_CONTEXT_DEFAULT_VALUE_NOT_LOADED_SYMBOL_STRING =
 exportconstREACT_MEMO_CACHE_SENTINEL: symbol=Symbol.for(
 'react.memo_cache_sentinel',
 );
+
+importtype{ReactOptimisticKey}from'shared/ReactTypes';
+
+exportconstREACT_OPTIMISTIC_KEY: ReactOptimisticKey=(Symbol.for(
+'react.optimistic_key',
+): any);

packages/react-dom/src/__tests__/ReactDOMFizzStaticBrowser-test.js

@@ -1111,4 +1111,64 @@ describe('ReactDOMFizzStaticBrowser', () => {
 </div>,
 );
 });
+
+// @gate enableHalt && enableOptimisticKey
+it('can resume an optimistic keyed slot',async()=>{
+consterrors=[];
+
+letresolve;
+constpromise=newPromise(r=>(resolve=r));
+
+asyncfunctionComponent(){
+awaitpromise;
+return'Hi';
+}
+
+if(React.optimisticKey===undefined){
+thrownewError('optimisticKey missing');
+}
+
+functionApp(){
+return(
+<div>
+<Suspensefallback="Loading">
+<Componentkey={React.optimisticKey}/>
+</Suspense>
+</div>
+);
+}
+
+constcontroller=newAbortController();
+constpendingResult=serverAct(()=>
+ReactDOMFizzStatic.prerender(<App/>,{
+signal: controller.signal,
+onError(x){
+errors.push(x.message);
+},
+}),
+);
+
+awaitserverAct(()=>{
+controller.abort();
+});
+
+constprerendered=awaitpendingResult;
+
+constpostponedState=JSON.stringify(prerendered.postponed);
+
+awaitreadIntoContainer(prerendered.prelude);
+expect(getVisibleChildren(container)).toEqual(<div>Loading</div>);
+
+expect(prerendered.postponed).not.toBe(null);
+
+awaitresolve();
+
+constdynamic=awaitserverAct(()=>
+ReactDOMFizzServer.resume(<App/>,JSON.parse(postponedState)),
+);
+
+awaitreadIntoContainer(dynamic);
+
+expect(getVisibleChildren(container)).toEqual(<div>Hi</div>);
+});
 });

packages/react-client/src/__tests__/ReactFlight-test.js

@@ -3884,4 +3884,19 @@ describe('ReactFlight', () => {
 </main>,
 );
 });
+
+// @gate enableOptimisticKey
+it('collapses optimistic keys to an optimistic key',async()=>{
+functionBar({text}){
+return<div/>;
+}
+functionFoo(){
+return<Barkey={ReactServer.optimisticKey}/>;
+}
+consttransport=ReactNoopFlightServer.render({
+element: <Fookey="Outer Key"/>,
+});
+constmodel=awaitReactNoopFlightClient.read(transport);
+expect(model.element.key).toBe(React.optimisticKey);
+});
 });

packages/react-devtools-shared/src/backend/fiber/renderer.js

@@ -120,6 +120,7 @@ import {
 MEMO_SYMBOL_STRING,
 SERVER_CONTEXT_SYMBOL_STRING,
 LAZY_SYMBOL_STRING,
+REACT_OPTIMISTIC_KEY,
 }from'../shared/ReactSymbols';
 import{enableStyleXFeatures}from'react-devtools-feature-flags';
 
@@ -4849,7 +4850,10 @@ export function attach(
  }
  let previousSiblingOfBestMatch = null;
  let bestMatch = remainingReconcilingChildren;
- if (componentInfo.key != null) {
+ if (
+ componentInfo.key != null &&
+ componentInfo.key !== REACT_OPTIMISTIC_KEY
+ ) {
  // If there is a key try to find a matching key in the set.
  bestMatch = remainingReconcilingChildren;
  while (bestMatch !== null) {
@@ -6145,7 +6149,7 @@ export function attach(
  return {
  displayName: getDisplayNameForFiber(fiber) || 'Anonymous',
  id: instance.id,
- key: fiber.key,
+ key: fiber.key === REACT_OPTIMISTIC_KEY ? null : fiber.key,
  env: null,
  stack:
  fiber._debugOwner == null || fiber._debugStack == null
@@ -6158,7 +6162,11 @@ export function attach(
  return {
  displayName: componentInfo.name || 'Anonymous',
  id: instance.id,
- key: componentInfo.key == null ? null : componentInfo.key,
+ key:
+ componentInfo.key == null ||
+ componentInfo.key === REACT_OPTIMISTIC_KEY
+ ? null
+ : componentInfo.key,
  env: componentInfo.env == null ? null : componentInfo.env,
  stack:
  componentInfo.owner == null || componentInfo.debugStack == null
@@ -7082,7 +7090,7 @@ export function attach(
  // Does the component have legacy context attached to it.
  hasLegacyContext,
 
- key: key != null ? key : null,
+ key: key != null && key !== REACT_OPTIMISTIC_KEY ? key : null,
 
  type: elementType,
 
@@ -8641,15 +8649,19 @@ export function attach(
 }
 return{
  displayName,
- key,
+key: key===REACT_OPTIMISTIC_KEY ? null : key,
  index,
 };
 }
 
 functiongetVirtualPathFrame(virtualInstance: VirtualInstance): PathFrame{
 return{
 displayName: virtualInstance.data.name||'',
-key: virtualInstance.data.key==null ? null : virtualInstance.data.key,
+key:
+virtualInstance.data.key==null||
+virtualInstance.data.key===REACT_OPTIMISTIC_KEY
+ ? null
+ : virtualInstance.data.key,
 index: -1,// We use -1 to indicate that this is a virtual path frame.
 };
 }

packages/react-devtools-shared/src/backend/shared/ReactSymbols.js

@@ -72,3 +72,9 @@ export const SERVER_CONTEXT_DEFAULT_VALUE_NOT_LOADED_SYMBOL_STRING =
 exportconstREACT_MEMO_CACHE_SENTINEL: symbol=Symbol.for(
 'react.memo_cache_sentinel',
 );
+
+importtype{ReactOptimisticKey}from'shared/ReactTypes';
+
+exportconstREACT_OPTIMISTIC_KEY: ReactOptimisticKey=(Symbol.for(
+'react.optimistic_key',
+): any);

packages/react-dom/src/__tests__/ReactDOMFizzStaticBrowser-test.js

@@ -1111,4 +1111,64 @@ describe('ReactDOMFizzStaticBrowser', () => {
 </div>,
 );
 });
+
+// @gate enableHalt && enableOptimisticKey
+it('can resume an optimistic keyed slot',async()=>{
+consterrors=[];
+
+letresolve;
+constpromise=newPromise(r=>(resolve=r));
+
+asyncfunctionComponent(){
+awaitpromise;
+return'Hi';
+}
+
+if(React.optimisticKey===undefined){
+thrownewError('optimisticKey missing');
+}
+
+functionApp(){
+return(
+<div>
+<Suspensefallback="Loading">
+<Componentkey={React.optimisticKey}/>
+</Suspense>
+</div>
+);
+}
+
+constcontroller=newAbortController();
+constpendingResult=serverAct(()=>
+ReactDOMFizzStatic.prerender(<App/>,{
+signal: controller.signal,
+onError(x){
+errors.push(x.message);
+},
+}),
+);
+
+awaitserverAct(()=>{
+controller.abort();
+});
+
+constprerendered=awaitpendingResult;
+
+constpostponedState=JSON.stringify(prerendered.postponed);
+
+awaitreadIntoContainer(prerendered.prelude);
+expect(getVisibleChildren(container)).toEqual(<div>Loading</div>);
+
+expect(prerendered.postponed).not.toBe(null);
+
+awaitresolve();
+
+constdynamic=awaitserverAct(()=>
+ReactDOMFizzServer.resume(<App/>,JSON.parse(postponedState)),
+);
+
+awaitreadIntoContainer(dynamic);
+
+expect(getVisibleChildren(container)).toEqual(<div>Hi</div>);
+});
 });

packages/react-client/src/__tests__/ReactFlight-test.js

@@ -3884,4 +3884,19 @@ describe('ReactFlight', () => {
 </main>,
 );
 });
+
+// @gate enableOptimisticKey
+it('collapses optimistic keys to an optimistic key',async()=>{
+functionBar({text}){
+return<div/>;
+}
+functionFoo(){
+return<Barkey={ReactServer.optimisticKey}/>;
+}
+consttransport=ReactNoopFlightServer.render({
+element: <Fookey="Outer Key"/>,
+});
+constmodel=awaitReactNoopFlightClient.read(transport);
+expect(model.element.key).toBe(React.optimisticKey);
+});
 });

packages/react-devtools-shared/src/backend/fiber/renderer.js

@@ -120,6 +120,7 @@ import {
 MEMO_SYMBOL_STRING,
 SERVER_CONTEXT_SYMBOL_STRING,
 LAZY_SYMBOL_STRING,
+REACT_OPTIMISTIC_KEY,
 }from'../shared/ReactSymbols';
 import{enableStyleXFeatures}from'react-devtools-feature-flags';
 
@@ -4849,7 +4850,10 @@ export function attach(
  }
  let previousSiblingOfBestMatch = null;
  let bestMatch = remainingReconcilingChildren;
- if (componentInfo.key != null) {
+ if (
+ componentInfo.key != null &&
+ componentInfo.key !== REACT_OPTIMISTIC_KEY
+ ) {
  // If there is a key try to find a matching key in the set.
  bestMatch = remainingReconcilingChildren;
  while (bestMatch !== null) {
@@ -6145,7 +6149,7 @@ export function attach(
  return {
  displayName: getDisplayNameForFiber(fiber) || 'Anonymous',
  id: instance.id,
- key: fiber.key,
+ key: fiber.key === REACT_OPTIMISTIC_KEY ? null : fiber.key,
  env: null,
  stack:
  fiber._debugOwner == null || fiber._debugStack == null
@@ -6158,7 +6162,11 @@ export function attach(
  return {
  displayName: componentInfo.name || 'Anonymous',
  id: instance.id,
- key: componentInfo.key == null ? null : componentInfo.key,
+ key:
+ componentInfo.key == null ||
+ componentInfo.key === REACT_OPTIMISTIC_KEY
+ ? null
+ : componentInfo.key,
  env: componentInfo.env == null ? null : componentInfo.env,
  stack:
  componentInfo.owner == null || componentInfo.debugStack == null
@@ -7082,7 +7090,7 @@ export function attach(
  // Does the component have legacy context attached to it.
  hasLegacyContext,
 
- key: key != null ? key : null,
+ key: key != null && key !== REACT_OPTIMISTIC_KEY ? key : null,
 
  type: elementType,
 
@@ -8641,15 +8649,19 @@ export function attach(
 }
 return{
  displayName,
- key,
+key: key===REACT_OPTIMISTIC_KEY ? null : key,
  index,
 };
 }
 
 functiongetVirtualPathFrame(virtualInstance: VirtualInstance): PathFrame{
 return{
 displayName: virtualInstance.data.name||'',
-key: virtualInstance.data.key==null ? null : virtualInstance.data.key,
+key:
+virtualInstance.data.key==null||
+virtualInstance.data.key===REACT_OPTIMISTIC_KEY
+ ? null
+ : virtualInstance.data.key,
 index: -1,// We use -1 to indicate that this is a virtual path frame.
 };
 }

packages/react-devtools-shared/src/backend/shared/ReactSymbols.js

@@ -72,3 +72,9 @@ export const SERVER_CONTEXT_DEFAULT_VALUE_NOT_LOADED_SYMBOL_STRING =
 exportconstREACT_MEMO_CACHE_SENTINEL: symbol=Symbol.for(
 'react.memo_cache_sentinel',
 );
+
+importtype{ReactOptimisticKey}from'shared/ReactTypes';
+
+exportconstREACT_OPTIMISTIC_KEY: ReactOptimisticKey=(Symbol.for(
+'react.optimistic_key',
+): any);

packages/react-dom/src/__tests__/ReactDOMFizzStaticBrowser-test.js

@@ -1111,4 +1111,64 @@ describe('ReactDOMFizzStaticBrowser', () => {
 </div>,
 );
 });
+
+// @gate enableHalt && enableOptimisticKey
+it('can resume an optimistic keyed slot',async()=>{
+consterrors=[];
+
+letresolve;
+constpromise=newPromise(r=>(resolve=r));
+
+asyncfunctionComponent(){
+awaitpromise;
+return'Hi';
+}
+
+if(React.optimisticKey===undefined){
+thrownewError('optimisticKey missing');
+}
+
+functionApp(){
+return(
+<div>
+<Suspensefallback="Loading">
+<Componentkey={React.optimisticKey}/>
+</Suspense>
+</div>
+);
+}
+
+constcontroller=newAbortController();
+constpendingResult=serverAct(()=>
+ReactDOMFizzStatic.prerender(<App/>,{
+signal: controller.signal,
+onError(x){
+errors.push(x.message);
+},
+}),
+);
+
+awaitserverAct(()=>{
+controller.abort();
+});
+
+constprerendered=awaitpendingResult;
+
+constpostponedState=JSON.stringify(prerendered.postponed);
+
+awaitreadIntoContainer(prerendered.prelude);
+expect(getVisibleChildren(container)).toEqual(<div>Loading</div>);
+
+expect(prerendered.postponed).not.toBe(null);
+
+awaitresolve();
+
+constdynamic=awaitserverAct(()=>
+ReactDOMFizzServer.resume(<App/>,JSON.parse(postponedState)),
+);
+
+awaitreadIntoContainer(dynamic);
+
+expect(getVisibleChildren(container)).toEqual(<div>Hi</div>);
+});
 });