zio
/
bsky-app
2
0
Fork 0
Code Pull Requests Packages Releases Activity

Fix `lineHeight` problems on native with new `Text` (#3175)

zio/stable
Hailey 2024-03-11 12:54:51 -07:00 committed by GitHub
parent a289e6bce5
commit 3a6e58ba6e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/Typography.tsx
View File

@ -3,7 +3,7 @@ import {Text as RNText, TextStyle, TextProps as RNTextProps} from 'react-native'
import {UITextView} from 'react-native-ui-text-view' import {UITextView} from 'react-native-ui-text-view'
import {useTheme, atoms, web, flatten} from '#/alf' import {useTheme, atoms, web, flatten} from '#/alf'
import {isIOS} from '#/platform/detection' import {isIOS, isNative} from '#/platform/detection'
export type TextProps = RNTextProps & { export type TextProps = RNTextProps & {
/** /**
@ -40,11 +40,11 @@ function normalizeTextStyles(styles: TextStyle[]) {
const fontSize = s.fontSize || atoms.text_md.fontSize const fontSize = s.fontSize || atoms.text_md.fontSize
if (s?.lineHeight) { if (s?.lineHeight) {
if (s.lineHeight <= 2) { if (s.lineHeight !== 0 && s.lineHeight <= 2) {
s.lineHeight = Math.round(fontSize * s.lineHeight) s.lineHeight = Math.round(fontSize * s.lineHeight)
} }
} else { } else if (!isNative) {
s.lineHeight = fontSize s.lineHeight = s.fontSize
} }
return s return s