From d025ddd3b954dfc52ad7e6a036913946a8ca2644 Mon Sep 17 00:00:00 2001 From: Jan Kassens Date: Mon, 22 Jul 2024 11:50:35 -0400 Subject: [PATCH] Set enableFastJSX flag to true (#30343) When these to diffs are landed, we can merge this - [x] D59772879 - [x] D59773043 --- packages/react/src/__tests__/ReactJSXRuntime-test.js | 2 +- packages/react/src/jsx/ReactJSXElement.js | 9 +++------ packages/shared/ReactFeatureFlags.js | 1 - .../shared/forks/ReactFeatureFlags.native-fb-dynamic.js | 1 - packages/shared/forks/ReactFeatureFlags.native-fb.js | 1 - packages/shared/forks/ReactFeatureFlags.native-oss.js | 1 - packages/shared/forks/ReactFeatureFlags.test-renderer.js | 1 - .../forks/ReactFeatureFlags.test-renderer.native-fb.js | 1 - .../shared/forks/ReactFeatureFlags.test-renderer.www.js | 1 - packages/shared/forks/ReactFeatureFlags.www-dynamic.js | 1 - packages/shared/forks/ReactFeatureFlags.www.js | 1 - 11 files changed, 4 insertions(+), 16 deletions(-) diff --git a/packages/react/src/__tests__/ReactJSXRuntime-test.js b/packages/react/src/__tests__/ReactJSXRuntime-test.js index 8a63eca326..90316cbd70 100644 --- a/packages/react/src/__tests__/ReactJSXRuntime-test.js +++ b/packages/react/src/__tests__/ReactJSXRuntime-test.js @@ -377,7 +377,7 @@ describe('ReactJSXRuntime', () => { expect(didCall).toBe(false); }); - // @gate enableFastJSX && enableRefAsProp + // @gate enableRefAsProp it('does not clone props object if key and ref is not spread', async () => { const config = { foo: 'foo', diff --git a/packages/react/src/jsx/ReactJSXElement.js b/packages/react/src/jsx/ReactJSXElement.js index 1652b1e2ed..a0de9c8e14 100644 --- a/packages/react/src/jsx/ReactJSXElement.js +++ b/packages/react/src/jsx/ReactJSXElement.js @@ -23,7 +23,6 @@ import { enableRefAsProp, disableStringRefs, disableDefaultPropsExceptForClasses, - enableFastJSX, enableOwnerStacks, } from 'shared/ReactFeatureFlags'; import {checkPropStringCoercion} from 'shared/CheckStringCoercion'; @@ -82,9 +81,7 @@ if (__DEV__) { didWarnAboutElementRef = {}; } -const enableFastJSXWithStringRefs = enableFastJSX && enableRefAsProp; -const enableFastJSXWithoutStringRefs = - enableFastJSXWithStringRefs && disableStringRefs; +const enableFastJSXWithoutStringRefs = enableRefAsProp && disableStringRefs; function hasValidRef(config) { if (__DEV__) { @@ -416,7 +413,7 @@ export function jsxProd(type, config, maybeKey) { let props; if ( (enableFastJSXWithoutStringRefs || - (enableFastJSXWithStringRefs && !('ref' in config))) && + (enableRefAsProp && !('ref' in config))) && !('key' in config) ) { // If key was not spread in, we can reuse the original props object. This @@ -701,7 +698,7 @@ function jsxDEVImpl( let props; if ( (enableFastJSXWithoutStringRefs || - (enableFastJSXWithStringRefs && !('ref' in config))) && + (enableRefAsProp && !('ref' in config))) && !('key' in config) ) { // If key was not spread in, we can reuse the original props object. This diff --git a/packages/shared/ReactFeatureFlags.js b/packages/shared/ReactFeatureFlags.js index 3c2089cb19..2e7c9ffea4 100644 --- a/packages/shared/ReactFeatureFlags.js +++ b/packages/shared/ReactFeatureFlags.js @@ -195,7 +195,6 @@ export const enableInfiniteRenderLoopDetection = true; // during element creation. export const enableRefAsProp = true; export const disableStringRefs = true; -export const enableFastJSX = true; // Warn on any usage of ReactTestRenderer export const enableReactTestRendererWarning = true; diff --git a/packages/shared/forks/ReactFeatureFlags.native-fb-dynamic.js b/packages/shared/forks/ReactFeatureFlags.native-fb-dynamic.js index 714c6baf75..a7016626c6 100644 --- a/packages/shared/forks/ReactFeatureFlags.native-fb-dynamic.js +++ b/packages/shared/forks/ReactFeatureFlags.native-fb-dynamic.js @@ -19,7 +19,6 @@ export const alwaysThrottleRetries = __VARIANT__; export const enableAddPropertiesFastPath = __VARIANT__; -export const enableFastJSX = __VARIANT__; export const enableObjectFiber = __VARIANT__; export const enableShallowPropDiffing = __VARIANT__; export const passChildrenWhenCloningPersistedNodes = __VARIANT__; diff --git a/packages/shared/forks/ReactFeatureFlags.native-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fb.js index b37f2f4fa0..8a5f784ea9 100644 --- a/packages/shared/forks/ReactFeatureFlags.native-fb.js +++ b/packages/shared/forks/ReactFeatureFlags.native-fb.js @@ -21,7 +21,6 @@ const dynamicFlags: DynamicExportsType = (dynamicFlagsUntyped: any); export const { alwaysThrottleRetries, enableAddPropertiesFastPath, - enableFastJSX, enableObjectFiber, enableShallowPropDiffing, passChildrenWhenCloningPersistedNodes, diff --git a/packages/shared/forks/ReactFeatureFlags.native-oss.js b/packages/shared/forks/ReactFeatureFlags.native-oss.js index 3ef19e4b12..e1780bf019 100644 --- a/packages/shared/forks/ReactFeatureFlags.native-oss.js +++ b/packages/shared/forks/ReactFeatureFlags.native-oss.js @@ -45,7 +45,6 @@ export const enableCreateEventHandleAPI = false; export const enableDebugTracing = false; export const enableDeferRootSchedulingToMicrotask = true; export const enableDO_NOT_USE_disableStrictPassiveEffect = false; -export const enableFastJSX = true; export const enableFilterEmptyStringAttributesDOM = true; export const enableFizzExternalRuntime = true; export const enableFlightReadableStream = true; diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.js index 5b01abdb49..4208674d50 100644 --- a/packages/shared/forks/ReactFeatureFlags.test-renderer.js +++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.js @@ -89,7 +89,6 @@ export const enableShallowPropDiffing = false; // const __NEXT_MAJOR__ = __EXPERIMENTAL__; export const enableRefAsProp = true; export const disableStringRefs = true; -export const enableFastJSX = true; export const disableLegacyMode = true; export const disableLegacyContext = true; export const disableLegacyContextForFunctionComponents = true; diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.native-fb.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.native-fb.js index ebb8964a5b..f23cdfe813 100644 --- a/packages/shared/forks/ReactFeatureFlags.test-renderer.native-fb.js +++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.native-fb.js @@ -37,7 +37,6 @@ export const enableCreateEventHandleAPI = false; export const enableDebugTracing = false; export const enableDeferRootSchedulingToMicrotask = true; export const enableDO_NOT_USE_disableStrictPassiveEffect = false; -export const enableFastJSX = true; export const enableFilterEmptyStringAttributesDOM = true; export const enableFizzExternalRuntime = true; export const enableFlightReadableStream = true; diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js index 026c2be4f8..1364d2b81a 100644 --- a/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js +++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js @@ -81,7 +81,6 @@ export const enableInfiniteRenderLoopDetection = false; export const enableRefAsProp = true; export const disableStringRefs = false; -export const enableFastJSX = false; export const enableReactTestRendererWarning = false; export const disableLegacyMode = true; diff --git a/packages/shared/forks/ReactFeatureFlags.www-dynamic.js b/packages/shared/forks/ReactFeatureFlags.www-dynamic.js index 34a8ff82fa..49814e0d9d 100644 --- a/packages/shared/forks/ReactFeatureFlags.www-dynamic.js +++ b/packages/shared/forks/ReactFeatureFlags.www-dynamic.js @@ -21,7 +21,6 @@ export const disableSchedulerTimeoutInWorkLoop = __VARIANT__; export const enableAddPropertiesFastPath = __VARIANT__; export const enableDeferRootSchedulingToMicrotask = __VARIANT__; export const enableDO_NOT_USE_disableStrictPassiveEffect = __VARIANT__; -export const enableFastJSX = __VARIANT__; export const enableLazyContextPropagation = __VARIANT__; export const enableNoCloningMemoCache = __VARIANT__; export const enableObjectFiber = __VARIANT__; diff --git a/packages/shared/forks/ReactFeatureFlags.www.js b/packages/shared/forks/ReactFeatureFlags.www.js index 3671f40ad8..ef118515c0 100644 --- a/packages/shared/forks/ReactFeatureFlags.www.js +++ b/packages/shared/forks/ReactFeatureFlags.www.js @@ -23,7 +23,6 @@ export const { enableDebugTracing, enableDeferRootSchedulingToMicrotask, enableDO_NOT_USE_disableStrictPassiveEffect, - enableFastJSX, enableInfiniteRenderLoopDetection, enableLazyContextPropagation, enableNoCloningMemoCache,