From c00f8ba3457868c7becc437aca104c996a3c0083 Mon Sep 17 00:00:00 2001 From: Sebastian Markbage Date: Tue, 23 Mar 2021 13:21:54 -0400 Subject: [PATCH] Rename onComplete -> onCompleteAll --- .../__tests__/ReactDOMFizzServerBrowser-test.js | 2 +- .../src/__tests__/ReactDOMFizzServerNode-test.js | 2 +- .../src/server/ReactDOMFizzServerBrowser.js | 4 ++-- .../react-dom/src/server/ReactDOMFizzServerNode.js | 4 ++-- .../react-noop-renderer/src/ReactNoopServer.js | 4 ++-- packages/react-server/src/ReactFizzServer.js | 14 +++++++------- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/react-dom/src/__tests__/ReactDOMFizzServerBrowser-test.js b/packages/react-dom/src/__tests__/ReactDOMFizzServerBrowser-test.js index 83a31a6f6a0e6..b55bb446f6fce 100644 --- a/packages/react-dom/src/__tests__/ReactDOMFizzServerBrowser-test.js +++ b/packages/react-dom/src/__tests__/ReactDOMFizzServerBrowser-test.js @@ -77,7 +77,7 @@ describe('ReactDOMFizzServer', () => { , { - onComplete() { + onCompleteAll() { isComplete = true; }, }, diff --git a/packages/react-dom/src/__tests__/ReactDOMFizzServerNode-test.js b/packages/react-dom/src/__tests__/ReactDOMFizzServerNode-test.js index 468d16767612f..5377607a5795b 100644 --- a/packages/react-dom/src/__tests__/ReactDOMFizzServerNode-test.js +++ b/packages/react-dom/src/__tests__/ReactDOMFizzServerNode-test.js @@ -107,7 +107,7 @@ describe('ReactDOMFizzServer', () => { , writable, { - onComplete() { + onCompleteAll() { isComplete = true; }, }, diff --git a/packages/react-dom/src/server/ReactDOMFizzServerBrowser.js b/packages/react-dom/src/server/ReactDOMFizzServerBrowser.js index 6ea65b5544ead..95a58f0688dd8 100644 --- a/packages/react-dom/src/server/ReactDOMFizzServerBrowser.js +++ b/packages/react-dom/src/server/ReactDOMFizzServerBrowser.js @@ -23,7 +23,7 @@ type Options = { progressiveChunkSize?: number, signal?: AbortSignal, onReadyToStream?: () => void, - onComplete?: () => void, + onCompleteAll?: () => void, onError?: (error: mixed) => void, }; @@ -48,7 +48,7 @@ function renderToReadableStream( createResponseState(options ? options.identifierPrefix : undefined), options ? options.progressiveChunkSize : undefined, options ? options.onError : undefined, - options ? options.onComplete : undefined, + options ? options.onCompleteAll : undefined, options ? options.onReadyToStream : undefined, ); startWork(request); diff --git a/packages/react-dom/src/server/ReactDOMFizzServerNode.js b/packages/react-dom/src/server/ReactDOMFizzServerNode.js index 25bdf21160c1d..51a091948d4b1 100644 --- a/packages/react-dom/src/server/ReactDOMFizzServerNode.js +++ b/packages/react-dom/src/server/ReactDOMFizzServerNode.js @@ -27,7 +27,7 @@ type Options = { identifierPrefix?: string, progressiveChunkSize?: number, onReadyToStream?: () => void, - onComplete?: () => void, + onCompleteAll?: () => void, onError?: (error: mixed) => void, }; @@ -48,7 +48,7 @@ function pipeToNodeWritable( createResponseState(options ? options.identifierPrefix : undefined), options ? options.progressiveChunkSize : undefined, options ? options.onError : undefined, - options ? options.onComplete : undefined, + options ? options.onCompleteAll : undefined, options ? options.onReadyToStream : undefined, ); let hasStartedFlowing = false; diff --git a/packages/react-noop-renderer/src/ReactNoopServer.js b/packages/react-noop-renderer/src/ReactNoopServer.js index 9a6b560e7f57d..feec884743efc 100644 --- a/packages/react-noop-renderer/src/ReactNoopServer.js +++ b/packages/react-noop-renderer/src/ReactNoopServer.js @@ -218,7 +218,7 @@ const ReactNoopServer = ReactFizzServer({ type Options = { progressiveChunkSize?: number, onReadyToStream?: () => void, - onComplete?: () => void, + onCompleteAll?: () => void, onError?: (error: mixed) => void, }; @@ -238,7 +238,7 @@ function render(children: React$Element, options?: Options): Destination { null, options ? options.progressiveChunkSize : undefined, options ? options.onError : undefined, - options ? options.onComplete : undefined, + options ? options.onCompleteAll : undefined, options ? options.onReadyToStream : undefined, ); ReactNoopServer.startWork(request); diff --git a/packages/react-server/src/ReactFizzServer.js b/packages/react-server/src/ReactFizzServer.js index a990253634dc3..b936376e85eae 100644 --- a/packages/react-server/src/ReactFizzServer.js +++ b/packages/react-server/src/ReactFizzServer.js @@ -112,9 +112,9 @@ type Request = { partialBoundaries: Array, // Partially completed boundaries that can flush its segments early. // onError is called when an error happens anywhere in the tree. It might recover. onError: (error: mixed) => void, - // onComplete is called when all pending work is done but it may not have flushed yet. + // onCompleteAll is called when all pending work is done but it may not have flushed yet. // This is a good time to start writing if you want only HTML and no intermediate steps. - onComplete: () => void, + onCompleteAll: () => void, // onReadyToStream is called when there is at least a root fallback ready to show. // Typically you don't need this callback because it's best practice to always have a // root fallback ready so there's no need to wait. @@ -144,7 +144,7 @@ export function createRequest( responseState: ResponseState, progressiveChunkSize: number = DEFAULT_PROGRESSIVE_CHUNK_SIZE, onError: (error: mixed) => void = noop, - onComplete: () => void = noop, + onCompleteAll: () => void = noop, onReadyToStream: () => void = noop, ): Request { const pingedWork = []; @@ -164,7 +164,7 @@ export function createRequest( completedBoundaries: [], partialBoundaries: [], onError, - onComplete, + onCompleteAll, onReadyToStream, }; // This segment represents the root fallback. @@ -429,7 +429,7 @@ function erroredWork( request.allPendingWork--; if (request.allPendingWork === 0) { - request.onComplete(); + request.onCompleteAll(); } } @@ -476,7 +476,7 @@ function abortWork(suspendedWork: SuspendedWork): void { } if (request.allPendingWork === 0) { - request.onComplete(); + request.onCompleteAll(); } } } @@ -537,7 +537,7 @@ function finishedWork( if (request.allPendingWork === 0) { // This needs to be called at the very end so that we can synchronously write the result // in the callback if needed. - request.onComplete(); + request.onCompleteAll(); } }