Rename "loading" to "busy" in SuspenseConfig API (#15699)
loadingDelayMs -> busyDelayMs minLoadingDurationMs -> busyMinDurationMs
Sebastian Markbåge committed
May 21, 2019 at 14:29 UTC
d7afe23f141baeb96f1a9ee0c7d014d7e5a388e8
3 files changed
+9
-9
packages/react-reconciler/src/ReactFiberScheduler.js
+5
-5
@@ -2003,11 +2003,11 @@ function computeMsUntilSuspenseLoadingDelay(
2003
return 0;
2004
}
2005
2006
- const minLoadingDurationMs = (suspenseConfig.minLoadingDurationMs: any) | 0;
2007
- if (minLoadingDurationMs <= 0) {
2006
+ const busyMinDurationMs = (suspenseConfig.busyMinDurationMs: any) | 0;
2007
+ if (busyMinDurationMs <= 0) {
2008
return 0;
2009
}
2010
- const loadingDelayMs = (suspenseConfig.loadingDelayMs: any) | 0;
2010
+ const busyDelayMs = (suspenseConfig.busyDelayMs: any) | 0;
2011
2012
// Compute the time until this render pass would expire.
2013
const currentTimeMs: number = now();
@@ -2016,12 +2016,12 @@ function computeMsUntilSuspenseLoadingDelay(
2016
suspenseConfig,
2017
);
2018
const timeElapsed = currentTimeMs - eventTimeMs;
2019
- if (timeElapsed <= loadingDelayMs) {
2019
+ if (timeElapsed <= busyDelayMs) {
2020
// If we haven't yet waited longer than the initial delay, we don't
2021
// have to wait any additional time.
2022
return 0;
2023
}
2024
- const msUntilTimeout = loadingDelayMs + minLoadingDurationMs - timeElapsed;
2024
+ const msUntilTimeout = busyDelayMs + busyMinDurationMs - timeElapsed;
2025
// This is the value that is passed to `setTimeout`.
2026
return msUntilTimeout;
2027
}
packages/react-reconciler/src/ReactFiberSuspenseConfig.js
+2
-2
@@ -13,8 +13,8 @@ const {ReactCurrentBatchConfig} = ReactSharedInternals;
13
14
export type SuspenseConfig = {|
15
timeoutMs: number,
16
- loadingDelayMs?: number,
17
- minLoadingDurationMs?: number,
16
+ busyDelayMs?: number,
17
+ busyMinDurationMs?: number,
18
|};
19
20
export function requestCurrentSuspenseConfig(): null | SuspenseConfig {
packages/react-reconciler/src/__tests__/ReactSuspenseWithNoopRenderer-test.internal.js
+2
-2
@@ -2093,8 +2093,8 @@ describe('ReactSuspenseWithNoopRenderer', () => {
2093
2094
const SUSPENSE_CONFIG = {
2095
timeoutMs: 10000,
2096
- loadingDelayMs: 500,
2097
- minLoadingDurationMs: 400,
2096
+ busyDelayMs: 500,
2097
+ busyMinDurationMs: 400,
2098
};
2099
2100
let transitionToPage;