{"commit":{"authoredAt":"2017-05-01T13:23:54-07:00","authorEmail":"acdlite@me.com","revision":"b1384062d2e7014a6c4a7d27c229846c07f9055c","subject":"Move AsyncUpdates flag check to class-only path (#9570)","shortRevision":"b1384062d2","authorName":"Andrew Clark"},"patch":"diff --git a\/src\/renderers\/dom\/fiber\/__tests__\/ReactDOMFiberAsync-test.js b\/src\/renderers\/dom\/fiber\/__tests__\/ReactDOMFiberAsync-test.js\nindex fcb7c4f618..a667aea7f2 100644\n--- a\/src\/renderers\/dom\/fiber\/__tests__\/ReactDOMFiberAsync-test.js\n+++ b\/src\/renderers\/dom\/fiber\/__tests__\/ReactDOMFiberAsync-test.js\n@@ -25,10 +25,12 @@ describe('ReactDOMFiberAsync', () => {\n \n if (ReactDOMFeatureFlags.useFiber) {\n it('renders synchronously when feature flag is disabled', () => {\n- function Async(props) {\n- return props.children;\n+ class Async extends React.Component {\n+ static unstable_asyncUpdates = true;\n+ render() {\n+ return this.props.children;\n+ }\n }\n- Async.unstable_asyncUpdates = true;\n ReactDOM.render(

Hi<\/div><\/Async>, container);\n expect(container.textContent).toEqual('Hi');\n \n@@ -46,10 +48,12 @@ describe('ReactDOMFiberAsync', () => {\n });\n \n it('unstable_asyncUpdates at the root makes the entire tree async', () => {\n- function Async(props) {\n- return props.children;\n+ class Async extends React.Component {\n+ static unstable_asyncUpdates = true;\n+ render() {\n+ return this.props.children;\n+ }\n }\n- Async.unstable_asyncUpdates = true;\n ReactDOM.render(

Hi<\/div><\/Async>, container);\n expect(container.textContent).toEqual('');\n jest.runAllTimers();\n@@ -62,10 +66,12 @@ describe('ReactDOMFiberAsync', () => {\n });\n \n it('updates inside an async tree are async by default', () => {\n- function Async(props) {\n- return props.children;\n+ class Async extends React.Component {\n+ static unstable_asyncUpdates = true;\n+ render() {\n+ return this.props.children;\n+ }\n }\n- Async.unstable_asyncUpdates = true;\n \n let instance;\n class Component extends React.Component {\n@@ -108,10 +114,12 @@ describe('ReactDOMFiberAsync', () => {\n });\n \n it('updates inside an async subtree are async by default', () => {\n- function Component(props) {\n- return ;\n+ class Component extends React.Component {\n+ static unstable_asyncUpdates = true;\n+ render() {\n+ return ;\n+ }\n }\n- Component.unstable_asyncUpdates = true;\n \n let instance;\n class Child extends React.Component {\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiber.js b\/src\/renderers\/shared\/fiber\/ReactFiber.js\nindex 99defaceb4..b7c6ed30c0 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiber.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiber.js\n@@ -23,8 +23,6 @@ import type {TypeOfSideEffect} from 'ReactTypeOfSideEffect';\n import type {PriorityLevel} from 'ReactPriorityLevel';\n import type {UpdateQueue} from 'ReactFiberUpdateQueue';\n \n-var ReactFeatureFlags = require('ReactFeatureFlags');\n-\n var {\n IndeterminateComponent,\n ClassComponent,\n@@ -39,7 +37,7 @@ var {\n \n var {NoWork} = require('ReactPriorityLevel');\n \n-var {NoContext, AsyncUpdates} = require('ReactTypeOfInternalContext');\n+var {NoContext} = require('ReactTypeOfInternalContext');\n \n var {NoEffect} = require('ReactTypeOfSideEffect');\n \n@@ -383,14 +381,6 @@ function createFiberFromElementType(\n internalContextTag: TypeOfInternalContext,\n debugOwner: null | Fiber | ReactInstance,\n ): Fiber {\n- if (\n- ReactFeatureFlags.enableAsyncSubtreeAPI &&\n- type != null &&\n- (type: any).unstable_asyncUpdates === true\n- ) {\n- internalContextTag |= AsyncUpdates;\n- }\n-\n let fiber;\n if (typeof type === 'function') {\n fiber = shouldConstruct(type)\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiberClassComponent.js b\/src\/renderers\/shared\/fiber\/ReactFiberClassComponent.js\nindex 7f62f3b8f3..0db7cefda8 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberClassComponent.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberClassComponent.js\n@@ -17,6 +17,9 @@ import type {PriorityLevel} from 'ReactPriorityLevel';\n \n var {Update} = require('ReactTypeOfSideEffect');\n \n+var ReactFeatureFlags = require('ReactFeatureFlags');\n+var {AsyncUpdates} = require('ReactTypeOfInternalContext');\n+\n var {\n cacheContext,\n getMaskedContext,\n@@ -325,6 +328,14 @@ module.exports = function(\n instance.refs = emptyObject;\n instance.context = getMaskedContext(workInProgress, unmaskedContext);\n \n+ if (\n+ ReactFeatureFlags.enableAsyncSubtreeAPI &&\n+ workInProgress.type != null &&\n+ workInProgress.type.unstable_asyncUpdates === true\n+ ) {\n+ workInProgress.internalContextTag |= AsyncUpdates;\n+ }\n+\n if (typeof instance.componentWillMount === 'function') {\n if (__DEV__) {\n startPhaseTimer(workInProgress, 'componentWillMount');\n","parents":["835c21a5ef52a2f29180c4ffc046bebb14d07eb3"],"body":"","files":[{"status":"M","path":"src\/renderers\/dom\/fiber\/__tests__\/ReactDOMFiberAsync-test.js"},{"status":"M","path":"src\/renderers\/shared\/fiber\/ReactFiber.js"},{"status":"M","path":"src\/renderers\/shared\/fiber\/ReactFiberClassComponent.js"}]}

dillon1000/react

Files changed