Skip to content

Rename "loading" to "busy" in SuspenseConfig API #15699

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.

Sign up for GitHub

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

Merged
sebmarkbage merged 1 commit into from
May 21, 2019
Merged

Rename "loading" to "busy" in SuspenseConfig API #15699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions packages/react-reconciler/src/ReactFiberScheduler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2003,11 +2003,11 @@ function computeMsUntilSuspenseLoadingDelay(
return 0;
}

const minLoadingDurationMs = (suspenseConfig.minLoadingDurationMs: any) | 0;
if (minLoadingDurationMs <= 0) {
const busyMinDurationMs = (suspenseConfig.busyMinDurationMs: any) | 0;
if (busyMinDurationMs <= 0) {
return 0;
}
const loadingDelayMs = (suspenseConfig.loadingDelayMs: any) | 0;
const busyDelayMs = (suspenseConfig.busyDelayMs: any) | 0;

// Compute the time until this render pass would expire.
const currentTimeMs: number = now();
Expand All @@ -2016,12 +2016,12 @@ function computeMsUntilSuspenseLoadingDelay(
suspenseConfig,
);
const timeElapsed = currentTimeMs - eventTimeMs;
if (timeElapsed <= loadingDelayMs) {
if (timeElapsed <= busyDelayMs) {
// If we haven't yet waited longer than the initial delay, we don't
// have to wait any additional time.
return 0;
}
const msUntilTimeout = loadingDelayMs + minLoadingDurationMs - timeElapsed;
const msUntilTimeout = busyDelayMs + busyMinDurationMs - timeElapsed;
// This is the value that is passed to `setTimeout`.
return msUntilTimeout;
}
Expand Down
4 changes: 2 additions & 2 deletions packages/react-reconciler/src/ReactFiberSuspenseConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ const {ReactCurrentBatchConfig} = ReactSharedInternals;

export type SuspenseConfig = {|
timeoutMs: number,
loadingDelayMs?: number,
minLoadingDurationMs?: number,
busyDelayMs?: number,
busyMinDurationMs?: number,
|};

export function requestCurrentSuspenseConfig(): null | SuspenseConfig {
Expand Down
4 changes: 2 additions & 2 deletions packages/react-reconciler/src/__tests__/ReactSuspenseWithNoopRenderer-test.internal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2093,8 +2093,8 @@ describe('ReactSuspenseWithNoopRenderer', () => {

const SUSPENSE_CONFIG = {
timeoutMs: 10000,
loadingDelayMs: 500,
minLoadingDurationMs: 400,
busyDelayMs: 500,
busyMinDurationMs: 400,
};

let transitionToPage;
Expand Down