Skip to content

Commit 562db69

Browse files
janicduplessisnecolas
authored andcommitted
[fix] numberOfLines=1 on Safari
Safari requires use of `white-space:nowrap` if not using the multi-line technique. This patch uses the multi-lines styles to truncate single-lines. Fix necolas#2111 Close necolas#2113
1 parent ea3975d commit 562db69

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

packages/react-native-web/src/exports/Text/__tests__/__snapshots__/index-test.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ exports[`components/Text prop "numberOfLines" value is set 1`] = `
159159

160160
exports[`components/Text prop "numberOfLines" value is set to one 1`] = `
161161
<div
162-
class="css-text-901oao css-textOneLine-vcwn7f"
162+
class="css-text-901oao css-textMultiLine-cens5h"
163163
dir="auto"
164164
/>
165165
`;

packages/react-native-web/src/exports/Text/index.js

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,11 @@ const Text: React.AbstractComponent<TextProps, HTMLElement & PlatformMethods> =
7373
const classList = [
7474
classes.text,
7575
hasTextAncestor === true && classes.textHasAncestor,
76-
numberOfLines === 1 && classes.textOneLine,
77-
numberOfLines != null && numberOfLines > 1 && classes.textMultiLine
76+
numberOfLines != null && classes.textMultiLine
7877
];
7978
const style = [
8079
props.style,
81-
numberOfLines != null && numberOfLines > 1 && { WebkitLineClamp: numberOfLines },
80+
numberOfLines != null && { WebkitLineClamp: numberOfLines },
8281
selectable === true && styles.selectable,
8382
selectable === false && styles.notSelectable,
8483
onPress && styles.pressable
@@ -180,12 +179,6 @@ const classes = css.create({
180179
font: 'inherit',
181180
whiteSpace: 'inherit'
182181
},
183-
textOneLine: {
184-
maxWidth: '100%',
185-
overflow: 'hidden',
186-
textOverflow: 'ellipsis',
187-
whiteSpace: 'pre'
188-
},
189182
// See #13
190183
textMultiLine: {
191184
display: '-webkit-box',

0 commit comments

Comments
 (0)