diff options
| author | dan <dan.abramov@gmail.com> | 2024-04-05 15:09:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-05 15:09:35 +0100 |
| commit | 46c112edfdcb40681a8997ec4f47b413a08fdd14 (patch) | |
| tree | 8745de3a743f9231a5151296c2df4fd6e39404e7 /src/components/Button.tsx | |
| parent | 49266c355ea781cbd7a0b373e64143da7740c91e (diff) | |
| download | voidsky-46c112edfdcb40681a8997ec4f47b413a08fdd14.tar.zst | |
Enforce that text is wrapped in <Text>, remaining cases (#3421)
* Toggle.Button -> Toggle.ButtonWithText * Simplify Prompt.Cancel/Action * Move lines down for better diff * Remove ButtonWithText * Simplify types * Enforce Button/ButtonText nesting * Add suggested wrapper in linter error * Check <Trans> ancestry too * Also check literals * Rm ts-ignore
Diffstat (limited to 'src/components/Button.tsx')
| -rw-r--r-- | src/components/Button.tsx | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/components/Button.tsx b/src/components/Button.tsx index 12b3fe4cb..33d777971 100644 --- a/src/components/Button.tsx +++ b/src/components/Button.tsx @@ -12,7 +12,6 @@ import { ViewStyle, } from 'react-native' import {LinearGradient} from 'expo-linear-gradient' -import {Trans} from '@lingui/macro' import {android, atoms as a, flatten, tokens, useTheme} from '#/alf' import {Props as SVGIconProps} from '#/components/icons/common' @@ -59,6 +58,10 @@ export type ButtonState = { export type ButtonContext = VariantProps & ButtonState +type NonTextElements = + | React.ReactElement + | Iterable<React.ReactElement | null | undefined | boolean> + export type ButtonProps = Pick< PressableProps, 'disabled' | 'onPress' | 'testID' @@ -68,11 +71,9 @@ export type ButtonProps = Pick< testID?: string label: string style?: StyleProp<ViewStyle> - children: - | React.ReactNode - | string - | ((context: ButtonContext) => React.ReactNode | string) + children: NonTextElements | ((context: ButtonContext) => NonTextElements) } + export type ButtonTextProps = TextProps & VariantProps & {disabled?: boolean} const Context = React.createContext<VariantProps & ButtonState>({ @@ -404,15 +405,7 @@ export function Button({ </View> )} <Context.Provider value={context}> - {/* @ts-ignore */} - {typeof children === 'string' || children?.type === Trans ? ( - /* @ts-ignore */ - <ButtonText>{children}</ButtonText> - ) : typeof children === 'function' ? ( - children(context) - ) : ( - children - )} + {typeof children === 'function' ? children(context) : children} </Context.Provider> </Pressable> ) |