From 0bde08fe67c57740118b2bda49fb1f6b427a118b Mon Sep 17 00:00:00 2001 From: Alex Hunt Date: Wed, 29 Jan 2025 09:56:54 -0800 Subject: [PATCH] Move Libraries/Inspector/ to src/private/ (#49022) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/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 --- .../Libraries/ReactNative/AppContainer-dev.js | 4 +- .../__snapshots__/public-api-test.js.snap | 222 ------------------ .../private/inspector}/BorderBox.js | 4 +- .../private/inspector}/BoxInspector.js | 11 +- .../private/inspector}/ElementBox.js | 10 +- .../private/inspector}/ElementProperties.js | 18 +- .../private/inspector}/Inspector.js | 24 +- .../private/inspector}/InspectorOverlay.js | 6 +- .../private/inspector}/InspectorPanel.js | 13 +- .../private/inspector}/NetworkOverlay.js | 16 +- .../private/inspector}/PerformanceOverlay.js | 8 +- .../inspector}/ReactDevToolsOverlay.js | 14 +- .../private/inspector}/StyleInspector.js | 10 +- .../getInspectorDataForViewAtPoint.js | 2 +- .../private/inspector}/resolveBoxStyle.js | 3 +- 15 files changed, 75 insertions(+), 290 deletions(-) rename packages/react-native/{Libraries/Inspector => src/private/inspector}/BorderBox.js (84%) rename packages/react-native/{Libraries/Inspector => src/private/inspector}/BoxInspector.js (89%) rename packages/react-native/{Libraries/Inspector => src/private/inspector}/ElementBox.js (91%) rename packages/react-native/{Libraries/Inspector => src/private/inspector}/ElementProperties.js (81%) rename packages/react-native/{Libraries/Inspector => src/private/inspector}/Inspector.js (86%) rename packages/react-native/{Libraries/Inspector => src/private/inspector}/InspectorOverlay.js (86%) rename packages/react-native/{Libraries/Inspector => src/private/inspector}/InspectorPanel.js (90%) rename packages/react-native/{Libraries/Inspector => src/private/inspector}/NetworkOverlay.js (96%) rename packages/react-native/{Libraries/Inspector => src/private/inspector}/PerformanceOverlay.js (80%) rename packages/react-native/{Libraries/Inspector => src/private/inspector}/ReactDevToolsOverlay.js (87%) rename packages/react-native/{Libraries/Inspector => src/private/inspector}/StyleInspector.js (78%) rename packages/react-native/{Libraries/Inspector => src/private/inspector}/getInspectorDataForViewAtPoint.js (97%) rename packages/react-native/{Libraries/Inspector => src/private/inspector}/resolveBoxStyle.js (96%) diff --git a/packages/react-native/Libraries/ReactNative/AppContainer-dev.js b/packages/react-native/Libraries/ReactNative/AppContainer-dev.js index bec563fe127..3c5fc7a874f 100644 --- a/packages/react-native/Libraries/ReactNative/AppContainer-dev.js +++ b/packages/react-native/Libraries/ReactNative/AppContainer-dev.js @@ -52,7 +52,7 @@ const InspectorDeferred = ({ }: InspectorDeferredProps) => { // D39382967 adds a require cycle: InitializeCore -> AppContainer -> Inspector -> InspectorPanel -> ScrollView -> InitializeCore // 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. - const Inspector = require('../Inspector/Inspector').default; + const Inspector = require('../../src/private/inspector/Inspector').default; return ( { const ReactDevToolsOverlay = - require('../Inspector/ReactDevToolsOverlay').default; + require('../../src/private/inspector/ReactDevToolsOverlay').default; return ( , - style?: ViewStyleProp, -}>; -declare function BorderBox(Props): React.Node; -declare export default typeof BorderBox; -" -`; - -exports[`public API should not change unintentionally Libraries/Inspector/BoxInspector.js 1`] = ` -"type BoxInspectorProps = $ReadOnly<{ - style: ViewStyleProp, - frame: ?InspectedElementFrame, -}>; -declare function BoxInspector(BoxInspectorProps): React.Node; -declare export default typeof BoxInspector; -" -`; - -exports[`public API should not change unintentionally Libraries/Inspector/ElementBox.js 1`] = ` -"type Props = $ReadOnly<{ - frame: InspectedElementFrame, - style?: ?ViewStyleProp, -}>; -declare function ElementBox(Props): React.Node; -declare export default typeof ElementBox; -" -`; - -exports[`public API should not change unintentionally Libraries/Inspector/ElementProperties.js 1`] = ` -"type Props = $ReadOnly<{ - hierarchy: ?InspectorData[\\"hierarchy\\"], - style?: ?ViewStyleProp, - frame?: ?Object, - selection?: ?number, - setSelection?: (number) => mixed, -}>; -declare class ElementProperties extends React.Component { - render(): React.Node; -} -declare export default typeof ElementProperties; -" -`; - -exports[`public API should not change unintentionally Libraries/Inspector/Inspector.js 1`] = ` -"export type InspectedElementFrame = TouchedViewDataAtPoint[\\"frame\\"]; -export type InspectedElement = $ReadOnly<{ - frame: InspectedElementFrame, - style?: ViewStyleProp, -}>; -export type ElementsHierarchy = InspectorData[\\"hierarchy\\"]; -type Props = { - inspectedViewRef: InspectedViewRef, - onRequestRerenderApp: () => void, - reactDevToolsAgent?: ReactDevToolsAgent, -}; -declare function Inspector(Props): React.Node; -declare export default typeof Inspector; -" -`; - -exports[`public API should not change unintentionally Libraries/Inspector/InspectorOverlay.js 1`] = ` -"type Props = $ReadOnly<{ - inspected?: ?InspectedElement, - onTouchPoint: (locationX: number, locationY: number) => void, -}>; -declare function InspectorOverlay(Props): React.Node; -declare export default typeof InspectorOverlay; -" -`; - -exports[`public API should not change unintentionally Libraries/Inspector/InspectorPanel.js 1`] = ` -"type Props = $ReadOnly<{ - devtoolsIsOpen: boolean, - inspecting: boolean, - setInspecting: (val: boolean) => void, - perfing: boolean, - setPerfing: (val: boolean) => void, - touchTargeting: boolean, - setTouchTargeting: (val: boolean) => void, - networking: boolean, - setNetworking: (val: boolean) => void, - hierarchy?: ?ElementsHierarchy, - selection?: ?number, - setSelection: (number) => mixed, - inspected?: ?InspectedElement, -}>; -declare class InspectorPanel extends React.Component { - renderWaiting(): React.Node; - render(): React.Node; -} -declare export default typeof InspectorPanel; -" -`; - -exports[`public API should not change unintentionally Libraries/Inspector/NetworkOverlay.js 1`] = ` -"type NetworkRequestInfo = { - id: number, - type?: string, - url?: string, - method?: string, - status?: number, - dataSent?: any, - responseContentType?: string, - responseSize?: number, - requestHeaders?: Object, - responseHeaders?: string, - response?: Object | string, - responseURL?: string, - responseType?: string, - timeout?: number, - closeReason?: string, - messages?: string, - serverClose?: Object, - serverError?: Object, - ... -}; -type Props = $ReadOnly<{}>; -type State = { - detailRowId: ?number, - requests: Array, -}; -declare class NetworkOverlay extends React.Component { - _requestsListView: ?React.ElementRef>>; - _detailScrollView: ?React.ElementRef; - _requestsListViewScrollMetrics: { - contentLength: number, - offset: number, - visibleLength: number, - }; - _socketIdMap: { [number]: number }; - _xhrIdMap: { [key: number]: number, ... }; - state: State; - _enableXHRInterception(): void; - _enableWebSocketInterception(): void; - componentDidMount(): void; - componentWillUnmount(): void; - _renderItem: $FlowFixMe; - _renderItemDetail(id: number): React.Node; - _indicateAdditionalRequests: $FlowFixMe; - _captureRequestsListView: $FlowFixMe; - _requestsListViewOnScroll: $FlowFixMe; - _pressRow(rowId: number): void; - _scrollDetailToTop: $FlowFixMe; - _closeButtonClicked: $FlowFixMe; - _getRequestIndexByXHRID(index: number): number; - render(): React.Node; -} -declare export default typeof NetworkOverlay; -" -`; - -exports[`public API should not change unintentionally Libraries/Inspector/PerformanceOverlay.js 1`] = ` -"declare class PerformanceOverlay extends React.Component<{ ... }> { - render(): React.Node; -} -declare export default typeof PerformanceOverlay; -" -`; - -exports[`public API should not change unintentionally Libraries/Inspector/ReactDevToolsOverlay.js 1`] = ` -"type Props = { - inspectedViewRef: InspectedViewRef, - reactDevToolsAgent: ReactDevToolsAgent, -}; -declare export default function ReactDevToolsOverlay(Props): React.Node; -" -`; - -exports[`public API should not change unintentionally Libraries/Inspector/StyleInspector.js 1`] = ` -"type Props = $ReadOnly<{ - style?: ?____FlattenStyleProp_Internal, -}>; -declare function StyleInspector(Props): React.Node; -declare export default typeof StyleInspector; -" -`; - -exports[`public API should not change unintentionally Libraries/Inspector/getInspectorDataForViewAtPoint.js 1`] = ` -"export type ReactRenderer = { - rendererConfig: { - getInspectorDataForViewAtPoint: ( - inspectedView: ?HostInstance, - locationX: number, - locationY: number, - callback: Function - ) => void, - ... - }, -}; -declare function getInspectorDataForViewAtPoint( - inspectedView: ?HostInstance, - locationX: number, - locationY: number, - callback: (viewData: TouchedViewDataAtPoint) => boolean -): void; -declare export default typeof getInspectorDataForViewAtPoint; -" -`; - -exports[`public API should not change unintentionally Libraries/Inspector/resolveBoxStyle.js 1`] = ` -"declare function resolveBoxStyle( - prefix: string, - style: Object -): ?$ReadOnly<{ - bottom: number, - left: number, - right: number, - top: number, -}>; -declare export default typeof resolveBoxStyle; -" -`; - exports[`public API should not change unintentionally Libraries/Interaction/FrameRateLogger.js 1`] = ` "declare const FrameRateLogger: { setGlobalOptions: (options: { debug?: boolean, ... }) => void, diff --git a/packages/react-native/Libraries/Inspector/BorderBox.js b/packages/react-native/src/private/inspector/BorderBox.js similarity index 84% rename from packages/react-native/Libraries/Inspector/BorderBox.js rename to packages/react-native/src/private/inspector/BorderBox.js index 952f08e87c7..34a63e9dc0f 100644 --- a/packages/react-native/Libraries/Inspector/BorderBox.js +++ b/packages/react-native/src/private/inspector/BorderBox.js @@ -10,11 +10,11 @@ 'use strict'; -import type {ViewStyleProp} from '../StyleSheet/StyleSheet'; +import type {ViewStyleProp} from '../../../Libraries/StyleSheet/StyleSheet'; import React from 'react'; -const View = require('../Components/View/View').default; +const View = require('../../../Libraries/Components/View/View').default; type Props = $ReadOnly<{ children: React.Node, diff --git a/packages/react-native/Libraries/Inspector/BoxInspector.js b/packages/react-native/src/private/inspector/BoxInspector.js similarity index 89% rename from packages/react-native/Libraries/Inspector/BoxInspector.js rename to packages/react-native/src/private/inspector/BoxInspector.js index c8278d7a737..18a3e05261f 100644 --- a/packages/react-native/Libraries/Inspector/BoxInspector.js +++ b/packages/react-native/src/private/inspector/BoxInspector.js @@ -10,14 +10,17 @@ 'use strict'; -import type {TextStyleProp, ViewStyleProp} from '../StyleSheet/StyleSheet'; +import type { + TextStyleProp, + ViewStyleProp, +} from '../../../Libraries/StyleSheet/StyleSheet'; import type {InspectedElementFrame} from './Inspector'; import React from 'react'; -const View = require('../Components/View/View').default; -const StyleSheet = require('../StyleSheet/StyleSheet'); -const Text = require('../Text/Text').default; +const View = require('../../../Libraries/Components/View/View').default; +const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet'); +const Text = require('../../../Libraries/Text/Text').default; const resolveBoxStyle = require('./resolveBoxStyle').default; const blank = { diff --git a/packages/react-native/Libraries/Inspector/ElementBox.js b/packages/react-native/src/private/inspector/ElementBox.js similarity index 91% rename from packages/react-native/Libraries/Inspector/ElementBox.js rename to packages/react-native/src/private/inspector/ElementBox.js index 8ccaa389a41..a803aec835b 100644 --- a/packages/react-native/Libraries/Inspector/ElementBox.js +++ b/packages/react-native/src/private/inspector/ElementBox.js @@ -10,15 +10,15 @@ 'use strict'; -import type {ViewStyleProp} from '../StyleSheet/StyleSheet'; +import type {ViewStyleProp} from '../../../Libraries/StyleSheet/StyleSheet'; import type {InspectedElementFrame} from './Inspector'; import React from 'react'; -const View = require('../Components/View/View').default; -const flattenStyle = require('../StyleSheet/flattenStyle'); -const StyleSheet = require('../StyleSheet/StyleSheet'); -const Dimensions = require('../Utilities/Dimensions').default; +const View = require('../../../Libraries/Components/View/View').default; +const flattenStyle = require('../../../Libraries/StyleSheet/flattenStyle'); +const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet'); +const Dimensions = require('../../../Libraries/Utilities/Dimensions').default; const BorderBox = require('./BorderBox').default; const resolveBoxStyle = require('./resolveBoxStyle').default; diff --git a/packages/react-native/Libraries/Inspector/ElementProperties.js b/packages/react-native/src/private/inspector/ElementProperties.js similarity index 81% rename from packages/react-native/Libraries/Inspector/ElementProperties.js rename to packages/react-native/src/private/inspector/ElementProperties.js index c24595abfad..5452371dda4 100644 --- a/packages/react-native/Libraries/Inspector/ElementProperties.js +++ b/packages/react-native/src/private/inspector/ElementProperties.js @@ -10,20 +10,20 @@ 'use strict'; -import type {InspectorData} from '../Renderer/shims/ReactNativeTypes'; -import type {ViewStyleProp} from '../StyleSheet/StyleSheet'; +import type {InspectorData} from '../../../Libraries/Renderer/shims/ReactNativeTypes'; +import type {ViewStyleProp} from '../../../Libraries/StyleSheet/StyleSheet'; import React from 'react'; const TouchableHighlight = - require('../Components/Touchable/TouchableHighlight').default; + require('../../../Libraries/Components/Touchable/TouchableHighlight').default; const TouchableWithoutFeedback = - require('../Components/Touchable/TouchableWithoutFeedback').default; -const View = require('../Components/View/View').default; -const flattenStyle = require('../StyleSheet/flattenStyle'); -const StyleSheet = require('../StyleSheet/StyleSheet'); -const Text = require('../Text/Text').default; -const mapWithSeparator = require('../Utilities/mapWithSeparator'); + require('../../../Libraries/Components/Touchable/TouchableWithoutFeedback').default; +const View = require('../../../Libraries/Components/View/View').default; +const flattenStyle = require('../../../Libraries/StyleSheet/flattenStyle'); +const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet'); +const Text = require('../../../Libraries/Text/Text').default; +const mapWithSeparator = require('../../../Libraries/Utilities/mapWithSeparator'); const BoxInspector = require('./BoxInspector').default; const StyleInspector = require('./StyleInspector').default; diff --git a/packages/react-native/Libraries/Inspector/Inspector.js b/packages/react-native/src/private/inspector/Inspector.js similarity index 86% rename from packages/react-native/Libraries/Inspector/Inspector.js rename to packages/react-native/src/private/inspector/Inspector.js index 4dbc94c2579..df2360fffb6 100644 --- a/packages/react-native/Libraries/Inspector/Inspector.js +++ b/packages/react-native/src/private/inspector/Inspector.js @@ -10,23 +10,25 @@ 'use strict'; -import type {InspectedViewRef} from '../ReactNative/AppContainer-dev'; +import type {InspectedViewRef} from '../../../Libraries/ReactNative/AppContainer-dev'; import type { InspectorData, TouchedViewDataAtPoint, -} from '../Renderer/shims/ReactNativeTypes'; -import type {ViewStyleProp} from '../StyleSheet/StyleSheet'; -import type {ReactDevToolsAgent} from '../Types/ReactDevToolsTypes'; +} from '../../../Libraries/Renderer/shims/ReactNativeTypes'; +import type {ViewStyleProp} from '../../../Libraries/StyleSheet/StyleSheet'; +import type {ReactDevToolsAgent} from '../../../Libraries/Types/ReactDevToolsTypes'; -import SafeAreaView from '../../src/private/components/SafeAreaView_INTERNAL_DO_NOT_USE'; +import SafeAreaView from '../components/SafeAreaView_INTERNAL_DO_NOT_USE'; import React from 'react'; -const View = require('../Components/View/View').default; -const PressabilityDebug = require('../Pressability/PressabilityDebug'); -const {findNodeHandle} = require('../ReactNative/RendererProxy'); -const StyleSheet = require('../StyleSheet/StyleSheet'); -const Dimensions = require('../Utilities/Dimensions').default; -const Platform = require('../Utilities/Platform'); +const View = require('../../../Libraries/Components/View/View').default; +const PressabilityDebug = require('../../../Libraries/Pressability/PressabilityDebug'); +const { + findNodeHandle, +} = require('../../../Libraries/ReactNative/RendererProxy'); +const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet'); +const Dimensions = require('../../../Libraries/Utilities/Dimensions').default; +const Platform = require('../../../Libraries/Utilities/Platform'); const getInspectorDataForViewAtPoint = require('./getInspectorDataForViewAtPoint').default; const InspectorOverlay = require('./InspectorOverlay').default; diff --git a/packages/react-native/Libraries/Inspector/InspectorOverlay.js b/packages/react-native/src/private/inspector/InspectorOverlay.js similarity index 86% rename from packages/react-native/Libraries/Inspector/InspectorOverlay.js rename to packages/react-native/src/private/inspector/InspectorOverlay.js index ba69b7d845d..c115bd342bc 100644 --- a/packages/react-native/Libraries/Inspector/InspectorOverlay.js +++ b/packages/react-native/src/private/inspector/InspectorOverlay.js @@ -10,13 +10,13 @@ 'use strict'; -import type {PressEvent} from '../Types/CoreEventTypes'; +import type {PressEvent} from '../../../Libraries/Types/CoreEventTypes'; import type {InspectedElement} from './Inspector'; import React from 'react'; -const View = require('../Components/View/View').default; -const StyleSheet = require('../StyleSheet/StyleSheet'); +const View = require('../../../Libraries/Components/View/View').default; +const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet'); const ElementBox = require('./ElementBox').default; type Props = $ReadOnly<{ diff --git a/packages/react-native/Libraries/Inspector/InspectorPanel.js b/packages/react-native/src/private/inspector/InspectorPanel.js similarity index 90% rename from packages/react-native/Libraries/Inspector/InspectorPanel.js rename to packages/react-native/src/private/inspector/InspectorPanel.js index 98864cdf917..13389695ae6 100644 --- a/packages/react-native/Libraries/Inspector/InspectorPanel.js +++ b/packages/react-native/src/private/inspector/InspectorPanel.js @@ -12,15 +12,16 @@ import type {ElementsHierarchy, InspectedElement} from './Inspector'; -import SafeAreaView from '../Components/SafeAreaView/SafeAreaView'; +import SafeAreaView from '../../../Libraries/Components/SafeAreaView/SafeAreaView'; import React from 'react'; -const ScrollView = require('../Components/ScrollView/ScrollView').default; +const ScrollView = + require('../../../Libraries/Components/ScrollView/ScrollView').default; const TouchableHighlight = - require('../Components/Touchable/TouchableHighlight').default; -const View = require('../Components/View/View').default; -const StyleSheet = require('../StyleSheet/StyleSheet'); -const Text = require('../Text/Text').default; + require('../../../Libraries/Components/Touchable/TouchableHighlight').default; +const View = require('../../../Libraries/Components/View/View').default; +const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet'); +const Text = require('../../../Libraries/Text/Text').default; const ElementProperties = require('./ElementProperties').default; const NetworkOverlay = require('./NetworkOverlay').default; const PerformanceOverlay = require('./PerformanceOverlay').default; diff --git a/packages/react-native/Libraries/Inspector/NetworkOverlay.js b/packages/react-native/src/private/inspector/NetworkOverlay.js similarity index 96% rename from packages/react-native/Libraries/Inspector/NetworkOverlay.js rename to packages/react-native/src/private/inspector/NetworkOverlay.js index a47b6116e78..369349e1ddc 100644 --- a/packages/react-native/Libraries/Inspector/NetworkOverlay.js +++ b/packages/react-native/src/private/inspector/NetworkOverlay.js @@ -12,18 +12,18 @@ import type {RenderItemProps} from '@react-native/virtualized-lists'; -import ScrollView from '../Components/ScrollView/ScrollView'; +import ScrollView from '../../../Libraries/Components/ScrollView/ScrollView'; import React from 'react'; const TouchableHighlight = - require('../Components/Touchable/TouchableHighlight').default; -const View = require('../Components/View/View').default; -const FlatList = require('../Lists/FlatList').default; -const XHRInterceptor = require('../Network/XHRInterceptor'); -const StyleSheet = require('../StyleSheet/StyleSheet'); -const Text = require('../Text/Text').default; + require('../../../Libraries/Components/Touchable/TouchableHighlight').default; +const View = require('../../../Libraries/Components/View/View').default; +const FlatList = require('../../../Libraries/Lists/FlatList').default; +const XHRInterceptor = require('../../../Libraries/Network/XHRInterceptor'); +const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet'); +const Text = require('../../../Libraries/Text/Text').default; const WebSocketInterceptor = - require('../WebSocket/WebSocketInterceptor').default; + require('../../../Libraries/WebSocket/WebSocketInterceptor').default; const LISTVIEW_CELL_HEIGHT = 15; diff --git a/packages/react-native/Libraries/Inspector/PerformanceOverlay.js b/packages/react-native/src/private/inspector/PerformanceOverlay.js similarity index 80% rename from packages/react-native/Libraries/Inspector/PerformanceOverlay.js rename to packages/react-native/src/private/inspector/PerformanceOverlay.js index 64ebb27fe14..e482a328a58 100644 --- a/packages/react-native/Libraries/Inspector/PerformanceOverlay.js +++ b/packages/react-native/src/private/inspector/PerformanceOverlay.js @@ -12,10 +12,10 @@ import React from 'react'; -const View = require('../Components/View/View').default; -const StyleSheet = require('../StyleSheet/StyleSheet'); -const Text = require('../Text/Text').default; -const PerformanceLogger = require('../Utilities/GlobalPerformanceLogger'); +const View = require('../../../Libraries/Components/View/View').default; +const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet'); +const Text = require('../../../Libraries/Text/Text').default; +const PerformanceLogger = require('../../../Libraries/Utilities/GlobalPerformanceLogger'); class PerformanceOverlay extends React.Component<{...}> { render(): React.Node { diff --git a/packages/react-native/Libraries/Inspector/ReactDevToolsOverlay.js b/packages/react-native/src/private/inspector/ReactDevToolsOverlay.js similarity index 87% rename from packages/react-native/Libraries/Inspector/ReactDevToolsOverlay.js rename to packages/react-native/src/private/inspector/ReactDevToolsOverlay.js index 876e3e4daed..48eb02f56a5 100644 --- a/packages/react-native/Libraries/Inspector/ReactDevToolsOverlay.js +++ b/packages/react-native/src/private/inspector/ReactDevToolsOverlay.js @@ -8,15 +8,15 @@ * @flow */ -import type {InspectedViewRef} from '../ReactNative/AppContainer-dev'; -import type {PointerEvent} from '../Types/CoreEventTypes'; -import type {PressEvent} from '../Types/CoreEventTypes'; -import type {ReactDevToolsAgent} from '../Types/ReactDevToolsTypes'; +import type {InspectedViewRef} from '../../../Libraries/ReactNative/AppContainer-dev'; +import type {PointerEvent} from '../../../Libraries/Types/CoreEventTypes'; +import type {PressEvent} from '../../../Libraries/Types/CoreEventTypes'; +import type {ReactDevToolsAgent} from '../../../Libraries/Types/ReactDevToolsTypes'; import type {InspectedElement} from './Inspector'; -import View from '../Components/View/View'; -import ReactNativeFeatureFlags from '../ReactNative/ReactNativeFeatureFlags'; -import StyleSheet from '../StyleSheet/StyleSheet'; +import View from '../../../Libraries/Components/View/View'; +import ReactNativeFeatureFlags from '../../../Libraries/ReactNative/ReactNativeFeatureFlags'; +import StyleSheet from '../../../Libraries/StyleSheet/StyleSheet'; import ElementBox from './ElementBox'; import * as React from 'react'; diff --git a/packages/react-native/Libraries/Inspector/StyleInspector.js b/packages/react-native/src/private/inspector/StyleInspector.js similarity index 78% rename from packages/react-native/Libraries/Inspector/StyleInspector.js rename to packages/react-native/src/private/inspector/StyleInspector.js index 6cdf56ff249..22263121689 100644 --- a/packages/react-native/Libraries/Inspector/StyleInspector.js +++ b/packages/react-native/src/private/inspector/StyleInspector.js @@ -10,14 +10,14 @@ 'use strict'; -import type {ViewStyleProp} from '../StyleSheet/StyleSheet'; -import type {____FlattenStyleProp_Internal} from '../StyleSheet/StyleSheetTypes'; +import type {ViewStyleProp} from '../../../Libraries/StyleSheet/StyleSheet'; +import type {____FlattenStyleProp_Internal} from '../../../Libraries/StyleSheet/StyleSheetTypes'; import React from 'react'; -const View = require('../Components/View/View').default; -const StyleSheet = require('../StyleSheet/StyleSheet'); -const Text = require('../Text/Text').default; +const View = require('../../../Libraries/Components/View/View').default; +const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet'); +const Text = require('../../../Libraries/Text/Text').default; type Props = $ReadOnly<{ style?: ?____FlattenStyleProp_Internal, diff --git a/packages/react-native/Libraries/Inspector/getInspectorDataForViewAtPoint.js b/packages/react-native/src/private/inspector/getInspectorDataForViewAtPoint.js similarity index 97% rename from packages/react-native/Libraries/Inspector/getInspectorDataForViewAtPoint.js rename to packages/react-native/src/private/inspector/getInspectorDataForViewAtPoint.js index 3c20e2d05f8..9d71b3b2b09 100644 --- a/packages/react-native/Libraries/Inspector/getInspectorDataForViewAtPoint.js +++ b/packages/react-native/src/private/inspector/getInspectorDataForViewAtPoint.js @@ -11,7 +11,7 @@ import type { HostInstance, TouchedViewDataAtPoint, -} from '../Renderer/shims/ReactNativeTypes'; +} from '../../../Libraries/Renderer/shims/ReactNativeTypes'; const invariant = require('invariant'); diff --git a/packages/react-native/Libraries/Inspector/resolveBoxStyle.js b/packages/react-native/src/private/inspector/resolveBoxStyle.js similarity index 96% rename from packages/react-native/Libraries/Inspector/resolveBoxStyle.js rename to packages/react-native/src/private/inspector/resolveBoxStyle.js index f81ce1e70b6..219dd6f14e8 100644 --- a/packages/react-native/Libraries/Inspector/resolveBoxStyle.js +++ b/packages/react-native/src/private/inspector/resolveBoxStyle.js @@ -10,7 +10,8 @@ 'use strict'; -const I18nManager = require('../ReactNative/I18nManager').default; +const I18nManager = + require('../../../Libraries/ReactNative/I18nManager').default; /** * Resolve a style property into its component parts.