From 4e0dfedd51b23c2dd95bc4629614c3402ef8b3d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Norte?= Date: Tue, 28 Mar 2023 04:31:49 -0700 Subject: [PATCH] Move ReactFabricPublicInstance out of the Renderer directory Summary: The `Renderer` directory is supposed to be only for files synced from the React repo. This moves the `public` directory that was added to it recently to the `ReactNative` directory. Changelog: [internal] bypass-github-export-checks Reviewed By: sammy-SC Differential Revision: D44421951 fbshipit-source-id: d098970b80cd467b5c772c3ae91ce716be373484 --- jest.config.js | 3 +-- .../Libraries/Animated/useAnimatedProps.js | 2 +- .../ScrollView/ScrollViewStickyHeader.js | 2 +- .../ReactFabricPublicInstance.js | 6 +++--- .../ReactFabricPublicInstanceUtils.js | 0 .../ReactNativeAttributePayload.js | 2 +- .../ReactFabricPublicInstance-test.js | 6 +++--- .../ReactNativePrivateInterface.js | 18 ++++++++++-------- 8 files changed, 20 insertions(+), 19 deletions(-) rename packages/react-native/Libraries/{Renderer/public => ReactNative/ReactFabricPublicInstance}/ReactFabricPublicInstance.js (96%) rename packages/react-native/Libraries/{Renderer/public => ReactNative/ReactFabricPublicInstance}/ReactFabricPublicInstanceUtils.js (100%) rename packages/react-native/Libraries/{Renderer/public => ReactNative/ReactFabricPublicInstance}/ReactNativeAttributePayload.js (99%) rename packages/react-native/Libraries/{Renderer/public => ReactNative/ReactFabricPublicInstance}/__tests__/ReactFabricPublicInstance-test.js (97%) diff --git a/jest.config.js b/jest.config.js index b603f7fedbc..3a64c4abd9b 100644 --- a/jest.config.js +++ b/jest.config.js @@ -28,8 +28,7 @@ module.exports = { testPathIgnorePatterns: [ '/node_modules/', '/packages/react-native/template', - '/packages/react-native/Libraries/Renderer/implementations', - '/packages/react-native/Libraries/Renderer/shims', + '/packages/react-native/Libraries/Renderer', '/packages/rn-tester/e2e', ], transformIgnorePatterns: ['node_modules/(?!@react-native/)'], diff --git a/packages/react-native/Libraries/Animated/useAnimatedProps.js b/packages/react-native/Libraries/Animated/useAnimatedProps.js index ac64cc88a39..865bddd8ca3 100644 --- a/packages/react-native/Libraries/Animated/useAnimatedProps.js +++ b/packages/react-native/Libraries/Animated/useAnimatedProps.js @@ -10,7 +10,7 @@ 'use strict'; -import {isPublicInstance as isFabricPublicInstance} from '../Renderer/public/ReactFabricPublicInstanceUtils'; +import {isPublicInstance as isFabricPublicInstance} from '../ReactNative/ReactFabricPublicInstance/ReactFabricPublicInstanceUtils'; import useRefEffect from '../Utilities/useRefEffect'; import {AnimatedEvent} from './AnimatedEvent'; import NativeAnimatedHelper from './NativeAnimatedHelper'; diff --git a/packages/react-native/Libraries/Components/ScrollView/ScrollViewStickyHeader.js b/packages/react-native/Libraries/Components/ScrollView/ScrollViewStickyHeader.js index 4afb130d4d9..866c4e97aab 100644 --- a/packages/react-native/Libraries/Components/ScrollView/ScrollViewStickyHeader.js +++ b/packages/react-native/Libraries/Components/ScrollView/ScrollViewStickyHeader.js @@ -11,7 +11,7 @@ import type {LayoutEvent} from '../../Types/CoreEventTypes'; import Animated from '../../Animated/Animated'; -import {isPublicInstance as isFabricPublicInstance} from '../../Renderer/public/ReactFabricPublicInstanceUtils'; +import {isPublicInstance as isFabricPublicInstance} from '../../ReactNative/ReactFabricPublicInstance/ReactFabricPublicInstanceUtils'; import StyleSheet from '../../StyleSheet/StyleSheet'; import Platform from '../../Utilities/Platform'; import useMergeRefs from '../../Utilities/useMergeRefs'; diff --git a/packages/react-native/Libraries/Renderer/public/ReactFabricPublicInstance.js b/packages/react-native/Libraries/ReactNative/ReactFabricPublicInstance/ReactFabricPublicInstance.js similarity index 96% rename from packages/react-native/Libraries/Renderer/public/ReactFabricPublicInstance.js rename to packages/react-native/Libraries/ReactNative/ReactFabricPublicInstance/ReactFabricPublicInstance.js index 379778af4c8..dd010f27a98 100644 --- a/packages/react-native/Libraries/Renderer/public/ReactFabricPublicInstance.js +++ b/packages/react-native/Libraries/ReactNative/ReactFabricPublicInstance/ReactFabricPublicInstance.js @@ -16,12 +16,12 @@ import type { MeasureLayoutOnSuccessCallback, MeasureOnSuccessCallback, ViewConfig, -} from '../shims/ReactNativeTypes'; +} from '../../Renderer/shims/ReactNativeTypes'; import type {ElementRef} from 'react'; import TextInputState from '../../Components/TextInput/TextInputState'; -import {getFabricUIManager} from '../../ReactNative/FabricUIManager'; -import {getNodeFromInternalInstanceHandle} from '../shims/ReactFabric'; +import {getNodeFromInternalInstanceHandle} from '../../Renderer/shims/ReactFabric'; +import {getFabricUIManager} from '../FabricUIManager'; import {create} from './ReactNativeAttributePayload'; import nullthrows from 'nullthrows'; diff --git a/packages/react-native/Libraries/Renderer/public/ReactFabricPublicInstanceUtils.js b/packages/react-native/Libraries/ReactNative/ReactFabricPublicInstance/ReactFabricPublicInstanceUtils.js similarity index 100% rename from packages/react-native/Libraries/Renderer/public/ReactFabricPublicInstanceUtils.js rename to packages/react-native/Libraries/ReactNative/ReactFabricPublicInstance/ReactFabricPublicInstanceUtils.js diff --git a/packages/react-native/Libraries/Renderer/public/ReactNativeAttributePayload.js b/packages/react-native/Libraries/ReactNative/ReactFabricPublicInstance/ReactNativeAttributePayload.js similarity index 99% rename from packages/react-native/Libraries/Renderer/public/ReactNativeAttributePayload.js rename to packages/react-native/Libraries/ReactNative/ReactFabricPublicInstance/ReactNativeAttributePayload.js index f65edd1fbab..0cc9ba81395 100644 --- a/packages/react-native/Libraries/Renderer/public/ReactNativeAttributePayload.js +++ b/packages/react-native/Libraries/ReactNative/ReactFabricPublicInstance/ReactNativeAttributePayload.js @@ -8,7 +8,7 @@ * @flow */ -import type {AttributeConfiguration} from '../shims/ReactNativeTypes'; +import type {AttributeConfiguration} from '../../Renderer/shims/ReactNativeTypes'; import flattenStyle from '../../StyleSheet/flattenStyle'; import deepDiffer from '../../Utilities/differ/deepDiffer'; diff --git a/packages/react-native/Libraries/Renderer/public/__tests__/ReactFabricPublicInstance-test.js b/packages/react-native/Libraries/ReactNative/ReactFabricPublicInstance/__tests__/ReactFabricPublicInstance-test.js similarity index 97% rename from packages/react-native/Libraries/Renderer/public/__tests__/ReactFabricPublicInstance-test.js rename to packages/react-native/Libraries/ReactNative/ReactFabricPublicInstance/__tests__/ReactFabricPublicInstance-test.js index 72bcd7741c3..e2987243b82 100644 --- a/packages/react-native/Libraries/Renderer/public/__tests__/ReactFabricPublicInstance-test.js +++ b/packages/react-native/Libraries/ReactNative/ReactFabricPublicInstance/__tests__/ReactFabricPublicInstance-test.js @@ -9,15 +9,15 @@ * @oncall react_native */ -import type {HostComponent} from '../../shims/ReactNativeTypes'; +import type {HostComponent} from '../../../Renderer/shims/ReactNativeTypes'; import * as React from 'react'; import {act} from 'react-test-renderer'; const TextInputState = require('../../../Components/TextInput/TextInputState'); const FabricUIManager = require('../../../ReactNative/FabricUIManager'); -const ReactFabric = require('../../shims/ReactFabric'); -const ReactNativeViewConfigRegistry = require('../../shims/ReactNativeViewConfigRegistry'); +const ReactFabric = require('../../../Renderer/shims/ReactFabric'); +const ReactNativeViewConfigRegistry = require('../../../Renderer/shims/ReactNativeViewConfigRegistry'); const nullthrows = require('nullthrows'); jest.mock('../../../ReactNative/FabricUIManager', () => diff --git a/packages/react-native/Libraries/ReactPrivate/ReactNativePrivateInterface.js b/packages/react-native/Libraries/ReactPrivate/ReactNativePrivateInterface.js index 92c707d7e3b..69a1709b60a 100644 --- a/packages/react-native/Libraries/ReactPrivate/ReactNativePrivateInterface.js +++ b/packages/react-native/Libraries/ReactPrivate/ReactNativePrivateInterface.js @@ -16,16 +16,16 @@ import typeof RawEventEmitter from '../Core/RawEventEmitter'; import typeof ReactFiberErrorDialog from '../Core/ReactFiberErrorDialog'; import typeof RCTEventEmitter from '../EventEmitter/RCTEventEmitter'; import typeof CustomEvent from '../Events/CustomEvent'; -import typeof UIManager from '../ReactNative/UIManager'; import typeof { createPublicInstance, getNativeTagFromPublicInstance, getNodeFromPublicInstance, -} from '../Renderer/public/ReactFabricPublicInstance'; +} from '../ReactNative/ReactFabricPublicInstance/ReactFabricPublicInstance'; import typeof { create as createAttributePayload, diff as diffAttributePayloads, -} from '../Renderer/public/ReactNativeAttributePayload'; +} from '../ReactNative/ReactFabricPublicInstance/ReactNativeAttributePayload'; +import typeof UIManager from '../ReactNative/UIManager'; import typeof ReactNativeViewConfigRegistry from '../Renderer/shims/ReactNativeViewConfigRegistry'; import typeof flattenStyle from '../StyleSheet/flattenStyle'; import type {DangerouslyImpreciseStyleProp} from '../StyleSheet/StyleSheet'; @@ -83,21 +83,23 @@ module.exports = { return require('../Events/CustomEvent').default; }, get createAttributePayload(): createAttributePayload { - return require('../Renderer/public/ReactNativeAttributePayload').create; + return require('../ReactNative/ReactFabricPublicInstance/ReactNativeAttributePayload') + .create; }, get diffAttributePayloads(): diffAttributePayloads { - return require('../Renderer/public/ReactNativeAttributePayload').diff; + return require('../ReactNative/ReactFabricPublicInstance/ReactNativeAttributePayload') + .diff; }, get createPublicInstance(): createPublicInstance { - return require('../Renderer/public/ReactFabricPublicInstance') + return require('../ReactNative/ReactFabricPublicInstance/ReactFabricPublicInstance') .createPublicInstance; }, get getNativeTagFromPublicInstance(): getNativeTagFromPublicInstance { - return require('../Renderer/public/ReactFabricPublicInstance') + return require('../ReactNative/ReactFabricPublicInstance/ReactFabricPublicInstance') .getNativeTagFromPublicInstance; }, get getNodeFromPublicInstance(): getNodeFromPublicInstance { - return require('../Renderer/public/ReactFabricPublicInstance') + return require('../ReactNative/ReactFabricPublicInstance/ReactFabricPublicInstance') .getNodeFromPublicInstance; }, };