Skip to content

Commit 975584c

Browse files
authored
Fix LogBox inspector content under horizontal safe area insets (#59797)
1 parent 20a44de commit 975584c

3 files changed

Lines changed: 57 additions & 16 deletions

File tree

‎packages/react-native/Libraries/LogBox/UI/LogBoxInspector.js‎

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,12 @@
88
* @format
99
*/
1010

11+
import type {ViewStyleProp} from '../../StyleSheet/StyleSheet';
12+
import type {SafeAreaInsetsChangeEvent} from '../../Types/CoreEventTypes';
13+
1114
import Keyboard from '../../Components/Keyboard/Keyboard';
1215
import View from '../../Components/View/View';
16+
import I18nManager from '../../ReactNative/I18nManager';
1317
import StyleSheet from '../../StyleSheet/StyleSheet';
1418
import BackHandler from '../../Utilities/BackHandler';
1519
import * as LogBoxData from '../Data/LogBoxData';
@@ -19,7 +23,7 @@ import LogBoxInspectorFooter from './LogBoxInspectorFooter';
1923
import LogBoxInspectorHeader from './LogBoxInspectorHeader';
2024
import * as LogBoxStyle from './LogBoxStyle';
2125
import * as React from 'react';
22-
import {useEffect} from 'react';
26+
import {useCallback, useEffect, useState} from 'react';
2327

2428
type Props = Readonly<{
2529
onDismiss: () => void,
@@ -56,6 +60,21 @@ export default function LogBoxInspector(props: Props): React.Node {
5660
Keyboard.dismiss();
5761
}, []);
5862

63+
const [safeAreaPadding, setSafeAreaPadding] = useState<?ViewStyleProp>(null);
64+
const handleSafeAreaInsetsChange = useCallback(
65+
(event: SafeAreaInsetsChangeEvent) => {
66+
const {left, right} = event.nativeEvent.insets;
67+
// Insets are physical edges. Logical edges resolve by layout direction
68+
// alone, which keeps clear of the RTL left/right swap.
69+
const {isRTL} = I18nManager.getConstants();
70+
setSafeAreaPadding({
71+
paddingStart: isRTL ? right : left,
72+
paddingEnd: isRTL ? left : right,
73+
});
74+
},
75+
[],
76+
);
77+
5978
useEffect(() => {
6079
if (log == null) {
6180
return;
@@ -123,14 +142,21 @@ export default function LogBoxInspector(props: Props): React.Node {
123142
}
124143

125144
return (
126-
<View id="logbox_inspector" style={styles.root}>
145+
<View
146+
id="logbox_inspector"
147+
style={styles.root}
148+
experimental_onSafeAreaInsetsChange={handleSafeAreaInsetsChange}>
127149
<LogBoxInspectorHeader
128150
onSelectIndex={props.onChangeSelectedIndex}
129151
selectedIndex={selectedIndex}
130152
total={logs.length}
131153
level={log.level}
132154
/>
133-
<LogBoxInspectorBody log={log} onRetry={_handleRetry} />
155+
<LogBoxInspectorBody
156+
log={log}
157+
onRetry={_handleRetry}
158+
safeAreaPadding={safeAreaPadding}
159+
/>
134160
<LogBoxInspectorFooter
135161
onDismiss={props.onDismiss}
136162
onMinimize={props.onMinimize}

‎packages/react-native/Libraries/LogBox/UI/LogBoxInspectorBody.js‎

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@
88
* @format
99
*/
1010

11+
import type {ViewStyleProp} from '../../StyleSheet/StyleSheet';
12+
1113
import ScrollView from '../../Components/ScrollView/ScrollView';
14+
import View from '../../Components/View/View';
1215
import StyleSheet from '../../StyleSheet/StyleSheet';
1316
import LogBoxLog from '../Data/LogBoxLog';
1417
import LogBoxInspectorCodeFrame from './LogBoxInspectorCodeFrame';
@@ -30,6 +33,7 @@ const headerTitleMap = {
3033
export default function LogBoxInspectorBody(props: {
3134
log: LogBoxLog,
3235
onRetry: () => void,
36+
safeAreaPadding?: ?ViewStyleProp,
3337
}): React.Node {
3438
const [collapsed, setCollapsed] = useState(true);
3539

@@ -50,14 +54,20 @@ export default function LogBoxInspectorBody(props: {
5054
message={props.log.message}
5155
level={props.log.level}
5256
title={headerTitle}
57+
style={props.safeAreaPadding}
5358
/>
5459
<ScrollView style={styles.scrollBody}>
55-
<LogBoxInspectorCodeFrame
56-
codeFrame={props.log.codeFrame}
57-
componentCodeFrame={props.log.componentCodeFrame}
58-
/>
59-
<LogBoxInspectorReactFrames log={props.log} />
60-
<LogBoxInspectorStackFrames log={props.log} onRetry={props.onRetry} />
60+
<View style={props.safeAreaPadding}>
61+
<LogBoxInspectorCodeFrame
62+
codeFrame={props.log.codeFrame}
63+
componentCodeFrame={props.log.componentCodeFrame}
64+
/>
65+
<LogBoxInspectorReactFrames log={props.log} />
66+
<LogBoxInspectorStackFrames
67+
log={props.log}
68+
onRetry={props.onRetry}
69+
/>
70+
</View>
6171
</ScrollView>
6272
</>
6373
);
@@ -70,13 +80,16 @@ export default function LogBoxInspectorBody(props: {
7080
message={props.log.message}
7181
level={props.log.level}
7282
title={headerTitle}
83+
style={props.safeAreaPadding}
7384
/>
74-
<LogBoxInspectorCodeFrame
75-
codeFrame={props.log.codeFrame}
76-
componentCodeFrame={props.log.componentCodeFrame}
77-
/>
78-
<LogBoxInspectorReactFrames log={props.log} />
79-
<LogBoxInspectorStackFrames log={props.log} onRetry={props.onRetry} />
85+
<View style={props.safeAreaPadding}>
86+
<LogBoxInspectorCodeFrame
87+
codeFrame={props.log.codeFrame}
88+
componentCodeFrame={props.log.componentCodeFrame}
89+
/>
90+
<LogBoxInspectorReactFrames log={props.log} />
91+
<LogBoxInspectorStackFrames log={props.log} onRetry={props.onRetry} />
92+
</View>
8093
</ScrollView>
8194
);
8295
}

‎packages/react-native/Libraries/LogBox/UI/LogBoxInspectorMessageHeader.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
* @format
99
*/
1010

11+
import type {ViewStyleProp} from '../../StyleSheet/StyleSheet';
1112
import type {LogLevel} from '../Data/LogBoxLog';
1213
import type {Message} from '../Data/parseLogBoxLog';
1314

@@ -26,6 +27,7 @@ component LogBoxInspectorMessageHeader(
2627
level: LogLevel,
2728
title: string,
2829
onPress: () => void,
30+
style?: ?ViewStyleProp,
2931
) {
3032
function renderShowMore() {
3133
if (message.content.length < SHOW_MORE_MESSAGE_LENGTH || !collapsed) {
@@ -42,7 +44,7 @@ component LogBoxInspectorMessageHeader(
4244
}
4345

4446
return (
45-
<View style={messageStyles.body}>
47+
<View style={[messageStyles.body, style]}>
4648
<View style={messageStyles.heading}>
4749
<Text
4850
maxFontSizeMultiplier={1.5}

0 commit comments

Comments
 (0)