diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/components/Link.tsx | 49 | ||||
-rw-r--r-- | src/components/NewskieDialog.tsx | 2 | ||||
-rw-r--r-- | src/components/StarterPack/StarterPackCard.tsx | 9 |
3 files changed, 7 insertions, 53 deletions
diff --git a/src/components/Link.tsx b/src/components/Link.tsx index 010299dfb..054a543c1 100644 --- a/src/components/Link.tsx +++ b/src/components/Link.tsx @@ -1,10 +1,5 @@ import React from 'react' -import { - GestureResponderEvent, - Pressable, - StyleProp, - ViewStyle, -} from 'react-native' +import {GestureResponderEvent} from 'react-native' import {sanitizeUrl} from '@braintree/sanitize-url' import {StackActions, useLinkProps} from '@react-navigation/native' @@ -348,48 +343,6 @@ export function createStaticClick( } } -/** - * A Pressable that uses useLink to handle navigation. It is unstyled, so can be used in cases where the Button styles - * in Link are not desired. - * @param displayText - * @param style - * @param children - * @param rest - * @constructor - */ -export function BaseLink({ - displayText, - onPress: onPressOuter, - style, - children, - ...rest -}: { - style?: StyleProp<ViewStyle> - children: React.ReactNode - to: string - action: 'push' | 'replace' | 'navigate' - onPress?: () => false | void - shareOnLongPress?: boolean - label: string - displayText?: string -}) { - const {onPress, ...btnProps} = useLink({ - displayText: displayText ?? rest.to, - ...rest, - }) - return ( - <Pressable - style={style} - onPress={e => { - onPressOuter?.() - onPress(e) - }} - {...btnProps}> - {children} - </Pressable> - ) -} - export function WebOnlyInlineLinkText({ children, to, diff --git a/src/components/NewskieDialog.tsx b/src/components/NewskieDialog.tsx index 0e3520658..6b02f88c6 100644 --- a/src/components/NewskieDialog.tsx +++ b/src/components/NewskieDialog.tsx @@ -127,7 +127,7 @@ export function NewskieDialog({ }}> <View style={[ - a.flex_1, + a.w_full, a.mt_sm, a.p_lg, a.border, diff --git a/src/components/StarterPack/StarterPackCard.tsx b/src/components/StarterPack/StarterPackCard.tsx index ead9c9248..6af1e1358 100644 --- a/src/components/StarterPack/StarterPackCard.tsx +++ b/src/components/StarterPack/StarterPackCard.tsx @@ -13,7 +13,7 @@ import {precacheStarterPack} from '#/state/queries/starter-packs' import {useSession} from '#/state/session' import {atoms as a, useTheme} from '#/alf' import {StarterPack} from '#/components/icons/StarterPack' -import {BaseLink} from '#/components/Link' +import {Link as BaseLink, LinkProps as BaseLinkProps} from '#/components/Link' import {Text} from '#/components/Typography' export function Default({ @@ -62,7 +62,7 @@ export function Card({ } return ( - <View style={[a.flex_1, a.gap_md]}> + <View style={[a.w_full, a.gap_md]}> <View style={[a.flex_row, a.gap_sm]}> {!noIcon ? <StarterPack width={40} gradient="sky" /> : null} <View> @@ -96,7 +96,7 @@ export function Link({ }: { starterPack: AppBskyGraphDefs.StarterPackViewBasic onPress?: () => void - children: React.ReactNode + children: BaseLinkProps['children'] }) { const {_} = useLingui() const queryClient = useQueryClient() @@ -123,7 +123,8 @@ export function Link({ starterPack.creator.did, ) precacheStarterPack(queryClient, starterPack) - }}> + }} + style={[a.flex_col, a.align_start]}> {children} </BaseLink> ) |