Skip to content

Commit 0bde08f

Browse files
huntiefacebook-github-bot
authored andcommitted
Move Libraries/Inspector/ to src/private/ (#49022)
Summary: Pull Request resolved: #49022 These modules support the in-app Inspector Overlay. Breaking change that's unlikely to hit any users. Unreferenced by Expo. Changelog: [General][Breaking] Move `Libraries/Inspector/` modules to `src/private/` Reviewed By: cortinico Differential Revision: D68781896 fbshipit-source-id: 8fcd72d56684319019f64a375c2e2ef317a47c13
1 parent 9a9aa19 commit 0bde08f

15 files changed

+75
-290
lines changed

packages/react-native/Libraries/ReactNative/AppContainer-dev.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ const InspectorDeferred = ({
5252
}: InspectorDeferredProps) => {
5353
// D39382967 adds a require cycle: InitializeCore -> AppContainer -> Inspector -> InspectorPanel -> ScrollView -> InitializeCore
5454
// We can't remove it yet, fallback to dynamic require for now. This is the only reason why this logic is in a separate function.
55-
const Inspector = require('../Inspector/Inspector').default;
55+
const Inspector = require('../../src/private/inspector/Inspector').default;
5656

5757
return (
5858
<Inspector
@@ -73,7 +73,7 @@ const ReactDevToolsOverlayDeferred = ({
7373
reactDevToolsAgent,
7474
}: ReactDevToolsOverlayDeferredProps) => {
7575
const ReactDevToolsOverlay =
76-
require('../Inspector/ReactDevToolsOverlay').default;
76+
require('../../src/private/inspector/ReactDevToolsOverlay').default;
7777

7878
return (
7979
<ReactDevToolsOverlay

packages/react-native/Libraries/__tests__/__snapshots__/public-api-test.js.snap

-222
Original file line numberDiff line numberDiff line change
@@ -5135,228 +5135,6 @@ declare module.exports: resolveAssetSource;
51355135
"
51365136
`;
51375137

5138-
exports[`public API should not change unintentionally Libraries/Inspector/BorderBox.js 1`] = `
5139-
"type Props = $ReadOnly<{
5140-
children: React.Node,
5141-
box?: ?$ReadOnly<{
5142-
top: number,
5143-
right: number,
5144-
bottom: number,
5145-
left: number,
5146-
...
5147-
}>,
5148-
style?: ViewStyleProp,
5149-
}>;
5150-
declare function BorderBox(Props): React.Node;
5151-
declare export default typeof BorderBox;
5152-
"
5153-
`;
5154-
5155-
exports[`public API should not change unintentionally Libraries/Inspector/BoxInspector.js 1`] = `
5156-
"type BoxInspectorProps = $ReadOnly<{
5157-
style: ViewStyleProp,
5158-
frame: ?InspectedElementFrame,
5159-
}>;
5160-
declare function BoxInspector(BoxInspectorProps): React.Node;
5161-
declare export default typeof BoxInspector;
5162-
"
5163-
`;
5164-
5165-
exports[`public API should not change unintentionally Libraries/Inspector/ElementBox.js 1`] = `
5166-
"type Props = $ReadOnly<{
5167-
frame: InspectedElementFrame,
5168-
style?: ?ViewStyleProp,
5169-
}>;
5170-
declare function ElementBox(Props): React.Node;
5171-
declare export default typeof ElementBox;
5172-
"
5173-
`;
5174-
5175-
exports[`public API should not change unintentionally Libraries/Inspector/ElementProperties.js 1`] = `
5176-
"type Props = $ReadOnly<{
5177-
hierarchy: ?InspectorData[\\"hierarchy\\"],
5178-
style?: ?ViewStyleProp,
5179-
frame?: ?Object,
5180-
selection?: ?number,
5181-
setSelection?: (number) => mixed,
5182-
}>;
5183-
declare class ElementProperties extends React.Component<Props> {
5184-
render(): React.Node;
5185-
}
5186-
declare export default typeof ElementProperties;
5187-
"
5188-
`;
5189-
5190-
exports[`public API should not change unintentionally Libraries/Inspector/Inspector.js 1`] = `
5191-
"export type InspectedElementFrame = TouchedViewDataAtPoint[\\"frame\\"];
5192-
export type InspectedElement = $ReadOnly<{
5193-
frame: InspectedElementFrame,
5194-
style?: ViewStyleProp,
5195-
}>;
5196-
export type ElementsHierarchy = InspectorData[\\"hierarchy\\"];
5197-
type Props = {
5198-
inspectedViewRef: InspectedViewRef,
5199-
onRequestRerenderApp: () => void,
5200-
reactDevToolsAgent?: ReactDevToolsAgent,
5201-
};
5202-
declare function Inspector(Props): React.Node;
5203-
declare export default typeof Inspector;
5204-
"
5205-
`;
5206-
5207-
exports[`public API should not change unintentionally Libraries/Inspector/InspectorOverlay.js 1`] = `
5208-
"type Props = $ReadOnly<{
5209-
inspected?: ?InspectedElement,
5210-
onTouchPoint: (locationX: number, locationY: number) => void,
5211-
}>;
5212-
declare function InspectorOverlay(Props): React.Node;
5213-
declare export default typeof InspectorOverlay;
5214-
"
5215-
`;
5216-
5217-
exports[`public API should not change unintentionally Libraries/Inspector/InspectorPanel.js 1`] = `
5218-
"type Props = $ReadOnly<{
5219-
devtoolsIsOpen: boolean,
5220-
inspecting: boolean,
5221-
setInspecting: (val: boolean) => void,
5222-
perfing: boolean,
5223-
setPerfing: (val: boolean) => void,
5224-
touchTargeting: boolean,
5225-
setTouchTargeting: (val: boolean) => void,
5226-
networking: boolean,
5227-
setNetworking: (val: boolean) => void,
5228-
hierarchy?: ?ElementsHierarchy,
5229-
selection?: ?number,
5230-
setSelection: (number) => mixed,
5231-
inspected?: ?InspectedElement,
5232-
}>;
5233-
declare class InspectorPanel extends React.Component<Props> {
5234-
renderWaiting(): React.Node;
5235-
render(): React.Node;
5236-
}
5237-
declare export default typeof InspectorPanel;
5238-
"
5239-
`;
5240-
5241-
exports[`public API should not change unintentionally Libraries/Inspector/NetworkOverlay.js 1`] = `
5242-
"type NetworkRequestInfo = {
5243-
id: number,
5244-
type?: string,
5245-
url?: string,
5246-
method?: string,
5247-
status?: number,
5248-
dataSent?: any,
5249-
responseContentType?: string,
5250-
responseSize?: number,
5251-
requestHeaders?: Object,
5252-
responseHeaders?: string,
5253-
response?: Object | string,
5254-
responseURL?: string,
5255-
responseType?: string,
5256-
timeout?: number,
5257-
closeReason?: string,
5258-
messages?: string,
5259-
serverClose?: Object,
5260-
serverError?: Object,
5261-
...
5262-
};
5263-
type Props = $ReadOnly<{}>;
5264-
type State = {
5265-
detailRowId: ?number,
5266-
requests: Array<NetworkRequestInfo>,
5267-
};
5268-
declare class NetworkOverlay extends React.Component<Props, State> {
5269-
_requestsListView: ?React.ElementRef<Class<FlatList<NetworkRequestInfo>>>;
5270-
_detailScrollView: ?React.ElementRef<typeof ScrollView>;
5271-
_requestsListViewScrollMetrics: {
5272-
contentLength: number,
5273-
offset: number,
5274-
visibleLength: number,
5275-
};
5276-
_socketIdMap: { [number]: number };
5277-
_xhrIdMap: { [key: number]: number, ... };
5278-
state: State;
5279-
_enableXHRInterception(): void;
5280-
_enableWebSocketInterception(): void;
5281-
componentDidMount(): void;
5282-
componentWillUnmount(): void;
5283-
_renderItem: $FlowFixMe;
5284-
_renderItemDetail(id: number): React.Node;
5285-
_indicateAdditionalRequests: $FlowFixMe;
5286-
_captureRequestsListView: $FlowFixMe;
5287-
_requestsListViewOnScroll: $FlowFixMe;
5288-
_pressRow(rowId: number): void;
5289-
_scrollDetailToTop: $FlowFixMe;
5290-
_closeButtonClicked: $FlowFixMe;
5291-
_getRequestIndexByXHRID(index: number): number;
5292-
render(): React.Node;
5293-
}
5294-
declare export default typeof NetworkOverlay;
5295-
"
5296-
`;
5297-
5298-
exports[`public API should not change unintentionally Libraries/Inspector/PerformanceOverlay.js 1`] = `
5299-
"declare class PerformanceOverlay extends React.Component<{ ... }> {
5300-
render(): React.Node;
5301-
}
5302-
declare export default typeof PerformanceOverlay;
5303-
"
5304-
`;
5305-
5306-
exports[`public API should not change unintentionally Libraries/Inspector/ReactDevToolsOverlay.js 1`] = `
5307-
"type Props = {
5308-
inspectedViewRef: InspectedViewRef,
5309-
reactDevToolsAgent: ReactDevToolsAgent,
5310-
};
5311-
declare export default function ReactDevToolsOverlay(Props): React.Node;
5312-
"
5313-
`;
5314-
5315-
exports[`public API should not change unintentionally Libraries/Inspector/StyleInspector.js 1`] = `
5316-
"type Props = $ReadOnly<{
5317-
style?: ?____FlattenStyleProp_Internal<ViewStyleProp>,
5318-
}>;
5319-
declare function StyleInspector(Props): React.Node;
5320-
declare export default typeof StyleInspector;
5321-
"
5322-
`;
5323-
5324-
exports[`public API should not change unintentionally Libraries/Inspector/getInspectorDataForViewAtPoint.js 1`] = `
5325-
"export type ReactRenderer = {
5326-
rendererConfig: {
5327-
getInspectorDataForViewAtPoint: (
5328-
inspectedView: ?HostInstance,
5329-
locationX: number,
5330-
locationY: number,
5331-
callback: Function
5332-
) => void,
5333-
...
5334-
},
5335-
};
5336-
declare function getInspectorDataForViewAtPoint(
5337-
inspectedView: ?HostInstance,
5338-
locationX: number,
5339-
locationY: number,
5340-
callback: (viewData: TouchedViewDataAtPoint) => boolean
5341-
): void;
5342-
declare export default typeof getInspectorDataForViewAtPoint;
5343-
"
5344-
`;
5345-
5346-
exports[`public API should not change unintentionally Libraries/Inspector/resolveBoxStyle.js 1`] = `
5347-
"declare function resolveBoxStyle(
5348-
prefix: string,
5349-
style: Object
5350-
): ?$ReadOnly<{
5351-
bottom: number,
5352-
left: number,
5353-
right: number,
5354-
top: number,
5355-
}>;
5356-
declare export default typeof resolveBoxStyle;
5357-
"
5358-
`;
5359-
53605138
exports[`public API should not change unintentionally Libraries/Interaction/FrameRateLogger.js 1`] = `
53615139
"declare const FrameRateLogger: {
53625140
setGlobalOptions: (options: { debug?: boolean, ... }) => void,

