Skip to content

Commit 4e0dfed

Browse files
rubennortefacebook-github-bot
authored andcommitted
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
1 parent 871f294 commit 4e0dfed

8 files changed

Lines changed: 20 additions & 19 deletions

File tree

jest.config.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ module.exports = {
2828
testPathIgnorePatterns: [
2929
'/node_modules/',
3030
'<rootDir>/packages/react-native/template',
31-
'<rootDir>/packages/react-native/Libraries/Renderer/implementations',
32-
'<rootDir>/packages/react-native/Libraries/Renderer/shims',
31+
'<rootDir>/packages/react-native/Libraries/Renderer',
3332
'<rootDir>/packages/rn-tester/e2e',
3433
],
3534
transformIgnorePatterns: ['node_modules/(?!@react-native/)'],

packages/react-native/Libraries/Animated/useAnimatedProps.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
'use strict';
1212

13-
import {isPublicInstance as isFabricPublicInstance} from '../Renderer/public/ReactFabricPublicInstanceUtils';
13+
import {isPublicInstance as isFabricPublicInstance} from '../ReactNative/ReactFabricPublicInstance/ReactFabricPublicInstanceUtils';
1414
import useRefEffect from '../Utilities/useRefEffect';
1515
import {AnimatedEvent} from './AnimatedEvent';
1616
import NativeAnimatedHelper from './NativeAnimatedHelper';

packages/react-native/Libraries/Components/ScrollView/ScrollViewStickyHeader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import type {LayoutEvent} from '../../Types/CoreEventTypes';
1212

1313
import Animated from '../../Animated/Animated';
14-
import {isPublicInstance as isFabricPublicInstance} from '../../Renderer/public/ReactFabricPublicInstanceUtils';
14+
import {isPublicInstance as isFabricPublicInstance} from '../../ReactNative/ReactFabricPublicInstance/ReactFabricPublicInstanceUtils';
1515
import StyleSheet from '../../StyleSheet/StyleSheet';
1616
import Platform from '../../Utilities/Platform';
1717
import useMergeRefs from '../../Utilities/useMergeRefs';

packages/react-native/Libraries/Renderer/public/ReactFabricPublicInstance.js renamed to packages/react-native/Libraries/ReactNative/ReactFabricPublicInstance/ReactFabricPublicInstance.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ import type {
1616
MeasureLayoutOnSuccessCallback,
1717
MeasureOnSuccessCallback,
1818
ViewConfig,
19-
} from '../shims/ReactNativeTypes';
19+
} from '../../Renderer/shims/ReactNativeTypes';
2020
import type {ElementRef} from 'react';
2121

2222
import TextInputState from '../../Components/TextInput/TextInputState';
23-
import {getFabricUIManager} from '../../ReactNative/FabricUIManager';
24-
import {getNodeFromInternalInstanceHandle} from '../shims/ReactFabric';
23+
import {getNodeFromInternalInstanceHandle} from '../../Renderer/shims/ReactFabric';
24+
import {getFabricUIManager} from '../FabricUIManager';
2525
import {create} from './ReactNativeAttributePayload';
2626
import nullthrows from 'nullthrows';
2727

packages/react-native/Libraries/Renderer/public/ReactFabricPublicInstanceUtils.js renamed to packages/react-native/Libraries/ReactNative/ReactFabricPublicInstance/ReactFabricPublicInstanceUtils.js

File renamed without changes.

packages/react-native/Libraries/Renderer/public/ReactNativeAttributePayload.js renamed to packages/react-native/Libraries/ReactNative/ReactFabricPublicInstance/ReactNativeAttributePayload.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* @flow
99
*/
1010

11-
import type {AttributeConfiguration} from '../shims/ReactNativeTypes';
11+
import type {AttributeConfiguration} from '../../Renderer/shims/ReactNativeTypes';
1212

1313
import flattenStyle from '../../StyleSheet/flattenStyle';
1414
import deepDiffer from '../../Utilities/differ/deepDiffer';

packages/react-native/Libraries/Renderer/public/__tests__/ReactFabricPublicInstance-test.js renamed to packages/react-native/Libraries/ReactNative/ReactFabricPublicInstance/__tests__/ReactFabricPublicInstance-test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
* @oncall react_native
1010
*/
1111

