Skip to content

Commit 3cd81b5

Browse files
authored
Merge pull request #5 from parasharrajat/master
2 parents 60d5a5d + f226d35 commit 3cd81b5

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
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-textMultiLine-cens5h"
162+
class="css-text-901oao css-textOneLine-nfaoni"
163163
dir="auto"
164164
/>
165165
`;

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,12 @@ const Text: React.AbstractComponent<TextProps, HTMLElement & PlatformMethods> =
7373
const classList = [
7474
classes.text,
7575
hasTextAncestor === true && classes.textHasAncestor,
76-
numberOfLines != null && classes.textMultiLine
76+
numberOfLines === 1 && classes.textOneLine,
77+
numberOfLines != null && numberOfLines > 1 && classes.textMultiLine
7778
];
7879
const style = [
7980
props.style,
80-
numberOfLines != null && { WebkitLineClamp: numberOfLines },
81+
numberOfLines != null && numberOfLines > 1 && { WebkitLineClamp: numberOfLines },
8182
selectable === true && styles.selectable,
8283
selectable === false && styles.notSelectable,
8384
onPress && styles.pressable
@@ -179,6 +180,13 @@ const classes = css.create({
179180
font: 'inherit',
180181
whiteSpace: 'inherit'
181182
},
183+
textOneLine: {
184+
maxWidth: '100%',
185+
overflow: 'hidden',
186+
textOverflow: 'ellipsis',
187+
whiteSpace: 'pre',
188+
wordWrap: 'normal'
189+
},
182190
// See #13
183191
textMultiLine: {
184192
display: '-webkit-box',

0 commit comments

Comments
 (0)