Skip to content

Fix ellipsis issues for Text numberOfLines={1} #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roryabraham merged 3 commits into from
Jan 14, 2022
Merged

Fix ellipsis issues for Text numberOfLines={1} #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e25e91e
Revert "[fix] numberOfLines=1 on Safari"
parasharrajat Jan 10, 2022
9f71d4e
fix: text ellipsis issue for Safari
parasharrajat Jan 10, 2022
f226d35
fix snapshot tests
parasharrajat Jan 10, 2022
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
2 changes: 1 addition & 1 deletion packages/react-native-web/src/exports/Text/__tests__/__snapshots__/index-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ exports[`components/Text prop "numberOfLines" value is set 1`] = `

exports[`components/Text prop "numberOfLines" value is set to one 1`] = `
<div
class="css-text-901oao css-textMultiLine-cens5h"
class="css-text-901oao css-textOneLine-nfaoni"
dir="auto"
/>
`;
Expand Down
12 changes: 10 additions & 2 deletions packages/react-native-web/src/exports/Text/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,12 @@ const Text: React.AbstractComponent<TextProps, HTMLElement & PlatformMethods> =
const classList = [
classes.text,
hasTextAncestor === true && classes.textHasAncestor,
numberOfLines != null && classes.textMultiLine
numberOfLines === 1 && classes.textOneLine,
numberOfLines != null && numberOfLines > 1 && classes.textMultiLine
];
const style = [
props.style,
numberOfLines != null && { WebkitLineClamp: numberOfLines },
numberOfLines != null && numberOfLines > 1 && { WebkitLineClamp: numberOfLines },
selectable === true && styles.selectable,
selectable === false && styles.notSelectable,
onPress && styles.pressable
Expand Down Expand Up @@ -179,6 +180,13 @@ const classes = css.create({
font: 'inherit',
whiteSpace: 'inherit'
},
textOneLine: {
maxWidth: '100%',
overflow: 'hidden',
textOverflow: 'ellipsis',
whiteSpace: 'pre',
wordWrap: 'normal'
},
// See #13
textMultiLine: {
display: '-webkit-box',
Expand Down