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

loadingDelayMs -> busyDelayMs
minLoadingDurationMs -> busyMinDurationMs
This commit is contained in:
Sebastian Markbåge
2019-05-21 14:29:41 -07:00
committed by GitHub
parent ef4ac42f88
commit d7afe23f14
3 changed files with 9 additions and 9 deletions
+5 -5
View File
@@ -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();
@@ -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;
}
+2 -2
View File
@@ -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 {
@@ -2093,8 +2093,8 @@ describe('ReactSuspenseWithNoopRenderer', () => {
const SUSPENSE_CONFIG = {
timeoutMs: 10000,
loadingDelayMs: 500,
minLoadingDurationMs: 400,
busyDelayMs: 500,
busyMinDurationMs: 400,
};
let transitionToPage;