diff --git a/.github/workflows/runtime_commit_artifacts.yml b/.github/workflows/runtime_commit_artifacts.yml index 2809df18159f0..1b98673cd4dd6 100644 --- a/.github/workflows/runtime_commit_artifacts.yml +++ b/.github/workflows/runtime_commit_artifacts.yml @@ -164,10 +164,10 @@ jobs: # Delete the OSS renderers, these are sync'd to RN separately. RENDERER_FOLDER=$BASE_FOLDER/react-native-github/Libraries/Renderer/implementations/ - SHIM_FOLDER=$BASE_FOLDER/react-native-github/Libraries/Renderer/shims/ rm $RENDERER_FOLDER/ReactFabric-{dev,prod,profiling}.js # Delete the legacy renderer shim, this is not sync'd and will get deleted in the future. + SHIM_FOLDER=$BASE_FOLDER/react-native-github/Libraries/Renderer/shims/ rm $SHIM_FOLDER/ReactNative.js # Copy eslint-plugin-react-hooks diff --git a/packages/react-native-renderer/src/__tests__/ReactFabricAndNative-test.internal.js b/packages/react-native-renderer/src/__tests__/ReactFabricAndNative-test.internal.js index 4e0fcad9c80c3..0b2f46b4d5dca 100644 --- a/packages/react-native-renderer/src/__tests__/ReactFabricAndNative-test.internal.js +++ b/packages/react-native-renderer/src/__tests__/ReactFabricAndNative-test.internal.js @@ -40,6 +40,7 @@ describe('created with ReactFabric called with ReactNative', () => { require('react-native/Libraries/ReactPrivate/ReactNativePrivateInterface').getNativeTagFromPublicInstance; }); + // @gate !disableLegacyMode it('find Fabric instances with the RN renderer', () => { const View = createReactNativeComponentClass('RCTView', () => ({ validAttributes: {title: true}, @@ -60,6 +61,7 @@ describe('created with ReactFabric called with ReactNative', () => { expect(getNativeTagFromPublicInstance(instance)).toBe(2); }); + // @gate !disableLegacyMode it('find Fabric nodes with the RN renderer', () => { const View = createReactNativeComponentClass('RCTView', () => ({ validAttributes: {title: true}, @@ -80,6 +82,7 @@ describe('created with ReactFabric called with ReactNative', () => { expect(handle).toBe(2); }); + // @gate !disableLegacyMode it('dispatches commands on Fabric nodes with the RN renderer', () => { nativeFabricUIManager.dispatchCommand.mockClear(); const View = createReactNativeComponentClass('RCTView', () => ({ @@ -101,6 +104,7 @@ describe('created with ReactFabric called with ReactNative', () => { expect(UIManager.dispatchViewManagerCommand).not.toBeCalled(); }); + // @gate !disableLegacyMode it('dispatches sendAccessibilityEvent on Fabric nodes with the RN renderer', () => { nativeFabricUIManager.sendAccessibilityEvent.mockClear(); const View = createReactNativeComponentClass('RCTView', () => ({ @@ -143,6 +147,7 @@ describe('created with ReactNative called with ReactFabric', () => { .ReactNativeViewConfigRegistry.register; }); + // @gate !disableLegacyMode it('find Paper instances with the Fabric renderer', () => { const View = createReactNativeComponentClass('RCTView', () => ({ validAttributes: {title: true}, @@ -163,6 +168,7 @@ describe('created with ReactNative called with ReactFabric', () => { expect(instance._nativeTag).toBe(3); }); + // @gate !disableLegacyMode it('find Paper nodes with the Fabric renderer', () => { const View = createReactNativeComponentClass('RCTView', () => ({ validAttributes: {title: true}, @@ -183,6 +189,7 @@ describe('created with ReactNative called with ReactFabric', () => { expect(handle).toBe(3); }); + // @gate !disableLegacyMode it('dispatches commands on Paper nodes with the Fabric renderer', () => { UIManager.dispatchViewManagerCommand.mockReset(); const View = createReactNativeComponentClass('RCTView', () => ({ @@ -205,6 +212,7 @@ describe('created with ReactNative called with ReactFabric', () => { expect(nativeFabricUIManager.dispatchCommand).not.toBeCalled(); }); + // @gate !disableLegacyMode it('dispatches sendAccessibilityEvent on Paper nodes with the Fabric renderer', () => { ReactNativePrivateInterface.legacySendAccessibilityEvent.mockReset(); const View = createReactNativeComponentClass('RCTView', () => ({ diff --git a/packages/shared/forks/ReactFeatureFlags.native-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fb.js index afecaa685faa5..dd0bd8624f326 100644 --- a/packages/shared/forks/ReactFeatureFlags.native-fb.js +++ b/packages/shared/forks/ReactFeatureFlags.native-fb.js @@ -35,7 +35,7 @@ export const disableCommentsAsDOMContainers: boolean = true; export const disableInputAttributeSyncing: boolean = false; export const disableLegacyContext: boolean = false; export const disableLegacyContextForFunctionComponents: boolean = false; -export const disableLegacyMode: boolean = false; +export const disableLegacyMode: boolean = true; export const disableSchedulerTimeoutInWorkLoop: boolean = false; export const disableTextareaChildren: boolean = false; export const enableAsyncDebugInfo: boolean = false; diff --git a/packages/shared/forks/ReactFeatureFlags.native-oss.js b/packages/shared/forks/ReactFeatureFlags.native-oss.js index 7cabeb526a2bc..555307cef00a7 100644 --- a/packages/shared/forks/ReactFeatureFlags.native-oss.js +++ b/packages/shared/forks/ReactFeatureFlags.native-oss.js @@ -21,7 +21,7 @@ export const disableCommentsAsDOMContainers: boolean = true; export const disableInputAttributeSyncing: boolean = false; export const disableLegacyContext: boolean = true; export const disableLegacyContextForFunctionComponents: boolean = true; -export const disableLegacyMode: boolean = false; +export const disableLegacyMode: boolean = true; export const disableSchedulerTimeoutInWorkLoop: boolean = false; export const disableTextareaChildren: boolean = false; export const enableAsyncDebugInfo: boolean = false; diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.native-fb.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.native-fb.js index eb56da603d309..0ff044250cb2e 100644 --- a/packages/shared/forks/ReactFeatureFlags.test-renderer.native-fb.js +++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.native-fb.js @@ -16,7 +16,7 @@ export const disableCommentsAsDOMContainers = true; export const disableInputAttributeSyncing = false; export const disableLegacyContext = false; export const disableLegacyContextForFunctionComponents = false; -export const disableLegacyMode = false; +export const disableLegacyMode = true; export const disableSchedulerTimeoutInWorkLoop = false; export const disableTextareaChildren = false; export const enableAsyncDebugInfo = false;