From abd07dffb30b005dc3702fcba1c2379c32762b7b Mon Sep 17 00:00:00 2001 From: Andrew Clark Date: Tue, 18 Apr 2017 13:28:33 -0700 Subject: [PATCH] Rename contextTag -> internalContextTag --- src/renderers/shared/fiber/ReactChildFiber.js | 34 +++++++++---------- src/renderers/shared/fiber/ReactFiber.js | 22 ++++++------ .../shared/fiber/ReactFiberClassComponent.js | 5 ++- .../shared/fiber/ReactFiberReconciler.js | 8 +++-- .../shared/fiber/ReactFiberScheduler.js | 4 +-- ...ntext.js => ReactTypeOfInternalContext.js} | 4 +-- 6 files changed, 42 insertions(+), 35 deletions(-) rename src/renderers/shared/fiber/{isomorphic/ReactTypeOfContext.js => ReactTypeOfInternalContext.js} (81%) diff --git a/src/renderers/shared/fiber/ReactChildFiber.js b/src/renderers/shared/fiber/ReactChildFiber.js index 49d3ce419c..cd0949804c 100644 --- a/src/renderers/shared/fiber/ReactChildFiber.js +++ b/src/renderers/shared/fiber/ReactChildFiber.js @@ -307,7 +307,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) { // Insert const created = createFiberFromText(textContent, priority); created.return = returnFiber; - created.contextTag = returnFiber.contextTag; + created.internalContextTag = returnFiber.internalContextTag; return created; } else { // Update @@ -329,7 +329,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) { const created = createFiberFromElement(element, priority); created.ref = coerceRef(current, element); created.return = returnFiber; - created.contextTag = returnFiber.contextTag; + created.internalContextTag = returnFiber.internalContextTag; return created; } else { // Move based on index @@ -356,7 +356,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) { // Insert const created = createFiberFromCoroutine(coroutine, priority); created.return = returnFiber; - created.contextTag = returnFiber.contextTag; + created.internalContextTag = returnFiber.internalContextTag; return created; } else { // Move based on index @@ -378,7 +378,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) { const created = createFiberFromYield(yieldNode, priority); created.type = yieldNode.value; created.return = returnFiber; - created.contextTag = returnFiber.contextTag; + created.internalContextTag = returnFiber.internalContextTag; return created; } else { // Move based on index @@ -404,7 +404,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) { // Insert const created = createFiberFromPortal(portal, priority); created.return = returnFiber; - created.contextTag = returnFiber.contextTag; + created.internalContextTag = returnFiber.internalContextTag; return created; } else { // Update @@ -425,7 +425,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) { // Insert const created = createFiberFromFragment(fragment, priority); created.return = returnFiber; - created.contextTag = returnFiber.contextTag; + created.internalContextTag = returnFiber.internalContextTag; return created; } else { // Update @@ -447,7 +447,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) { // node. const created = createFiberFromText('' + newChild, priority); created.return = returnFiber; - created.contextTag = returnFiber.contextTag; + created.internalContextTag = returnFiber.internalContextTag; return created; } @@ -457,14 +457,14 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) { const created = createFiberFromElement(newChild, priority); created.ref = coerceRef(null, newChild); created.return = returnFiber; - created.contextTag = returnFiber.contextTag; + created.internalContextTag = returnFiber.internalContextTag; return created; } case REACT_COROUTINE_TYPE: { const created = createFiberFromCoroutine(newChild, priority); created.return = returnFiber; - created.contextTag = returnFiber.contextTag; + created.internalContextTag = returnFiber.internalContextTag; return created; } @@ -472,14 +472,14 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) { const created = createFiberFromYield(newChild, priority); created.type = newChild.value; created.return = returnFiber; - created.contextTag = returnFiber.contextTag; + created.internalContextTag = returnFiber.internalContextTag; return created; } case REACT_PORTAL_TYPE: { const created = createFiberFromPortal(newChild, priority); created.return = returnFiber; - created.contextTag = returnFiber.contextTag; + created.internalContextTag = returnFiber.internalContextTag; return created; } } @@ -487,7 +487,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) { if (isArray(newChild) || getIteratorFn(newChild)) { const created = createFiberFromFragment(newChild, priority); created.return = returnFiber; - created.contextTag = returnFiber.contextTag; + created.internalContextTag = returnFiber.internalContextTag; return created; } @@ -1025,7 +1025,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) { deleteRemainingChildren(returnFiber, currentFirstChild); const created = createFiberFromText(textContent, priority); created.return = returnFiber; - created.contextTag = returnFiber.contextTag; + created.internalContextTag = returnFiber.internalContextTag; return created; } @@ -1065,7 +1065,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) { const created = createFiberFromElement(element, priority); created.ref = coerceRef(currentFirstChild, element); created.return = returnFiber; - created.contextTag = returnFiber.contextTag; + created.internalContextTag = returnFiber.internalContextTag; return created; } @@ -1099,7 +1099,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) { const created = createFiberFromCoroutine(coroutine, priority); created.return = returnFiber; - created.contextTag = returnFiber.contextTag; + created.internalContextTag = returnFiber.internalContextTag; return created; } @@ -1126,7 +1126,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) { const created = createFiberFromYield(yieldNode, priority); created.type = yieldNode.value; created.return = returnFiber; - created.contextTag = returnFiber.contextTag; + created.internalContextTag = returnFiber.internalContextTag; return created; } @@ -1164,7 +1164,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) { const created = createFiberFromPortal(portal, priority); created.return = returnFiber; - created.contextTag = returnFiber.contextTag; + created.internalContextTag = returnFiber.internalContextTag; return created; } diff --git a/src/renderers/shared/fiber/ReactFiber.js b/src/renderers/shared/fiber/ReactFiber.js index 29a43df4ba..6782d4ae07 100644 --- a/src/renderers/shared/fiber/ReactFiber.js +++ b/src/renderers/shared/fiber/ReactFiber.js @@ -18,7 +18,7 @@ import type {ReactFragment} from 'ReactTypes'; import type {ReactCoroutine, ReactYield} from 'ReactCoroutine'; import type {ReactPortal} from 'ReactPortal'; import type {TypeOfWork} from 'ReactTypeOfWork'; -import type {TypeOfContext} from 'ReactTypeOfContext'; +import type {TypeOfInternalContext} from 'ReactTypeOfInternalContext'; import type {TypeOfSideEffect} from 'ReactTypeOfSideEffect'; import type {PriorityLevel} from 'ReactPriorityLevel'; import type {UpdateQueue} from 'ReactFiberUpdateQueue'; @@ -39,7 +39,7 @@ var {NoWork} = require('ReactPriorityLevel'); var { NoContext, -} = require('ReactTypeOfContext'); +} = require('ReactTypeOfInternalContext'); var { NoEffect, @@ -116,13 +116,13 @@ export type Fiber = { // The state used to create the output memoizedState: any, - // Bitmask that describes properties about the fiber and its subtree. E.g. the - // AsyncUpdates flag indicates whether the subtree should be async-by-default. - // When a fiber is created, it inherits the contextTag of its parent. - // Additional flags can be set at creation time, but after than - // the value should remain unchanged throughout the fiber's lifetime, - // particularly before its child fibers are created. - contextTag: TypeOfContext, + // Bitfield that describes properties about the fiber and its subtree. E.g. + // the AsyncUpdates flag indicates whether the subtree should be async-by- + // default. When a fiber is created, it inherits the internalContextTag of its + // parent. Additional flags can be set at creation time, but after than the + // value should remain unchanged throughout the fiber's lifetime, particularly + // before its child fibers are created. + internalContextTag: TypeOfInternalContext, // Effect effectTag: TypeOfSideEffect, @@ -211,7 +211,7 @@ var createFiber = function(tag: TypeOfWork, key: null | string): Fiber { updateQueue: null, memoizedState: null, - contextTag: NoContext, + internalContextTag: NoContext, effectTag: NoEffect, nextEffect: null, @@ -298,7 +298,7 @@ exports.cloneFiber = function( alt.memoizedProps = fiber.memoizedProps; alt.memoizedState = fiber.memoizedState; - alt.contextTag = fiber.contextTag; + alt.internalContextTag = fiber.internalContextTag; if (__DEV__) { alt._debugID = fiber._debugID; diff --git a/src/renderers/shared/fiber/ReactFiberClassComponent.js b/src/renderers/shared/fiber/ReactFiberClassComponent.js index 8fcef7075f..0e5cf81ffe 100644 --- a/src/renderers/shared/fiber/ReactFiberClassComponent.js +++ b/src/renderers/shared/fiber/ReactFiberClassComponent.js @@ -15,6 +15,9 @@ import type {Fiber} from 'ReactFiber'; import type {PriorityLevel} from 'ReactPriorityLevel'; +var { + AsyncUpdates, +} = require('ReactTypeOfInternalContext'); var { Update, } = require('ReactTypeOfSideEffect'); @@ -306,7 +309,7 @@ module.exports = function( instance.context = getMaskedContext(workInProgress, unmaskedContext); if (instance.unstable_asyncUpdates === true) { - workInProgress.contextTag |= AsyncUpdates; + workInProgress.internalContextTag |= AsyncUpdates; } if (typeof instance.componentWillMount === 'function') { diff --git a/src/renderers/shared/fiber/ReactFiberReconciler.js b/src/renderers/shared/fiber/ReactFiberReconciler.js index c8f56c4d03..a0151b30a8 100644 --- a/src/renderers/shared/fiber/ReactFiberReconciler.js +++ b/src/renderers/shared/fiber/ReactFiberReconciler.js @@ -17,6 +17,10 @@ import type {FiberRoot} from 'ReactFiberRoot'; import type {PriorityLevel} from 'ReactPriorityLevel'; import type {ReactNodeList} from 'ReactTypes'; +var { + AsyncUpdates, +} = require('ReactTypeOfInternalContext'); + var { addTopLevelUpdate, } = require('ReactFiberUpdateQueue'); @@ -214,7 +218,7 @@ module.exports = function( // TODO: Make messages more user-friendly? if (__DEV__) { warning( - !async || container.current.contextTag & AsyncUpdates, + !async || container.current.internalContextTag & AsyncUpdates, 'Attempted to schedule an asynchronous update on a sync container.', ); } @@ -251,7 +255,7 @@ module.exports = function( createAsyncContainer(containerInfo: C): OpaqueRoot { const fiberRoot = createFiberRoot(containerInfo); - fiberRoot.current.contextTag |= AsyncUpdates; + fiberRoot.current.internalContextTag |= AsyncUpdates; return fiberRoot; }, diff --git a/src/renderers/shared/fiber/ReactFiberScheduler.js b/src/renderers/shared/fiber/ReactFiberScheduler.js index 0a94a93650..dddec0a83f 100644 --- a/src/renderers/shared/fiber/ReactFiberScheduler.js +++ b/src/renderers/shared/fiber/ReactFiberScheduler.js @@ -62,7 +62,7 @@ var { var { AsyncUpdates, -} = require('ReactTypeOfContext'); +} = require('ReactTypeOfInternalContext'); var { NoEffect, @@ -1350,7 +1350,7 @@ module.exports = function( if (priorityLevel === NoWork) { if ( !useSyncScheduling || - (enableAsyncSubtreeAPI === true && fiber.contextTag & AsyncUpdates) + (enableAsyncSubtreeAPI === true && fiber.internalContextTag & AsyncUpdates) ) { priorityLevel = LowPriority; } else { diff --git a/src/renderers/shared/fiber/isomorphic/ReactTypeOfContext.js b/src/renderers/shared/fiber/ReactTypeOfInternalContext.js similarity index 81% rename from src/renderers/shared/fiber/isomorphic/ReactTypeOfContext.js rename to src/renderers/shared/fiber/ReactTypeOfInternalContext.js index eff01ae543..4c0c5762c7 100644 --- a/src/renderers/shared/fiber/isomorphic/ReactTypeOfContext.js +++ b/src/renderers/shared/fiber/ReactTypeOfInternalContext.js @@ -6,13 +6,13 @@ * LICENSE file in the root directory of this source tree. An additional grant * of patent rights can be found in the PATENTS file in the same directory. * - * @providesModule ReactTypeOfContext + * @providesModule ReactTypeOfInternalContext * @flow */ 'use strict'; -export type TypeOfContext = 0 | 1; +export type TypeOfInternalContext = 0 | 1; module.exports = { NoContext: 0,