Skip to content

Commit 1a362eb

Browse files
committed
Fix bad merge
1 parent 5057b27 commit 1a362eb

File tree

1 file changed

+1
-15
lines changed
  • packages/react-native-web/src/exports/Text

1 file changed

+1
-15
lines changed

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

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -74,20 +74,6 @@ const Text: React.AbstractComponent<TextProps, HTMLElement & PlatformMethods> =
7474
const hostRef = React.useRef(null);
7575
const { direction: contextDirection } = useLocaleContext();
7676

77-
const classList = [
78-
classes.text,
79-
hasTextAncestor === true && classes.textHasAncestor,
80-
numberOfLines === 1 && classes.textOneLine,
81-
numberOfLines != null && numberOfLines > 1 && classes.textMultiLine
82-
];
83-
const style = [
84-
props.style,
85-
numberOfLines != null && numberOfLines > 1 && { WebkitLineClamp: numberOfLines },
86-
selectable === true && styles.selectable,
87-
selectable === false && styles.notSelectable,
88-
onPress && styles.pressable
89-
];
90-
9177
useElementLayout(hostRef, onLayout);
9278
useResponderEvents(hostRef, {
9379
onMoveShouldSetResponder,
@@ -216,7 +202,7 @@ const styles = StyleSheet.create({
216202
maxWidth: '100%',
217203
overflow: 'hidden',
218204
textOverflow: 'ellipsis',
219-
whiteSpace: 'pre',
205+
whiteSpace: 'nowrap',
220206
wordWrap: 'normal'
221207
},
222208
// See #13

0 commit comments

Comments
 (0)