Rename contextTag -> internalContextTag
Andrew Clark committed
Apr 18, 2017 at 13:28 UTC
abd07dffb30b005dc3702fcba1c2379c32762b7b
6 files changed
+42
-35
src/renderers/shared/fiber/ReactChildFiber.js
+17
-17
@@ -307,7 +307,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
307
// Insert
308
const created = createFiberFromText(textContent, priority);
309
created.return = returnFiber;
310
- created.contextTag = returnFiber.contextTag;
310
+ created.internalContextTag = returnFiber.internalContextTag;
311
return created;
312
} else {
313
// Update
@@ -329,7 +329,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
329
const created = createFiberFromElement(element, priority);
330
created.ref = coerceRef(current, element);
331
created.return = returnFiber;
332
- created.contextTag = returnFiber.contextTag;
332
+ created.internalContextTag = returnFiber.internalContextTag;
333
return created;
334
} else {
335
// Move based on index
@@ -356,7 +356,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
356
// Insert
357
const created = createFiberFromCoroutine(coroutine, priority);
358
created.return = returnFiber;
359
- created.contextTag = returnFiber.contextTag;
359
+ created.internalContextTag = returnFiber.internalContextTag;
360
return created;
361
} else {
362
// Move based on index
@@ -378,7 +378,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
378
const created = createFiberFromYield(yieldNode, priority);
379
created.type = yieldNode.value;
380
created.return = returnFiber;
381
- created.contextTag = returnFiber.contextTag;
381
+ created.internalContextTag = returnFiber.internalContextTag;
382
return created;
383
} else {
384
// Move based on index
@@ -404,7 +404,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
404
// Insert
405
const created = createFiberFromPortal(portal, priority);
406
created.return = returnFiber;
407
- created.contextTag = returnFiber.contextTag;
407
+ created.internalContextTag = returnFiber.internalContextTag;
408
return created;
409
} else {
410
// Update
@@ -425,7 +425,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
425
// Insert
426
const created = createFiberFromFragment(fragment, priority);
427
created.return = returnFiber;
428
- created.contextTag = returnFiber.contextTag;
428
+ created.internalContextTag = returnFiber.internalContextTag;
429
return created;
430
} else {
431
// Update
@@ -447,7 +447,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
447
// node.
448
const created = createFiberFromText('' + newChild, priority);
449
created.return = returnFiber;
450
- created.contextTag = returnFiber.contextTag;
450
+ created.internalContextTag = returnFiber.internalContextTag;
451
return created;
452
}
453
@@ -457,14 +457,14 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
457
const created = createFiberFromElement(newChild, priority);
458
created.ref = coerceRef(null, newChild);
459
created.return = returnFiber;
460
- created.contextTag = returnFiber.contextTag;
460
+ created.internalContextTag = returnFiber.internalContextTag;
461
return created;
462
}
463
464
case REACT_COROUTINE_TYPE: {
465
const created = createFiberFromCoroutine(newChild, priority);
466
created.return = returnFiber;
467
- created.contextTag = returnFiber.contextTag;
467
+ created.internalContextTag = returnFiber.internalContextTag;
468
return created;
469
}
470
@@ -472,14 +472,14 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
472
const created = createFiberFromYield(newChild, priority);
473
created.type = newChild.value;
474
created.return = returnFiber;
475
- created.contextTag = returnFiber.contextTag;
475
+ created.internalContextTag = returnFiber.internalContextTag;
476
return created;
477
}
478
479
case REACT_PORTAL_TYPE: {
480
const created = createFiberFromPortal(newChild, priority);
481
created.return = returnFiber;
482
- created.contextTag = returnFiber.contextTag;
482
+ created.internalContextTag = returnFiber.internalContextTag;
483
return created;
484
}
485
}
@@ -487,7 +487,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
487
if (isArray(newChild) || getIteratorFn(newChild)) {
488
const created = createFiberFromFragment(newChild, priority);
489
created.return = returnFiber;
490
- created.contextTag = returnFiber.contextTag;
490
+ created.internalContextTag = returnFiber.internalContextTag;
491
return created;
492
}
493
@@ -1025,7 +1025,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
1025
deleteRemainingChildren(returnFiber, currentFirstChild);
1026
const created = createFiberFromText(textContent, priority);
1027
created.return = returnFiber;
1028
- created.contextTag = returnFiber.contextTag;
1028
+ created.internalContextTag = returnFiber.internalContextTag;
1029
return created;
1030
}
1031
@@ -1065,7 +1065,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
1065
const created = createFiberFromElement(element, priority);
1066
created.ref = coerceRef(currentFirstChild, element);
1067
created.return = returnFiber;
1068
- created.contextTag = returnFiber.contextTag;
1068
+ created.internalContextTag = returnFiber.internalContextTag;
1069
return created;
1070
}
1071
@@ -1099,7 +1099,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
1099
1100
const created = createFiberFromCoroutine(coroutine, priority);
1101
created.return = returnFiber;
1102
- created.contextTag = returnFiber.contextTag;
1102
+ created.internalContextTag = returnFiber.internalContextTag;
1103
return created;
1104
}
1105
@@ -1126,7 +1126,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
1126
const created = createFiberFromYield(yieldNode, priority);
1127
created.type = yieldNode.value;
1128
created.return = returnFiber;
1129
- created.contextTag = returnFiber.contextTag;
1129
+ created.internalContextTag = returnFiber.internalContextTag;
1130
return created;
1131
}
1132
@@ -1164,7 +1164,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
1164
1165
const created = createFiberFromPortal(portal, priority);
1166
created.return = returnFiber;
1167
- created.contextTag = returnFiber.contextTag;
1167
+ created.internalContextTag = returnFiber.internalContextTag;
1168
return created;
1169
}
1170
src/renderers/shared/fiber/ReactFiber.js
+11
-11
@@ -18,7 +18,7 @@ import type {ReactFragment} from 'ReactTypes';
18
import type {ReactCoroutine, ReactYield} from 'ReactCoroutine';
19
import type {ReactPortal} from 'ReactPortal';
20
import type {TypeOfWork} from 'ReactTypeOfWork';
21
-import type {TypeOfContext} from 'ReactTypeOfContext';
21
+import type {TypeOfInternalContext} from 'ReactTypeOfInternalContext';
22
import type {TypeOfSideEffect} from 'ReactTypeOfSideEffect';
23
import type {PriorityLevel} from 'ReactPriorityLevel';
24
import type {UpdateQueue} from 'ReactFiberUpdateQueue';
@@ -39,7 +39,7 @@ var {NoWork} = require('ReactPriorityLevel');
39
40
var {
41
NoContext,
42
-} = require('ReactTypeOfContext');
42
+} = require('ReactTypeOfInternalContext');
43
44
var {
45
NoEffect,
@@ -116,13 +116,13 @@ export type Fiber = {
116
// The state used to create the output
117
memoizedState: any,
118
119
- // Bitmask that describes properties about the fiber and its subtree. E.g. the
120
- // AsyncUpdates flag indicates whether the subtree should be async-by-default.
121
- // When a fiber is created, it inherits the contextTag of its parent.
122
- // Additional flags can be set at creation time, but after than
123
- // the value should remain unchanged throughout the fiber's lifetime,
124
- // particularly before its child fibers are created.
125
- contextTag: TypeOfContext,
119
+ // Bitfield that describes properties about the fiber and its subtree. E.g.
120
+ // the AsyncUpdates flag indicates whether the subtree should be async-by-
121
+ // default. When a fiber is created, it inherits the internalContextTag of its
122
+ // parent. Additional flags can be set at creation time, but after than the
123
+ // value should remain unchanged throughout the fiber's lifetime, particularly
124
+ // before its child fibers are created.
125
+ internalContextTag: TypeOfInternalContext,
126
127
// Effect
128
effectTag: TypeOfSideEffect,
@@ -211,7 +211,7 @@ var createFiber = function(tag: TypeOfWork, key: null | string): Fiber {
211
updateQueue: null,
212
memoizedState: null,
213
214
- contextTag: NoContext,
214
+ internalContextTag: NoContext,
215
216
effectTag: NoEffect,
217
nextEffect: null,
@@ -298,7 +298,7 @@ exports.cloneFiber = function(
298
alt.memoizedProps = fiber.memoizedProps;
299
alt.memoizedState = fiber.memoizedState;
300
301
- alt.contextTag = fiber.contextTag;
301
+ alt.internalContextTag = fiber.internalContextTag;
302
303
if (__DEV__) {
304
alt._debugID = fiber._debugID;
src/renderers/shared/fiber/ReactFiberClassComponent.js
+4
-1
@@ -15,6 +15,9 @@
15
import type {Fiber} from 'ReactFiber';
16
import type {PriorityLevel} from 'ReactPriorityLevel';
17
18
+var {
19
+ AsyncUpdates,
20
+} = require('ReactTypeOfInternalContext');
21
var {
22
Update,
23
} = require('ReactTypeOfSideEffect');
@@ -306,7 +309,7 @@ module.exports = function(
309
instance.context = getMaskedContext(workInProgress, unmaskedContext);
310
311
if (instance.unstable_asyncUpdates === true) {
309
- workInProgress.contextTag |= AsyncUpdates;
312
+ workInProgress.internalContextTag |= AsyncUpdates;
313
}
314
315
if (typeof instance.componentWillMount === 'function') {
src/renderers/shared/fiber/ReactFiberReconciler.js
+6
-2
@@ -17,6 +17,10 @@ import type {FiberRoot} from 'ReactFiberRoot';
17
import type {PriorityLevel} from 'ReactPriorityLevel';
18
import type {ReactNodeList} from 'ReactTypes';
19
20
+var {
21
+ AsyncUpdates,
22
+} = require('ReactTypeOfInternalContext');
23
+
24
var {
25
addTopLevelUpdate,
26
} = require('ReactFiberUpdateQueue');
@@ -214,7 +218,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
218
// TODO: Make messages more user-friendly?
219
if (__DEV__) {
220
warning(
217
- !async || container.current.contextTag & AsyncUpdates,
221
+ !async || container.current.internalContextTag & AsyncUpdates,
222
'Attempted to schedule an asynchronous update on a sync container.',
223
);
224
}
@@ -251,7 +255,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
255
256
createAsyncContainer(containerInfo: C): OpaqueRoot {
257
const fiberRoot = createFiberRoot(containerInfo);
254
- fiberRoot.current.contextTag |= AsyncUpdates;
258
+ fiberRoot.current.internalContextTag |= AsyncUpdates;
259
return fiberRoot;
260
},
261
src/renderers/shared/fiber/ReactFiberScheduler.js
+2
-2
@@ -62,7 +62,7 @@ var {
62
63
var {
64
AsyncUpdates,
65
-} = require('ReactTypeOfContext');
65
+} = require('ReactTypeOfInternalContext');
66
67
var {
68
NoEffect,
@@ -1350,7 +1350,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
1350
if (priorityLevel === NoWork) {
1351
if (
1352
!useSyncScheduling ||
1353
- (enableAsyncSubtreeAPI === true && fiber.contextTag & AsyncUpdates)
1353
+ (enableAsyncSubtreeAPI === true && fiber.internalContextTag & AsyncUpdates)
1354
) {
1355
priorityLevel = LowPriority;
1356
} else {
src/renderers/shared/fiber/ReactTypeOfInternalContext.js
renamed
+2
-2
@@ -6,13 +6,13 @@
6
* LICENSE file in the root directory of this source tree. An additional grant
7
* of patent rights can be found in the PATENTS file in the same directory.
8
*
9
- * @providesModule ReactTypeOfContext
9
+ * @providesModule ReactTypeOfInternalContext
10
* @flow
11
*/
12
13
'use strict';
14
15
-export type TypeOfContext = 0 | 1;
15
+export type TypeOfInternalContext = 0 | 1;
16
17
module.exports = {
18
NoContext: 0,