Skip to content

Commit 82255ac

Browse files
committed
Change "_secondary" suffix to "2"
#EveryBitCounts
1 parent af82611 commit 82255ac

File tree

3 files changed

+17
-21
lines changed

3 files changed

+17
-21
lines changed

packages/react-reconciler/src/ReactFiberNewContext.js

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -53,20 +53,20 @@ export default function(stack: Stack, isPrimaryRenderer: boolean) {
5353
context._currentRenderer = rendererSigil;
5454
}
5555
} else {
56-
push(changedBitsCursor, context._changedBits_secondary, providerFiber);
57-
push(valueCursor, context._currentValue_secondary, providerFiber);
56+
push(changedBitsCursor, context._changedBits2, providerFiber);
57+
push(valueCursor, context._currentValue2, providerFiber);
5858
push(providerCursor, providerFiber, providerFiber);
5959

60-
context._currentValue_secondary = providerFiber.pendingProps.value;
61-
context._changedBits_secondary = providerFiber.stateNode;
60+
context._currentValue2 = providerFiber.pendingProps.value;
61+
context._changedBits2 = providerFiber.stateNode;
6262
if (__DEV__) {
6363
warning(
64-
context._currentRenderer_secondary === null ||
65-
context._currentRenderer_secondary === rendererSigil,
64+
context._currentRenderer2 === null ||
65+
context._currentRenderer2 === rendererSigil,
6666
'Detected multiple renderers concurrently rendering the ' +
6767
'same context provider. This is currently unsupported.',
6868
);
69-
context._currentRenderer_secondary = rendererSigil;
69+
context._currentRenderer2 = rendererSigil;
7070
}
7171
}
7272
}
@@ -84,21 +84,17 @@ export default function(stack: Stack, isPrimaryRenderer: boolean) {
8484
context._currentValue = currentValue;
8585
context._changedBits = changedBits;
8686
} else {
87-
context._currentValue_secondary = currentValue;
88-
context._changedBits_secondary = changedBits;
87+
context._currentValue2 = currentValue;
88+
context._changedBits2 = changedBits;
8989
}
9090
}
9191

9292
function getContextCurrentValue(context: ReactContext<any>): any {
93-
return isPrimaryRenderer
94-
? context._currentValue
95-
: context._currentValue_secondary;
93+
return isPrimaryRenderer ? context._currentValue : context._currentValue2;
9694
}
9795

9896
function getContextChangedBits(context: ReactContext<any>): number {
99-
return isPrimaryRenderer
100-
? context._changedBits
101-
: context._changedBits_secondary;
97+
return isPrimaryRenderer ? context._changedBits : context._changedBits2;
10298
}
10399

104100
return {

packages/react/src/ReactContext.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ export function createContext<T>(
4141
// there to be two concurrent renderers at most: React Native (primary) and
4242
// Fabric (secondary); React DOM (primary) and React ART (secondary).
4343
// Secondary renderers store their context values on separate fields.
44-
_currentValue_secondary: defaultValue,
44+
_currentValue2: defaultValue,
4545
_changedBits: 0,
46-
_changedBits_secondary: 0,
46+
_changedBits2: 0,
4747
// These are circular
4848
Provider: (null: any),
4949
Consumer: (null: any),
@@ -57,7 +57,7 @@ export function createContext<T>(
5757

5858
if (__DEV__) {
5959
context._currentRenderer = null;
60-
context._currentRenderer_secondary = null;
60+
context._currentRenderer2 = null;
6161
}
6262

6363
return context;

packages/shared/ReactTypes.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,13 @@ export type ReactContext<T> = {
8585
_defaultValue: T,
8686

8787
_currentValue: T,
88-
_currentValue_secondary: T,
88+
_currentValue2: T,
8989
_changedBits: number,
90-
_changedBits_secondary: number,
90+
_changedBits2: number,
9191

9292
// DEV only
9393
_currentRenderer?: Object | null,
94-
_currentRenderer_secondary?: Object | null,
94+
_currentRenderer2?: Object | null,
9595
};
9696

9797
export type ReactPortal = {

0 commit comments

Comments
 (0)