diff --git a/packages/react-client/src/ReactFlightReplyClient.js b/packages/react-client/src/ReactFlightReplyClient.js index 6a0a37b787..40de7ca51e 100644 --- a/packages/react-client/src/ReactFlightReplyClient.js +++ b/packages/react-client/src/ReactFlightReplyClient.js @@ -18,13 +18,10 @@ import type { import type {LazyComponent} from 'react/src/ReactLazy'; import type {TemporaryReferenceSet} from './ReactFlightTemporaryReferences'; -import {enableRenderableContext} from 'shared/ReactFeatureFlags'; - import { REACT_ELEMENT_TYPE, REACT_LAZY_TYPE, REACT_CONTEXT_TYPE, - REACT_PROVIDER_TYPE, getIteratorFn, ASYNC_ITERATOR, } from 'shared/ReactSymbols'; @@ -699,10 +696,7 @@ export function processReply( return serializeTemporaryReferenceMarker(); } if (__DEV__) { - if ( - (value: any).$$typeof === - (enableRenderableContext ? REACT_CONTEXT_TYPE : REACT_PROVIDER_TYPE) - ) { + if ((value: any).$$typeof === REACT_CONTEXT_TYPE) { console.error( 'React Context Providers cannot be passed to Server Functions from the Client.%s', describeObjectForErrorMessage(parent, key), diff --git a/packages/react-devtools-shared/src/utils.js b/packages/react-devtools-shared/src/utils.js index 0536a821c7..5d92a86e2e 100644 --- a/packages/react-devtools-shared/src/utils.js +++ b/packages/react-devtools-shared/src/utils.js @@ -19,14 +19,12 @@ import { REACT_MEMO_TYPE, REACT_PORTAL_TYPE, REACT_PROFILER_TYPE, - REACT_PROVIDER_TYPE, REACT_STRICT_MODE_TYPE, REACT_SUSPENSE_LIST_TYPE, REACT_SUSPENSE_TYPE, REACT_TRACING_MARKER_TYPE, REACT_VIEW_TRANSITION_TYPE, } from 'shared/ReactSymbols'; -import {enableRenderableContext} from 'shared/ReactFeatureFlags'; import { TREE_OPERATION_ADD, TREE_OPERATION_REMOVE, @@ -87,6 +85,9 @@ const encodedStringCache: LRUCache> = new LRU({ max: 1000, }); +// Previously, the type of `Context.Provider`. +const LEGACY_REACT_PROVIDER_TYPE: symbol = Symbol.for('react.provider'); + export function alphaSortKeys( a: string | number | symbol, b: string | number | symbol, @@ -712,14 +713,7 @@ function typeOfWithLegacyElementSymbol(object: any): mixed { case REACT_MEMO_TYPE: return $$typeofType; case REACT_CONSUMER_TYPE: - if (enableRenderableContext) { - return $$typeofType; - } - // Fall through - case REACT_PROVIDER_TYPE: - if (!enableRenderableContext) { - return $$typeofType; - } + return $$typeofType; // Fall through default: return $$typeof; @@ -740,7 +734,7 @@ export function getDisplayNameForReactElement( switch (elementType) { case REACT_CONSUMER_TYPE: return 'ContextConsumer'; - case REACT_PROVIDER_TYPE: + case LEGACY_REACT_PROVIDER_TYPE: return 'ContextProvider'; case REACT_CONTEXT_TYPE: return 'Context'; diff --git a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationNewContext-test.js b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationNewContext-test.js index 24009f1eda..213e4ed138 100644 --- a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationNewContext-test.js +++ b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationNewContext-test.js @@ -295,12 +295,6 @@ describe('ReactDOMServerIntegration', () => { }); itRenders('should treat Context as Context.Provider', async render => { - // The `itRenders` helpers don't work with the gate pragma, so we have to do - // this instead. - if (gate(flags => !flags.enableRenderableContext)) { - return; - } - const Theme = React.createContext('dark'); const Language = React.createContext('french'); diff --git a/packages/react-dom/src/__tests__/ReactServerRendering-test.js b/packages/react-dom/src/__tests__/ReactServerRendering-test.js index 2bf917d3c3..86bdb1633f 100644 --- a/packages/react-dom/src/__tests__/ReactServerRendering-test.js +++ b/packages/react-dom/src/__tests__/ReactServerRendering-test.js @@ -932,7 +932,6 @@ describe('ReactDOMServer', () => { ]); }); - // @gate enableRenderableContext || !__DEV__ it('should warn if an invalid contextType is defined', () => { const Context = React.createContext(); class ComponentA extends React.Component { diff --git a/packages/react-is/src/ReactIs.js b/packages/react-is/src/ReactIs.js index a433e91bf1..ed70f0e68e 100644 --- a/packages/react-is/src/ReactIs.js +++ b/packages/react-is/src/ReactIs.js @@ -18,7 +18,6 @@ import { REACT_MEMO_TYPE, REACT_PORTAL_TYPE, REACT_PROFILER_TYPE, - REACT_PROVIDER_TYPE, REACT_CONSUMER_TYPE, REACT_STRICT_MODE_TYPE, REACT_SUSPENSE_TYPE, @@ -30,7 +29,6 @@ import { } from 'shared/ReactSymbols'; import { - enableRenderableContext, enableScopeAPI, enableTransitionTracing, enableLegacyHidden, @@ -64,14 +62,7 @@ export function typeOf(object: any): mixed { case REACT_MEMO_TYPE: return $$typeofType; case REACT_CONSUMER_TYPE: - if (enableRenderableContext) { - return $$typeofType; - } - // Fall through - case REACT_PROVIDER_TYPE: - if (!enableRenderableContext) { - return $$typeofType; - } + return $$typeofType; // Fall through default: return $$typeof; @@ -85,12 +76,8 @@ export function typeOf(object: any): mixed { return undefined; } -export const ContextConsumer: symbol = enableRenderableContext - ? REACT_CONSUMER_TYPE - : REACT_CONTEXT_TYPE; -export const ContextProvider: symbol = enableRenderableContext - ? REACT_CONTEXT_TYPE - : REACT_PROVIDER_TYPE; +export const ContextConsumer: symbol = REACT_CONSUMER_TYPE; +export const ContextProvider: symbol = REACT_CONTEXT_TYPE; export const Element = REACT_ELEMENT_TYPE; export const ForwardRef = REACT_FORWARD_REF_TYPE; export const Fragment = REACT_FRAGMENT_TYPE; @@ -127,8 +114,7 @@ export function isValidElementType(type: mixed): boolean { type.$$typeof === REACT_LAZY_TYPE || type.$$typeof === REACT_MEMO_TYPE || type.$$typeof === REACT_CONTEXT_TYPE || - (!enableRenderableContext && type.$$typeof === REACT_PROVIDER_TYPE) || - (enableRenderableContext && type.$$typeof === REACT_CONSUMER_TYPE) || + type.$$typeof === REACT_CONSUMER_TYPE || type.$$typeof === REACT_FORWARD_REF_TYPE || // This needs to include all possible module reference object // types supported by any Flight configuration anywhere since @@ -145,18 +131,10 @@ export function isValidElementType(type: mixed): boolean { } export function isContextConsumer(object: any): boolean { - if (enableRenderableContext) { - return typeOf(object) === REACT_CONSUMER_TYPE; - } else { - return typeOf(object) === REACT_CONTEXT_TYPE; - } + return typeOf(object) === REACT_CONSUMER_TYPE; } export function isContextProvider(object: any): boolean { - if (enableRenderableContext) { - return typeOf(object) === REACT_CONTEXT_TYPE; - } else { - return typeOf(object) === REACT_PROVIDER_TYPE; - } + return typeOf(object) === REACT_CONTEXT_TYPE; } export function isElement(object: any): boolean { return ( diff --git a/packages/react-reconciler/src/ReactFiber.js b/packages/react-reconciler/src/ReactFiber.js index 39dde1c593..65feabd8c0 100644 --- a/packages/react-reconciler/src/ReactFiber.js +++ b/packages/react-reconciler/src/ReactFiber.js @@ -41,7 +41,6 @@ import { enableLegacyHidden, enableTransitionTracing, enableDO_NOT_USE_disableStrictPassiveEffect, - enableRenderableContext, disableLegacyMode, enableObjectFiber, enableViewTransition, @@ -101,7 +100,6 @@ import { REACT_FRAGMENT_TYPE, REACT_STRICT_MODE_TYPE, REACT_PROFILER_TYPE, - REACT_PROVIDER_TYPE, REACT_CONTEXT_TYPE, REACT_CONSUMER_TYPE, REACT_SUSPENSE_TYPE, @@ -638,25 +636,12 @@ export function createFiberFromTypeAndProps( default: { if (typeof type === 'object' && type !== null) { switch (type.$$typeof) { - case REACT_PROVIDER_TYPE: - if (!enableRenderableContext) { - fiberTag = ContextProvider; - break getTag; - } - // Fall through case REACT_CONTEXT_TYPE: - if (enableRenderableContext) { - fiberTag = ContextProvider; - break getTag; - } else { - fiberTag = ContextConsumer; - break getTag; - } + fiberTag = ContextProvider; + break getTag; case REACT_CONSUMER_TYPE: - if (enableRenderableContext) { - fiberTag = ContextConsumer; - break getTag; - } + fiberTag = ContextConsumer; + break getTag; // Fall through case REACT_FORWARD_REF_TYPE: fiberTag = ForwardRef; diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js index 2b9e4e7fdb..10b10a74b9 100644 --- a/packages/react-reconciler/src/ReactFiberBeginWork.js +++ b/packages/react-reconciler/src/ReactFiberBeginWork.js @@ -116,7 +116,6 @@ import { enableLegacyHidden, enableCPUSuspense, enablePostpone, - enableRenderableContext, disableLegacyMode, disableDefaultPropsExceptForClasses, enableHydrationLaneScheduling, @@ -3591,12 +3590,7 @@ function updateContextProvider( workInProgress: Fiber, renderLanes: Lanes, ) { - let context: ReactContext; - if (enableRenderableContext) { - context = workInProgress.type; - } else { - context = workInProgress.type._context; - } + const context: ReactContext = workInProgress.type; const newProps = workInProgress.pendingProps; const newValue = newProps.value; @@ -3623,18 +3617,8 @@ function updateContextConsumer( workInProgress: Fiber, renderLanes: Lanes, ) { - let context: ReactContext; - if (enableRenderableContext) { - const consumerType: ReactConsumerType = workInProgress.type; - context = consumerType._context; - } else { - context = workInProgress.type; - if (__DEV__) { - if ((context: any)._context !== undefined) { - context = (context: any)._context; - } - } - } + const consumerType: ReactConsumerType = workInProgress.type; + const context: ReactContext = consumerType._context; const newProps = workInProgress.pendingProps; const render = newProps.children; @@ -3878,12 +3862,7 @@ function attemptEarlyBailoutIfNoScheduledUpdate( break; case ContextProvider: { const newValue = workInProgress.memoizedProps.value; - let context: ReactContext; - if (enableRenderableContext) { - context = workInProgress.type; - } else { - context = workInProgress.type._context; - } + const context: ReactContext = workInProgress.type; pushProvider(workInProgress, context, newValue); break; } diff --git a/packages/react-reconciler/src/ReactFiberCompleteWork.js b/packages/react-reconciler/src/ReactFiberCompleteWork.js index a415e6217a..1e6ddd7595 100644 --- a/packages/react-reconciler/src/ReactFiberCompleteWork.js +++ b/packages/react-reconciler/src/ReactFiberCompleteWork.js @@ -38,7 +38,6 @@ import { enablePersistedModeClonedFlag, enableProfilerTimer, enableTransitionTracing, - enableRenderableContext, passChildrenWhenCloningPersistedNodes, disableLegacyMode, enableViewTransition, @@ -1667,12 +1666,7 @@ function completeWork( return null; case ContextProvider: // Pop provider fiber - let context: ReactContext; - if (enableRenderableContext) { - context = workInProgress.type; - } else { - context = workInProgress.type._context; - } + const context: ReactContext = workInProgress.type; popProvider(context, workInProgress); bubbleProperties(workInProgress); return null; diff --git a/packages/react-reconciler/src/ReactFiberNewContext.js b/packages/react-reconciler/src/ReactFiberNewContext.js index b10dc5ce54..02792d863a 100644 --- a/packages/react-reconciler/src/ReactFiberNewContext.js +++ b/packages/react-reconciler/src/ReactFiberNewContext.js @@ -29,7 +29,6 @@ import { } from './ReactFiberFlags'; import is from 'shared/objectIs'; -import {enableRenderableContext} from 'shared/ReactFeatureFlags'; import {getHostTransitionProvider} from './ReactFiberHostContext'; const valueCursor: StackCursor = createCursor(null); @@ -389,13 +388,7 @@ function propagateParentContextChanges( const oldProps = currentParent.memoizedProps; if (oldProps !== null) { - let context: ReactContext; - if (enableRenderableContext) { - context = parent.type; - } else { - context = parent.type._context; - } - + const context: ReactContext = parent.type; const newProps = parent.pendingProps; const newValue = newProps.value; diff --git a/packages/react-reconciler/src/ReactFiberScope.js b/packages/react-reconciler/src/ReactFiberScope.js index 0cb1c62ba8..8f9f1cdea5 100644 --- a/packages/react-reconciler/src/ReactFiberScope.js +++ b/packages/react-reconciler/src/ReactFiberScope.js @@ -22,10 +22,7 @@ import { import {isFiberSuspenseAndTimedOut} from './ReactFiberTreeReflection'; import {HostComponent, ScopeComponent, ContextProvider} from './ReactWorkTags'; -import { - enableScopeAPI, - enableRenderableContext, -} from 'shared/ReactFeatureFlags'; +import {enableScopeAPI} from 'shared/ReactFeatureFlags'; function getSuspenseFallbackChild(fiber: Fiber): Fiber | null { return ((((fiber.child: any): Fiber).sibling: any): Fiber).child; @@ -116,10 +113,7 @@ function collectNearestContextValues( context: ReactContext, childContextValues: Array, ): void { - if ( - node.tag === ContextProvider && - (enableRenderableContext ? node.type : node.type._context) === context - ) { + if (node.tag === ContextProvider && node.type === context) { const contextValue = node.memoizedProps.value; childContextValues.push(contextValue); } else { diff --git a/packages/react-reconciler/src/ReactFiberUnwindWork.js b/packages/react-reconciler/src/ReactFiberUnwindWork.js index a1d3797cd1..6de76ee203 100644 --- a/packages/react-reconciler/src/ReactFiberUnwindWork.js +++ b/packages/react-reconciler/src/ReactFiberUnwindWork.js @@ -36,7 +36,6 @@ import {NoMode, ProfileMode} from './ReactTypeOfMode'; import { enableProfilerTimer, enableTransitionTracing, - enableRenderableContext, } from 'shared/ReactFeatureFlags'; import {popHostContainer, popHostContext} from './ReactFiberHostContext'; @@ -189,12 +188,7 @@ function unwindWork( popHostContainer(workInProgress); return null; case ContextProvider: - let context: ReactContext; - if (enableRenderableContext) { - context = workInProgress.type; - } else { - context = workInProgress.type._context; - } + const context: ReactContext = workInProgress.type; popProvider(context, workInProgress); return null; case OffscreenComponent: @@ -286,12 +280,7 @@ function unwindInterruptedWork( popSuspenseListContext(interruptedWork); break; case ContextProvider: - let context: ReactContext; - if (enableRenderableContext) { - context = interruptedWork.type; - } else { - context = interruptedWork.type._context; - } + const context: ReactContext = interruptedWork.type; popProvider(context, interruptedWork); break; case OffscreenComponent: diff --git a/packages/react-reconciler/src/__tests__/ReactLazy-test.internal.js b/packages/react-reconciler/src/__tests__/ReactLazy-test.internal.js index a6306bfcfe..a9c445477b 100644 --- a/packages/react-reconciler/src/__tests__/ReactLazy-test.internal.js +++ b/packages/react-reconciler/src/__tests__/ReactLazy-test.internal.js @@ -941,15 +941,11 @@ describe('ReactLazy', () => { , ); await waitForThrow( - gate('enableRenderableContext') - ? 'Element type is invalid. Received a promise that resolves to: Context.Provider. ' + - 'Lazy element type must resolve to a class or function.' - : 'Element type is invalid. Received a promise that resolves to: Context.Consumer. ' + - 'Lazy element type must resolve to a class or function.', + 'Element type is invalid. Received a promise that resolves to: Context.Provider. ' + + 'Lazy element type must resolve to a class or function.', ); }); - // @gate enableRenderableContext it('throws with a useful error when wrapping Context.Consumer with lazy()', async () => { const Context = React.createContext(null); const BadLazy = lazy(() => fakeImport(Context.Consumer)); diff --git a/packages/react-reconciler/src/__tests__/ReactNewContext-test.js b/packages/react-reconciler/src/__tests__/ReactNewContext-test.js index 58cb2f9e64..2a61b1192d 100644 --- a/packages/react-reconciler/src/__tests__/ReactNewContext-test.js +++ b/packages/react-reconciler/src/__tests__/ReactNewContext-test.js @@ -1358,7 +1358,6 @@ describe('ReactNewContext', () => { ); }); - // @gate enableRenderableContext || !__DEV__ it('warns when passed a consumer', async () => { const Context = React.createContext(0); function Foo() { @@ -1657,7 +1656,6 @@ Context fuzz tester error! Copy and paste the following line into the test suite }); }); - // @gate enableRenderableContext it('should treat Context as Context.Provider', async () => { const BarContext = React.createContext({value: 'bar-initial'}); expect(BarContext.Provider).toBe(BarContext); diff --git a/packages/react-reconciler/src/getComponentNameFromFiber.js b/packages/react-reconciler/src/getComponentNameFromFiber.js index 670475cdec..2ceed6ce4e 100644 --- a/packages/react-reconciler/src/getComponentNameFromFiber.js +++ b/packages/react-reconciler/src/getComponentNameFromFiber.js @@ -13,7 +13,6 @@ import type {Fiber} from './ReactInternalTypes'; import { disableLegacyMode, enableLegacyHidden, - enableRenderableContext, enableViewTransition, } from 'shared/ReactFeatureFlags'; @@ -91,21 +90,11 @@ export default function getComponentNameFromFiber(fiber: Fiber): string | null { case CacheComponent: return 'Cache'; case ContextConsumer: - if (enableRenderableContext) { - const consumer: ReactConsumerType = (type: any); - return getContextName(consumer._context) + '.Consumer'; - } else { - const context: ReactContext = (type: any); - return getContextName(context) + '.Consumer'; - } + const consumer: ReactConsumerType = (type: any); + return getContextName(consumer._context) + '.Consumer'; case ContextProvider: - if (enableRenderableContext) { - const context: ReactContext = (type: any); - return getContextName(context) + '.Provider'; - } else { - const provider = (type: any); - return getContextName(provider._context) + '.Provider'; - } + const context: ReactContext = (type: any); + return getContextName(context) + '.Provider'; case DehydratedFragment: return 'DehydratedFragment'; case ForwardRef: diff --git a/packages/react-server/src/ReactFizzServer.js b/packages/react-server/src/ReactFizzServer.js index 2995b498f4..2bcc14cfa4 100644 --- a/packages/react-server/src/ReactFizzServer.js +++ b/packages/react-server/src/ReactFizzServer.js @@ -163,7 +163,6 @@ import { REACT_FRAGMENT_TYPE, REACT_FORWARD_REF_TYPE, REACT_MEMO_TYPE, - REACT_PROVIDER_TYPE, REACT_CONTEXT_TYPE, REACT_CONSUMER_TYPE, REACT_SCOPE_TYPE, @@ -178,7 +177,6 @@ import { enableScopeAPI, enablePostpone, enableHalt, - enableRenderableContext, disableDefaultPropsExceptForClasses, enableAsyncIterableChildren, enableViewTransition, @@ -2959,38 +2957,16 @@ function renderElement( renderMemo(request, task, keyPath, type, props, ref); return; } - case REACT_PROVIDER_TYPE: { - if (!enableRenderableContext) { - const context: ReactContext = (type: any)._context; - renderContextProvider(request, task, keyPath, context, props); - return; - } - // Fall through - } case REACT_CONTEXT_TYPE: { - if (enableRenderableContext) { - const context = type; - renderContextProvider(request, task, keyPath, context, props); - return; - } else { - let context: ReactContext = (type: any); - if (__DEV__) { - if ((context: any)._context !== undefined) { - context = (context: any)._context; - } - } - renderContextConsumer(request, task, keyPath, context, props); - return; - } + const context = type; + renderContextProvider(request, task, keyPath, context, props); + return; } case REACT_CONSUMER_TYPE: { - if (enableRenderableContext) { - const context: ReactContext = (type: ReactConsumerType) - ._context; - renderContextConsumer(request, task, keyPath, context, props); - return; - } - // Fall through + const context: ReactContext = (type: ReactConsumerType) + ._context; + renderContextConsumer(request, task, keyPath, context, props); + return; } case REACT_LAZY_TYPE: { renderLazyComponent(request, task, keyPath, type, props, ref); diff --git a/packages/react/src/ReactContext.js b/packages/react/src/ReactContext.js index 24461ebfbb..d5dbb433df 100644 --- a/packages/react/src/ReactContext.js +++ b/packages/react/src/ReactContext.js @@ -7,14 +7,9 @@ * @flow */ -import { - REACT_PROVIDER_TYPE, - REACT_CONSUMER_TYPE, - REACT_CONTEXT_TYPE, -} from 'shared/ReactSymbols'; +import {REACT_CONSUMER_TYPE, REACT_CONTEXT_TYPE} from 'shared/ReactSymbols'; import type {ReactContext} from 'shared/ReactTypes'; -import {enableRenderableContext} from 'shared/ReactFeatureFlags'; export function createContext(defaultValue: T): ReactContext { // TODO: Second argument used to be an optional `calculateChangedBits` @@ -37,73 +32,11 @@ export function createContext(defaultValue: T): ReactContext { Consumer: (null: any), }; - if (enableRenderableContext) { - context.Provider = context; - context.Consumer = { - $$typeof: REACT_CONSUMER_TYPE, - _context: context, - }; - } else { - (context: any).Provider = { - $$typeof: REACT_PROVIDER_TYPE, - _context: context, - }; - if (__DEV__) { - const Consumer: any = { - $$typeof: REACT_CONTEXT_TYPE, - _context: context, - }; - Object.defineProperties(Consumer, { - Provider: { - get() { - return context.Provider; - }, - set(_Provider: any) { - context.Provider = _Provider; - }, - }, - _currentValue: { - get() { - return context._currentValue; - }, - set(_currentValue: T) { - context._currentValue = _currentValue; - }, - }, - _currentValue2: { - get() { - return context._currentValue2; - }, - set(_currentValue2: T) { - context._currentValue2 = _currentValue2; - }, - }, - _threadCount: { - get() { - return context._threadCount; - }, - set(_threadCount: number) { - context._threadCount = _threadCount; - }, - }, - Consumer: { - get() { - return context.Consumer; - }, - }, - displayName: { - get() { - return context.displayName; - }, - set(displayName: void | string) {}, - }, - }); - (context: any).Consumer = Consumer; - } else { - (context: any).Consumer = context; - } - } - + context.Provider = context; + context.Consumer = { + $$typeof: REACT_CONSUMER_TYPE, + _context: context, + }; if (__DEV__) { context._currentRenderer = null; context._currentRenderer2 = null; diff --git a/packages/react/src/__tests__/ReactContextValidator-test.js b/packages/react/src/__tests__/ReactContextValidator-test.js index 96e46fa528..ff8f2b4215 100644 --- a/packages/react/src/__tests__/ReactContextValidator-test.js +++ b/packages/react/src/__tests__/ReactContextValidator-test.js @@ -490,7 +490,6 @@ describe('ReactContextValidator', () => { ]); }); - // @gate enableRenderableContext || !__DEV__ it('should warn if an invalid contextType is defined', async () => { const Context = React.createContext(); class ComponentA extends React.Component { diff --git a/packages/shared/ReactFeatureFlags.js b/packages/shared/ReactFeatureFlags.js index 5b483297ee..a1ea476b56 100644 --- a/packages/shared/ReactFeatureFlags.js +++ b/packages/shared/ReactFeatureFlags.js @@ -204,9 +204,6 @@ export const enableReactTestRendererWarning = true; // before removing them in stable in the next Major export const disableLegacyMode = true; -// Make equivalent to instead of -export const enableRenderableContext = true; - // ----------------------------------------------------------------------------- // Chopping Block // diff --git a/packages/shared/ReactSymbols.js b/packages/shared/ReactSymbols.js index 937c01cf75..2d478ffc67 100644 --- a/packages/shared/ReactSymbols.js +++ b/packages/shared/ReactSymbols.js @@ -22,7 +22,6 @@ export const REACT_PORTAL_TYPE: symbol = Symbol.for('react.portal'); export const REACT_FRAGMENT_TYPE: symbol = Symbol.for('react.fragment'); export const REACT_STRICT_MODE_TYPE: symbol = Symbol.for('react.strict_mode'); export const REACT_PROFILER_TYPE: symbol = Symbol.for('react.profiler'); -export const REACT_PROVIDER_TYPE: symbol = Symbol.for('react.provider'); // TODO: Delete with enableRenderableContext export const REACT_CONSUMER_TYPE: symbol = Symbol.for('react.consumer'); export const REACT_CONTEXT_TYPE: symbol = Symbol.for('react.context'); export const REACT_FORWARD_REF_TYPE: symbol = Symbol.for('react.forward_ref'); diff --git a/packages/shared/forks/ReactFeatureFlags.native-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fb.js index 1fb2a24671..3dd11f4af4 100644 --- a/packages/shared/forks/ReactFeatureFlags.native-fb.js +++ b/packages/shared/forks/ReactFeatureFlags.native-fb.js @@ -58,7 +58,6 @@ export const enableProfilerCommitHooks = __PROFILE__; export const enableProfilerNestedUpdatePhase = __PROFILE__; export const enableProfilerTimer = __PROFILE__; export const enableReactTestRendererWarning = false; -export const enableRenderableContext = true; export const enableRetryLaneExpiration = false; export const enableSchedulingProfiler = __PROFILE__; export const enableComponentPerformanceTrack = false; diff --git a/packages/shared/forks/ReactFeatureFlags.native-oss.js b/packages/shared/forks/ReactFeatureFlags.native-oss.js index f514d53195..b1978f05a1 100644 --- a/packages/shared/forks/ReactFeatureFlags.native-oss.js +++ b/packages/shared/forks/ReactFeatureFlags.native-oss.js @@ -43,7 +43,6 @@ export const enableObjectFiber = false; export const enablePersistedModeClonedFlag = false; export const enablePostpone = false; export const enableReactTestRendererWarning = false; -export const enableRenderableContext = true; export const enableRetryLaneExpiration = false; export const enableSchedulingProfiler = __PROFILE__; export const enableComponentPerformanceTrack = false; diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.js index e2e2bf1c86..4a49fb7316 100644 --- a/packages/shared/forks/ReactFeatureFlags.test-renderer.js +++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.js @@ -89,7 +89,6 @@ export const enableFragmentRefs = false; export const disableLegacyMode = true; export const disableLegacyContext = true; export const disableLegacyContextForFunctionComponents = true; -export const enableRenderableContext = true; export const enableReactTestRendererWarning = true; export const disableDefaultPropsExceptForClasses = true; diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.native-fb.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.native-fb.js index 410eff7f34..c001a68557 100644 --- a/packages/shared/forks/ReactFeatureFlags.test-renderer.native-fb.js +++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.native-fb.js @@ -41,7 +41,6 @@ export const enableProfilerCommitHooks = __PROFILE__; export const enableProfilerNestedUpdatePhase = __PROFILE__; export const enableProfilerTimer = __PROFILE__; export const enableReactTestRendererWarning = false; -export const enableRenderableContext = true; export const enableRetryLaneExpiration = false; export const enableSchedulingProfiler = __PROFILE__; export const enableComponentPerformanceTrack = false; diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js index f5772dd7aa..f58e154d02 100644 --- a/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js +++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js @@ -38,7 +38,6 @@ export const enableUseEffectEventHook = false; export const favorSafetyOverHydrationPerf = true; export const enableLegacyFBSupport = false; export const enableMoveBefore = false; -export const enableRenderableContext = false; export const enableHiddenSubtreeInsertionEffectCleanup = true; export const enableRetryLaneExpiration = false; diff --git a/packages/shared/forks/ReactFeatureFlags.www-dynamic.js b/packages/shared/forks/ReactFeatureFlags.www-dynamic.js index 700aebb1cc..263d7ca048 100644 --- a/packages/shared/forks/ReactFeatureFlags.www-dynamic.js +++ b/packages/shared/forks/ReactFeatureFlags.www-dynamic.js @@ -21,7 +21,6 @@ export const enableDO_NOT_USE_disableStrictPassiveEffect = __VARIANT__; export const enableHiddenSubtreeInsertionEffectCleanup = __VARIANT__; export const enableNoCloningMemoCache = __VARIANT__; export const enableObjectFiber = __VARIANT__; -export const enableRenderableContext = __VARIANT__; export const enableRetryLaneExpiration = __VARIANT__; export const enableTransitionTracing = __VARIANT__; export const favorSafetyOverHydrationPerf = __VARIANT__; diff --git a/packages/shared/forks/ReactFeatureFlags.www.js b/packages/shared/forks/ReactFeatureFlags.www.js index afe652ce3e..807e86da2b 100644 --- a/packages/shared/forks/ReactFeatureFlags.www.js +++ b/packages/shared/forks/ReactFeatureFlags.www.js @@ -24,7 +24,6 @@ export const { enableInfiniteRenderLoopDetection, enableNoCloningMemoCache, enableObjectFiber, - enableRenderableContext, enableRetryLaneExpiration, enableTransitionTracing, enableTrustedTypesIntegration, diff --git a/packages/shared/getComponentNameFromType.js b/packages/shared/getComponentNameFromType.js index da5cba301e..7c7d5a4c10 100644 --- a/packages/shared/getComponentNameFromType.js +++ b/packages/shared/getComponentNameFromType.js @@ -18,7 +18,6 @@ import { REACT_PORTAL_TYPE, REACT_MEMO_TYPE, REACT_PROFILER_TYPE, - REACT_PROVIDER_TYPE, REACT_STRICT_MODE_TYPE, REACT_SUSPENSE_TYPE, REACT_SUSPENSE_LIST_TYPE, @@ -30,7 +29,6 @@ import { import { enableTransitionTracing, - enableRenderableContext, enableViewTransition, } from './ReactFeatureFlags'; @@ -106,27 +104,12 @@ export default function getComponentNameFromType(type: mixed): string | null { switch (type.$$typeof) { case REACT_PORTAL_TYPE: return 'Portal'; - case REACT_PROVIDER_TYPE: - if (enableRenderableContext) { - return null; - } else { - const provider = (type: any); - return getContextName(provider._context) + '.Provider'; - } case REACT_CONTEXT_TYPE: const context: ReactContext = (type: any); - if (enableRenderableContext) { - return getContextName(context) + '.Provider'; - } else { - return getContextName(context) + '.Consumer'; - } + return getContextName(context) + '.Provider'; case REACT_CONSUMER_TYPE: - if (enableRenderableContext) { - const consumer: ReactConsumerType = (type: any); - return getContextName(consumer._context) + '.Consumer'; - } else { - return null; - } + const consumer: ReactConsumerType = (type: any); + return getContextName(consumer._context) + '.Consumer'; case REACT_FORWARD_REF_TYPE: return getWrappedName(type, type.render, 'ForwardRef'); case REACT_MEMO_TYPE: