From 26d70fd3347b7c730644d32b70c4fa752a29a610 Mon Sep 17 00:00:00 2001 From: Andrew Clark Date: Mon, 17 Apr 2017 15:38:57 -0700 Subject: [PATCH] Add enableAsyncSubtreeAPI to host config Allows us to control this feature on a per-renderer basis --- src/renderers/dom/fiber/ReactDOMFiber.js | 1 + src/renderers/shared/fiber/ReactFiberReconciler.js | 1 + src/renderers/shared/fiber/ReactFiberScheduler.js | 6 +++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/renderers/dom/fiber/ReactDOMFiber.js b/src/renderers/dom/fiber/ReactDOMFiber.js index 3493ed9420..7f8c39e1c5 100644 --- a/src/renderers/dom/fiber/ReactDOMFiber.js +++ b/src/renderers/dom/fiber/ReactDOMFiber.js @@ -364,6 +364,7 @@ var DOMRenderer = ReactFiberReconciler({ scheduleDeferredCallback: ReactDOMFrameScheduling.rIC, useSyncScheduling: !ReactDOMFeatureFlags.fiberAsyncScheduling, + enableAsyncSubtreeAPI: ReactDOMFeatureFlags.enableAsyncSubtreeAPI, }); ReactGenericBatching.injection.injectFiberBatchedUpdates( diff --git a/src/renderers/shared/fiber/ReactFiberReconciler.js b/src/renderers/shared/fiber/ReactFiberReconciler.js index a3c9f315d3..c8f56c4d03 100644 --- a/src/renderers/shared/fiber/ReactFiberReconciler.js +++ b/src/renderers/shared/fiber/ReactFiberReconciler.js @@ -115,6 +115,7 @@ export type HostConfig = { resetAfterCommit(): void, useSyncScheduling?: boolean, + enableAsyncSubtreeAPI?: boolean, }; export type Reconciler = { diff --git a/src/renderers/shared/fiber/ReactFiberScheduler.js b/src/renderers/shared/fiber/ReactFiberScheduler.js index 9ff146f707..0a94a93650 100644 --- a/src/renderers/shared/fiber/ReactFiberScheduler.js +++ b/src/renderers/shared/fiber/ReactFiberScheduler.js @@ -169,6 +169,7 @@ module.exports = function( useSyncScheduling, prepareForCommit, resetAfterCommit, + enableAsyncSubtreeAPI, } = config; // The priority level to use when scheduling an update. We use NoWork to @@ -1347,7 +1348,10 @@ module.exports = function( function getPriorityContext(fiber: Fiber): PriorityLevel { let priorityLevel = priorityContext; if (priorityLevel === NoWork) { - if (!useSyncScheduling || fiber.contextTag & AsyncUpdates) { + if ( + !useSyncScheduling || + (enableAsyncSubtreeAPI === true && fiber.contextTag & AsyncUpdates) + ) { priorityLevel = LowPriority; } else { priorityLevel = SynchronousPriority;