mirror of
https://github.com/zoriya/react-native-web.git
synced 2026-05-17 20:39:14 +00:00
[fix] Text numberOfLines=1 on Safari"
This reverts commit 562db69a0f.
Close #2193
Fix #2186
Fix #2111
This commit is contained in:
committed by
Nicolas Gallagher
parent
944b45cd0b
commit
79707ce1b3
+1
-1
@@ -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"
|
||||
/>
|
||||
`;
|
||||
|
||||
+10
-2
@@ -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
|
||||
@@ -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',
|
||||
|
||||
Reference in New Issue
Block a user