From 3f9e68dc717eadc52383d2e5e28c8b276b184401 Mon Sep 17 00:00:00 2001 From: Sebastian Markbage Date: Tue, 21 May 2019 14:11:55 -0700 Subject: [PATCH] Rename "loading" to "busy" in SuspenseConfig API loadingDelayMs -> busyDelayMs minLoadingDurationMs -> busyMinDurationMs --- packages/react-reconciler/src/ReactFiberScheduler.js | 10 +++++----- .../react-reconciler/src/ReactFiberSuspenseConfig.js | 4 ++-- .../ReactSuspenseWithNoopRenderer-test.internal.js | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js index 83cfabd6bdaf..ffb7bdaca2ad 100644 --- a/packages/react-reconciler/src/ReactFiberScheduler.js +++ b/packages/react-reconciler/src/ReactFiberScheduler.js @@ -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; } diff --git a/packages/react-reconciler/src/ReactFiberSuspenseConfig.js b/packages/react-reconciler/src/ReactFiberSuspenseConfig.js index fe9be71bf8f1..4dabb29c93a1 100644 --- a/packages/react-reconciler/src/ReactFiberSuspenseConfig.js +++ b/packages/react-reconciler/src/ReactFiberSuspenseConfig.js @@ -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 { diff --git a/packages/react-reconciler/src/__tests__/ReactSuspenseWithNoopRenderer-test.internal.js b/packages/react-reconciler/src/__tests__/ReactSuspenseWithNoopRenderer-test.internal.js index fe7be360141b..935ec1449aff 100644 --- a/packages/react-reconciler/src/__tests__/ReactSuspenseWithNoopRenderer-test.internal.js +++ b/packages/react-reconciler/src/__tests__/ReactSuspenseWithNoopRenderer-test.internal.js @@ -2093,8 +2093,8 @@ describe('ReactSuspenseWithNoopRenderer', () => { const SUSPENSE_CONFIG = { timeoutMs: 10000, - loadingDelayMs: 500, - minLoadingDurationMs: 400, + busyDelayMs: 500, + busyMinDurationMs: 400, }; let transitionToPage;