Skip to content

Commit 74ef9b5

Browse files
committed
Adjust source and stack components
1 parent f4303c6 commit 74ef9b5

8 files changed

Lines changed: 63 additions & 16 deletions

packages/react-native/Libraries/LogBox/UI/AnsiHighlight.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ export default function Ansi({
8787
<View style={styles.container}>
8888
{parsedLines.map((items, i) => (
8989
<View style={styles.line} key={i}>
90-
<Text style={styles.text}>
90+
<Text maxFontSizeMultiplier={1.5} style={styles.text}>
9191
{items.map((bundle, key) => {
9292
const textStyle =
9393
bundle.fg && COLORS[bundle.fg]
@@ -101,6 +101,7 @@ export default function Ansi({
101101
return (
102102
<Text
103103
id="logbox_codeframe_contents_text"
104+
maxFontSizeMultiplier={1.5}
104105
style={[style, textStyle]}
105106
key={key}>
106107
{getText(bundle.content, key)}

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@ component LogBoxInspectorMessageHeader(
3232
return null;
3333
}
3434
return (
35-
<Text style={messageStyles.collapse} onPress={() => onPress()}>
35+
<Text
36+
maxFontSizeMultiplier={1.5}
37+
style={messageStyles.collapse}
38+
onPress={() => onPress()}>
3639
... See More
3740
</Text>
3841
);
@@ -42,12 +45,16 @@ component LogBoxInspectorMessageHeader(
4245
<View style={messageStyles.body}>
4346
<View style={messageStyles.heading}>
4447
<Text
48+
maxFontSizeMultiplier={1.5}
4549
style={[messageStyles.headingText, messageStyles[level]]}
4650
id="logbox_message_title_text">
4751
{title}
4852
</Text>
4953
</View>
50-
<Text style={messageStyles.bodyText} id="logbox_message_contents_text">
54+
<Text
55+
maxFontSizeMultiplier={1.5}
56+
style={messageStyles.bodyText}
57+
id="logbox_message_contents_text">
5158
<LogBoxMessage
5259
maxLength={collapsed ? SHOW_MORE_MESSAGE_LENGTH : Infinity}
5360
message={message}

packages/react-native/Libraries/LogBox/UI/LogBoxInspectorReactFrames.js

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,24 @@ component LogBoxInspectorReactFrames(log: LogBoxLog) {
101101
<View style={componentStyles.component}>
102102
<Text
103103
id="logbox_component_stack_frame_text"
104+
maxFontSizeMultiplier={1.5}
104105
style={componentStyles.frameName}>
105-
<Text style={componentStyles.bracket}>{'<'}</Text>
106+
<Text
107+
maxFontSizeMultiplier={1.5}
108+
style={componentStyles.bracket}>
109+
{'<'}
110+
</Text>
106111
{frame.methodName}
107-
<Text style={componentStyles.bracket}>{' />'}</Text>
112+
<Text
113+
maxFontSizeMultiplier={1.5}
114+
style={componentStyles.bracket}>
115+
{' />'}
116+
</Text>
108117
</Text>
109118
</View>
110-
<Text style={componentStyles.frameLocation}>
119+
<Text
120+
maxFontSizeMultiplier={1.5}
121+
style={componentStyles.frameLocation}>
111122
{frame.file != null ? getPrettyFileName(frame.file) : ''}
112123
{frame.lineNumber != null ? `:${frame.lineNumber}` : ''}
113124
</Text>
@@ -122,7 +133,9 @@ component LogBoxInspectorReactFrames(log: LogBoxLog) {
122133
}}
123134
onPress={() => setCollapsed(!collapsed)}
124135
style={componentStyles.collapseButton}>
125-
<Text style={componentStyles.collapse}>{getCollapseMessage()}</Text>
136+
<Text maxFontSizeMultiplier={1.5} style={componentStyles.collapse}>
137+
{getCollapseMessage()}
138+
</Text>
126139
</LogBoxButton>
127140
</View>
128141
</LogBoxInspectorSection>

packages/react-native/Libraries/LogBox/UI/LogBoxInspectorSection.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ component LogBoxInspectorSection(
2222
return (
2323
<View style={styles.section}>
2424
<View style={styles.heading}>
25-
<Text style={styles.headingText}>{heading}</Text>
25+
<Text maxFontSizeMultiplier={1.5} style={styles.headingText}>
26+
{heading}
27+
</Text>
2628
{action}
2729
</View>
2830
<View style={styles.body}>{children}</View>

packages/react-native/Libraries/LogBox/UI/LogBoxInspectorSourceMapStatus.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,9 @@ component LogBoxInspectorSourceMapStatus(
103103
: {transform: [{rotate: state.rotate}]},
104104
]}
105105
/>
106-
<Text style={[styles.text, {color}]}>Source Map</Text>
106+
<Text maxFontSizeMultiplier={1.5} style={[styles.text, {color}]}>
107+
Source Map
108+
</Text>
107109
</LogBoxButton>
108110
);
109111
}

packages/react-native/Libraries/LogBox/UI/LogBoxInspectorStackFrame.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,13 @@ component LogBoxInspectorStackFrame(
4444
style={styles.frame}>
4545
<Text
4646
id="logbox_stack_frame_text"
47+
maxFontSizeMultiplier={1.5}
4748
style={[styles.name, frame.collapse === true && styles.dim]}>
4849
{frame.methodName}
4950
</Text>
5051
<Text
5152
ellipsizeMode="middle"
53+
maxFontSizeMultiplier={1.5}
5254
numberOfLines={1}
5355
style={[styles.location, frame.collapse === true && styles.dim]}>
5456
{location}

packages/react-native/Libraries/LogBox/UI/LogBoxInspectorStackFrames.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ component LogBoxInspectorStackFrames(log: LogBoxLog, onRetry: () => void) {
8989
}>
9090
{log.symbolicated.status !== 'COMPLETE' && (
9191
<View style={stackStyles.hintBox}>
92-
<Text style={stackStyles.hintText}>
92+
<Text maxFontSizeMultiplier={1.5} style={stackStyles.hintText}>
9393
This call stack is not symbolicated. Some features are unavailable
9494
such as viewing the function name or tapping to open files.
9595
</Text>
@@ -138,7 +138,9 @@ component StackFrameFooter(message: string, onPress: () => void) {
138138
}}
139139
onPress={onPress}
140140
style={stackStyles.collapseButton}>
141-
<Text style={stackStyles.collapse}>{message}</Text>
141+
<Text maxFontSizeMultiplier={1.5} style={stackStyles.collapse}>
142+
{message}
143+
</Text>
142144
</LogBoxButton>
143145
</View>
144146
);

packages/react-native/Libraries/LogBox/UI/LogBoxMessage.js

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,11 @@ component TappableLinks(content: string, style: void | TextStyleProp) {
4343

4444
if (matches.length === 0) {
4545
// No URLs detected. Just return the content.
46-
return <Text style={style}>{content}</Text>;
46+
return (
47+
<Text maxFontSizeMultiplier={1.5} style={style}>
48+
{content}
49+
</Text>
50+
);
4751
}
4852

4953
// URLs were detected. Construct array of Text nodes.
@@ -55,7 +59,11 @@ component TappableLinks(content: string, style: void | TextStyleProp) {
5559
for (const linkRange of matches) {
5660
if (startIndex < linkRange.lowerBound) {
5761
const text = content.substring(startIndex, linkRange.lowerBound);
58-
fragments.push(<Text key={++indexCounter}>{text}</Text>);
62+
fragments.push(
63+
<Text key={++indexCounter} maxFontSizeMultiplier={1.5}>
64+
{text}
65+
</Text>,
66+
);
5967
}
6068

6169
const link = content.substring(linkRange.lowerBound, linkRange.upperBound);
@@ -66,6 +74,7 @@ component TappableLinks(content: string, style: void | TextStyleProp) {
6674
Linking.openURL(link);
6775
}}
6876
key={++indexCounter}
77+
maxFontSizeMultiplier={1.5}
6978
style={styles.linkText}>
7079
{link}
7180
</Text>,
@@ -77,13 +86,20 @@ component TappableLinks(content: string, style: void | TextStyleProp) {
7786
if (startIndex < content.length) {
7887
const text = content.substring(startIndex);
7988
fragments.push(
80-
<Text key={++indexCounter} style={style}>
89+
<Text
90+
key={++indexCounter}
91+
maxFontSizeMultiplier={1.5}
92+
style={style}>
8193
{text}
8294
</Text>,
8395
);
8496
}
8597

86-
return <Text style={style}>{fragments}</Text>;
98+
return (
99+
<Text maxFontSizeMultiplier={1.5} style={style}>
100+
{fragments}
101+
</Text>
102+
);
87103
}
88104

89105
const cleanContent = (content: string) =>
@@ -98,7 +114,9 @@ component LogBoxMessage(
98114
const {content, substitutions}: Message = message;
99115

100116
if (plaintext === true) {
101-
return <Text>{cleanContent(content)}</Text>;
117+
return (
118+
<Text maxFontSizeMultiplier={1}>{cleanContent(content)}</Text>
119+
);
102120
}
103121

104122
const resolvedMaxLength = maxLength != null ? maxLength : Infinity;

0 commit comments

Comments
 (0)