From c0ed0775ed06dcbaa0482cd9101fc20a1aa6afcf Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Sun, 10 Mar 2024 18:05:02 -0500 Subject: [PATCH] Style tweaks to post/profile alerts --- src/components/Button.tsx | 10 +++++++++- src/components/Typography.tsx | 9 +++++++-- src/components/moderation/PostAlerts.tsx | 2 +- src/components/moderation/ProfileHeaderAlerts.tsx | 2 +- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/components/Button.tsx b/src/components/Button.tsx index a8805c9c24..702ec0619f 100644 --- a/src/components/Button.tsx +++ b/src/components/Button.tsx @@ -15,6 +15,7 @@ import LinearGradient from 'react-native-linear-gradient' import {useTheme, atoms as a, tokens, android, flatten} from '#/alf' import {Props as SVGIconProps} from '#/components/icons/common' +import {normalizeTextStyles} from '#/components/Typography' export type ButtonVariant = 'solid' | 'outline' | 'ghost' | 'gradient' export type ButtonColor = @@ -519,7 +520,14 @@ export function ButtonText({children, style, ...rest}: ButtonTextProps) { const textStyles = useSharedButtonTextStyles() return ( - + {children} ) diff --git a/src/components/Typography.tsx b/src/components/Typography.tsx index c9ab7a8a12..d9fb998ce1 100644 --- a/src/components/Typography.tsx +++ b/src/components/Typography.tsx @@ -1,5 +1,10 @@ import React from 'react' -import {Text as RNText, TextStyle, TextProps as RNTextProps} from 'react-native' +import { + Text as RNText, + StyleProp, + TextStyle, + TextProps as RNTextProps, +} from 'react-native' import {UITextView} from 'react-native-ui-text-view' import {useTheme, atoms, web, flatten} from '#/alf' @@ -34,7 +39,7 @@ export function leading< * If the `lineHeight` value is > 2, we assume it's an absolute value and * returns it as-is. */ -function normalizeTextStyles(styles: TextStyle[]) { +export function normalizeTextStyles(styles: StyleProp) { const s = flatten(styles) // should always be defined on these components const fontSize = s.fontSize || atoms.text_md.fontSize diff --git a/src/components/moderation/PostAlerts.tsx b/src/components/moderation/PostAlerts.tsx index 97990759a2..44e6ca7e21 100644 --- a/src/components/moderation/PostAlerts.tsx +++ b/src/components/moderation/PostAlerts.tsx @@ -83,7 +83,7 @@ function PostAlert({cause}: {cause: ModerationCause}) { control.open() }}> - + {desc.name} {desc.source && ( diff --git a/src/components/moderation/ProfileHeaderAlerts.tsx b/src/components/moderation/ProfileHeaderAlerts.tsx index efd825df67..db4770e4a5 100644 --- a/src/components/moderation/ProfileHeaderAlerts.tsx +++ b/src/components/moderation/ProfileHeaderAlerts.tsx @@ -83,7 +83,7 @@ function ProfileAlert({cause}: {cause: ModerationCause}) { control.open() }}> - + {desc.name} {desc.source && (