12-
import type {HostComponent} from '../../shims/ReactNativeTypes';
12+
import type {HostComponent} from '../../../Renderer/shims/ReactNativeTypes';
1313

1414
import * as React from 'react';
1515
import {act} from 'react-test-renderer';
1616

1717
const TextInputState = require('../../../Components/TextInput/TextInputState');
1818
const FabricUIManager = require('../../../ReactNative/FabricUIManager');
19-
const ReactFabric = require('../../shims/ReactFabric');
20-
const ReactNativeViewConfigRegistry = require('../../shims/ReactNativeViewConfigRegistry');
19+
const ReactFabric = require('../../../Renderer/shims/ReactFabric');
20+
const ReactNativeViewConfigRegistry = require('../../../Renderer/shims/ReactNativeViewConfigRegistry');
2121
const nullthrows = require('nullthrows');
2222

2323
jest.mock('../../../ReactNative/FabricUIManager', () =>

packages/react-native/Libraries/ReactPrivate/ReactNativePrivateInterface.js

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ import typeof RawEventEmitter from '../Core/RawEventEmitter';
1616
import typeof ReactFiberErrorDialog from '../Core/ReactFiberErrorDialog';
1717
import typeof RCTEventEmitter from '../EventEmitter/RCTEventEmitter';
1818
import typeof CustomEvent from '../Events/CustomEvent';
19-
import typeof UIManager from '../ReactNative/UIManager';
2019
import typeof {
2120
createPublicInstance,
2221
getNativeTagFromPublicInstance,
2322
getNodeFromPublicInstance,
24-
} from '../Renderer/public/ReactFabricPublicInstance';
23+
} from '../ReactNative/ReactFabricPublicInstance/ReactFabricPublicInstance';
2524
import typeof {
2625
create as createAttributePayload,
2726
diff as diffAttributePayloads,
28-
} from '../Renderer/public/ReactNativeAttributePayload';
27+
} from '../ReactNative/ReactFabricPublicInstance/ReactNativeAttributePayload';
28+
import typeof UIManager from '../ReactNative/UIManager';
2929
import typeof ReactNativeViewConfigRegistry from '../Renderer/shims/ReactNativeViewConfigRegistry';
3030
import typeof flattenStyle from '../StyleSheet/flattenStyle';
3131
import type {DangerouslyImpreciseStyleProp} from '../StyleSheet/StyleSheet';
@@ -83,21 +83,23 @@ module.exports = {
8383
return require('../Events/CustomEvent').default;
8484
},
8585
get createAttributePayload(): createAttributePayload {
86-
return require('../Renderer/public/ReactNativeAttributePayload').create;
86+
return require('../ReactNative/ReactFabricPublicInstance/ReactNativeAttributePayload')
87+
.create;
8788
},
8889
get diffAttributePayloads(): diffAttributePayloads {
89-
return require('../Renderer/public/ReactNativeAttributePayload').diff;
90+
return require('../ReactNative/ReactFabricPublicInstance/ReactNativeAttributePayload')
91+
.diff;
9092
},
9193
get createPublicInstance(): createPublicInstance {
92-
return require('../Renderer/public/ReactFabricPublicInstance')
94+
return require('../ReactNative/ReactFabricPublicInstance/ReactFabricPublicInstance')
9395
.createPublicInstance;
9496
},
9597
get getNativeTagFromPublicInstance(): getNativeTagFromPublicInstance {
96-
return require('../Renderer/public/ReactFabricPublicInstance')
98+
return require('../ReactNative/ReactFabricPublicInstance/ReactFabricPublicInstance')
9799
.getNativeTagFromPublicInstance;
98100
},
99101
get getNodeFromPublicInstance(): getNodeFromPublicInstance {
100-
return require('../Renderer/public/ReactFabricPublicInstance')
102+
return require('../ReactNative/ReactFabricPublicInstance/ReactFabricPublicInstance')
101103
.getNodeFromPublicInstance;
102104
},
103105
};

0 commit comments

Comments
 (0)