packages/react-native/Libraries/Inspector/BorderBox.js packages/react-native/src/private/inspector/BorderBox.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010

1111
'use strict';
1212

13-
import type {ViewStyleProp} from '../StyleSheet/StyleSheet';
13+
import type {ViewStyleProp} from '../../../Libraries/StyleSheet/StyleSheet';
1414

1515
import React from 'react';
1616

17-
const View = require('../Components/View/View').default;
17+
const View = require('../../../Libraries/Components/View/View').default;
1818

1919
type Props = $ReadOnly<{
2020
children: React.Node,

packages/react-native/Libraries/Inspector/BoxInspector.js packages/react-native/src/private/inspector/BoxInspector.js

+7-4
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,17 @@
1010

1111
'use strict';
1212

13-
import type {TextStyleProp, ViewStyleProp} from '../StyleSheet/StyleSheet';
13+
import type {
14+
TextStyleProp,
15+
ViewStyleProp,
16+
} from '../../../Libraries/StyleSheet/StyleSheet';
1417
import type {InspectedElementFrame} from './Inspector';
1518

1619
import React from 'react';
1720

18-
const View = require('../Components/View/View').default;
19-
const StyleSheet = require('../StyleSheet/StyleSheet');
20-
const Text = require('../Text/Text').default;
21+
const View = require('../../../Libraries/Components/View/View').default;
22+
const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet');
23+
const Text = require('../../../Libraries/Text/Text').default;
2124
const resolveBoxStyle = require('./resolveBoxStyle').default;
2225

2326
const blank = {

packages/react-native/Libraries/Inspector/ElementBox.js packages/react-native/src/private/inspector/ElementBox.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010

1111
'use strict';
1212

13-
import type {ViewStyleProp} from '../StyleSheet/StyleSheet';
13+
import type {ViewStyleProp} from '../../../Libraries/StyleSheet/StyleSheet';
1414
import type {InspectedElementFrame} from './Inspector';
1515

1616
import React from 'react';
1717

18-
const View = require('../Components/View/View').default;
19-
const flattenStyle = require('../StyleSheet/flattenStyle');
20-
const StyleSheet = require('../StyleSheet/StyleSheet');
21-
const Dimensions = require('../Utilities/Dimensions').default;
18+
const View = require('../../../Libraries/Components/View/View').default;
19+
const flattenStyle = require('../../../Libraries/StyleSheet/flattenStyle');
20+
const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet');
21+
const Dimensions = require('../../../Libraries/Utilities/Dimensions').default;
2222
const BorderBox = require('./BorderBox').default;
2323
const resolveBoxStyle = require('./resolveBoxStyle').default;
2424

packages/react-native/Libraries/Inspector/ElementProperties.js packages/react-native/src/private/inspector/ElementProperties.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@
1010

1111
'use strict';
1212

13-
import type {InspectorData} from '../Renderer/shims/ReactNativeTypes';
14-
import type {ViewStyleProp} from '../StyleSheet/StyleSheet';
13+
import type {InspectorData} from '../../../Libraries/Renderer/shims/ReactNativeTypes';
14+
import type {ViewStyleProp} from '../../../Libraries/StyleSheet/StyleSheet';
1515

1616
import React from 'react';
1717

1818
const TouchableHighlight =
19-
require('../Components/Touchable/TouchableHighlight').default;
19+
require('../../../Libraries/Components/Touchable/TouchableHighlight').default;
2020
const TouchableWithoutFeedback =
21-
require('../Components/Touchable/TouchableWithoutFeedback').default;
22-
const View = require('../Components/View/View').default;
23-
const flattenStyle = require('../StyleSheet/flattenStyle');
24-
const StyleSheet = require('../StyleSheet/StyleSheet');
25-
const Text = require('../Text/Text').default;
26-
const mapWithSeparator = require('../Utilities/mapWithSeparator');
21+
require('../../../Libraries/Components/Touchable/TouchableWithoutFeedback').default;
22+
const View = require('../../../Libraries/Components/View/View').default;
23+
const flattenStyle = require('../../../Libraries/StyleSheet/flattenStyle');
24+
const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet');
25+
const Text = require('../../../Libraries/Text/Text').default;
26+
const mapWithSeparator = require('../../../Libraries/Utilities/mapWithSeparator');
2727
const BoxInspector = require('./BoxInspector').default;
2828
const StyleInspector = require('./StyleInspector').default;
2929

packages/react-native/Libraries/Inspector/Inspector.js packages/react-native/src/private/inspector/Inspector.js

+13-11
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,25 @@
1010

1111
'use strict';
1212

13-
import type {InspectedViewRef} from '../ReactNative/AppContainer-dev';
13+
import type {InspectedViewRef} from '../../../Libraries/ReactNative/AppContainer-dev';
1414
import type {
1515
InspectorData,
1616
TouchedViewDataAtPoint,
17-
} from '../Renderer/shims/ReactNativeTypes';
18-
import type {ViewStyleProp} from '../StyleSheet/StyleSheet';
19-
import type {ReactDevToolsAgent} from '../Types/ReactDevToolsTypes';
17+
} from '../../../Libraries/Renderer/shims/ReactNativeTypes';
18+
import type {ViewStyleProp} from '../../../Libraries/StyleSheet/StyleSheet';
19+
import type {ReactDevToolsAgent} from '../../../Libraries/Types/ReactDevToolsTypes';
2020

21-
import SafeAreaView from '../../src/private/components/SafeAreaView_INTERNAL_DO_NOT_USE';
21+
import SafeAreaView from '../components/SafeAreaView_INTERNAL_DO_NOT_USE';
2222
import React from 'react';
2323

24-
const View = require('../Components/View/View').default;
25-
const PressabilityDebug = require('../Pressability/PressabilityDebug');
26-
const {findNodeHandle} = require('../ReactNative/RendererProxy');
27-
const StyleSheet = require('../StyleSheet/StyleSheet');
28-
const Dimensions = require('../Utilities/Dimensions').default;
29-
const Platform = require('../Utilities/Platform');
24+
const View = require('../../../Libraries/Components/View/View').default;
25+
const PressabilityDebug = require('../../../Libraries/Pressability/PressabilityDebug');
26+
const {
27+
findNodeHandle,
28+
} = require('../../../Libraries/ReactNative/RendererProxy');
29+
const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet');
30+
const Dimensions = require('../../../Libraries/Utilities/Dimensions').default;
31+
const Platform = require('../../../Libraries/Utilities/Platform');
3032
const getInspectorDataForViewAtPoint =
3133
require('./getInspectorDataForViewAtPoint').default;
3234
const InspectorOverlay = require('./InspectorOverlay').default;

packages/react-native/Libraries/Inspector/InspectorOverlay.js packages/react-native/src/private/inspector/InspectorOverlay.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010

1111
'use strict';
1212

13-
import type {PressEvent} from '../Types/CoreEventTypes';
13+
import type {PressEvent} from '../../../Libraries/Types/CoreEventTypes';
1414
import type {InspectedElement} from './Inspector';
1515

1616
import React from 'react';
1717

18-
const View = require('../Components/View/View').default;
19-
const StyleSheet = require('../StyleSheet/StyleSheet');
18+
const View = require('../../../Libraries/Components/View/View').default;
19+
const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet');
2020
const ElementBox = require('./ElementBox').default;
2121

2222
type Props = $ReadOnly<{

0 commit comments

Comments
 (0)