Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Flight] don't overwrite existing chunk listeners in 'wakeChunkIfInitialized' #29204

Merged
merged 1 commit into from
May 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions packages/react-client/src/ReactFlightClient.js
Original file line number Diff line number Diff line change
Expand Up @@ -320,8 +320,24 @@ function wakeChunkIfInitialized<T>(
case PENDING:
case BLOCKED:
case CYCLIC:
chunk.value = resolveListeners;
chunk.reason = rejectListeners;
if (chunk.value) {
for (let i = 0; i < resolveListeners.length; i++) {
chunk.value.push(resolveListeners[i]);
}
} else {
chunk.value = resolveListeners;
}

if (chunk.reason) {
if (rejectListeners) {
for (let i = 0; i < rejectListeners.length; i++) {
chunk.reason.push(rejectListeners[i]);
}
}
} else {
chunk.reason = rejectListeners;
}

break;
case ERRORED:
if (rejectListeners) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,58 @@ describe('ReactFlightDOMBrowser', () => {
expect(container.innerHTML).toBe('<pre>[[1,2,3],[1,2,3]]</pre>');
});

it('should resolve deduped objects within the same model root when it is blocked and there is a listener attached to the root', async () => {
let resolveClientComponentChunk;

const ClientOuter = clientExports(function ClientOuter({Component, value}) {
return <Component value={value} />;
});

const ClientInner = clientExports(
function ClientInner({value}) {
return <pre>{JSON.stringify(value)}</pre>;
},
'42',
'/test.js',
new Promise(resolve => (resolveClientComponentChunk = resolve)),
);

function Server({value}) {
return <ClientOuter Component={ClientInner} value={value} />;
}

const shared = [1, 2, 3];
const value = [shared, shared];

const stream = ReactServerDOMServer.renderToReadableStream(
<Server value={value} />,
webpackMap,
);

function ClientRoot({response}) {
return use(response);
}

const response = ReactServerDOMClient.createFromReadableStream(stream);
// make sure we have a listener so that `resolveModelChunk` initializes the chunk eagerly
response.then(() => {});

const container = document.createElement('div');
const root = ReactDOMClient.createRoot(container);

await act(() => {
root.render(<ClientRoot response={response} />);
});

expect(container.innerHTML).toBe('');

await act(() => {
resolveClientComponentChunk();
});

expect(container.innerHTML).toBe('<pre>[[1,2,3],[1,2,3]]</pre>');
});

it('should progressively reveal server components', async () => {
let reportedErrors = [];

Expand Down