Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@ const InspectorPanel = require('./InspectorPanel').default;
const {useState} = React;

type PanelPosition = 'top' | 'bottom';
type SelectedTab =
| 'elements-inspector'
| 'network-profiling'
| 'performance-profiling';

export type InspectedElementFrame = TouchedViewDataAtPoint['frame'];
export type InspectedElement = $ReadOnly<{
Expand All @@ -62,8 +58,7 @@ function Inspector({
onRequestRerenderApp,
reactDevToolsAgent,
}: Props): React.Node {
const [selectedTab, setSelectedTab] =
useState<?SelectedTab>('elements-inspector');
const [inspecting, setInspecting] = useState<boolean>(true);

const [panelPosition, setPanelPosition] = useState<PanelPosition>('bottom');
const [inspectedElement, setInspectedElement] =
Expand Down Expand Up @@ -137,18 +132,8 @@ function Inspector({
);
};

const setInspecting = (enabled: boolean) => {
setSelectedTab(enabled ? 'elements-inspector' : null);
setInspectedElement(null);
};

const setPerfing = (enabled: boolean) => {
setSelectedTab(enabled ? 'performance-profiling' : null);
setInspectedElement(null);
};

const setNetworking = (enabled: boolean) => {
setSelectedTab(enabled ? 'network-profiling' : null);
const handleSetInspecting = (enabled: boolean) => {
setInspecting(enabled);
setInspectedElement(null);
};

Expand All @@ -164,7 +149,7 @@ function Inspector({

return (
<View style={styles.container} pointerEvents="box-none">
{selectedTab === 'elements-inspector' && (
{inspecting && (
<InspectorOverlay
inspected={inspectedElement}
onTouchPoint={onTouchPoint}
Expand All @@ -174,18 +159,14 @@ function Inspector({
<SafeAreaView style={[styles.panelContainer, panelContainerStyle]}>
<InspectorPanel
devtoolsIsOpen={!!reactDevToolsAgent}
inspecting={selectedTab === 'elements-inspector'}
perfing={selectedTab === 'performance-profiling'}
setPerfing={setPerfing}
setInspecting={setInspecting}
inspecting={inspecting}
setInspecting={handleSetInspecting}
inspected={inspectedElement}
hierarchy={elementsHierarchy}
selection={selectionIndex}
setSelection={setSelection}
touchTargeting={PressabilityDebug.isEnabled()}
setTouchTargeting={setTouchTargeting}
networking={selectedTab === 'network-profiling'}
setNetworking={setNetworking}
/>
</SafeAreaView>
</View>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,14 @@ const View = require('../../../../../Libraries/Components/View/View').default;
const StyleSheet =
require('../../../../../Libraries/StyleSheet/StyleSheet').default;
const Text = require('../../../../../Libraries/Text/Text').default;
const PerformanceOverlay = require('../perfmonitor/PerformanceOverlay').default;
const ElementProperties = require('./ElementProperties').default;
const NetworkOverlay = require('./NetworkOverlay').default;

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,
Expand Down Expand Up @@ -67,10 +61,6 @@ class InspectorPanel extends React.Component<Props> {
/>
</ScrollView>
);
} else if (this.props.perfing) {
contents = <PerformanceOverlay />;
} else if (this.props.networking) {
contents = <NetworkOverlay />;
} else {
contents = <View style={styles.waiting}>{this.renderWaiting()}</View>;
}
Expand All @@ -83,22 +73,6 @@ class InspectorPanel extends React.Component<Props> {
pressed={this.props.inspecting}
onClick={this.props.setInspecting}
/>
{global.RN$Bridgeless === true ? null : (
// These Inspector Panel sub-features are removed under the New Arch.
// See https://github.com/react-native-community/discussions-and-proposals/pull/777
<>
<InspectorPanelButton
title={'Perf'}
pressed={this.props.perfing}
onClick={this.props.setPerfing}
/>
<InspectorPanelButton
title={'Network'}
pressed={this.props.networking}
onClick={this.props.setNetworking}
/>
</>
)}
<InspectorPanelButton
title={'Touchables'}
pressed={this.props.touchTargeting}
Expand Down
Loading
Loading