diff options
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/Link.tsx | 2 | ||||
-rw-r--r-- | src/components/Prompt.tsx | 8 | ||||
-rw-r--r-- | src/components/RichText.tsx | 10 | ||||
-rw-r--r-- | src/components/dialogs/MutedWords.tsx | 35 | ||||
-rw-r--r-- | src/components/forms/DateField/index.android.tsx | 2 | ||||
-rw-r--r-- | src/components/forms/DateField/index.tsx | 2 | ||||
-rw-r--r-- | src/components/forms/DateField/index.web.tsx | 2 | ||||
-rw-r--r-- | src/components/forms/TextField.tsx | 4 | ||||
-rw-r--r-- | src/components/forms/Toggle.tsx | 10 | ||||
-rw-r--r-- | src/components/moderation/LabelPreference.tsx | 6 | ||||
-rw-r--r-- | src/components/moderation/LabelsOnMeDialog.tsx | 19 | ||||
-rw-r--r-- | src/components/moderation/ModerationDetailsDialog.tsx | 23 |
12 files changed, 60 insertions, 63 deletions
diff --git a/src/components/Link.tsx b/src/components/Link.tsx index 1a494626f..65a015ba3 100644 --- a/src/components/Link.tsx +++ b/src/components/Link.tsx @@ -250,7 +250,7 @@ export type InlineLinkProps = React.PropsWithChildren< BaseLinkProps & TextStyleProp & Pick<TextProps, 'selectable'> > -export function InlineLink({ +export function InlineLinkText({ children, to, action = 'push', diff --git a/src/components/Prompt.tsx b/src/components/Prompt.tsx index 37d1b700a..000d2a3cd 100644 --- a/src/components/Prompt.tsx +++ b/src/components/Prompt.tsx @@ -51,7 +51,7 @@ export function Outer({ ) } -export function Title({children}: React.PropsWithChildren<{}>) { +export function TitleText({children}: React.PropsWithChildren<{}>) { const {titleId} = React.useContext(Context) return ( <Text nativeID={titleId} style={[a.text_2xl, a.font_bold, a.pb_sm]}> @@ -60,7 +60,7 @@ export function Title({children}: React.PropsWithChildren<{}>) { ) } -export function Description({children}: React.PropsWithChildren<{}>) { +export function DescriptionText({children}: React.PropsWithChildren<{}>) { const t = useTheme() const {descriptionId} = React.useContext(Context) return ( @@ -175,8 +175,8 @@ export function Basic({ }>) { return ( <Outer control={control} testID="confirmModal"> - <Title>{title}</Title> - <Description>{description}</Description> + <TitleText>{title}</TitleText> + <DescriptionText>{description}</DescriptionText> <Actions> <Action cta={confirmButtonCta} diff --git a/src/components/RichText.tsx b/src/components/RichText.tsx index 0e89e13b7..5cfa0b24f 100644 --- a/src/components/RichText.tsx +++ b/src/components/RichText.tsx @@ -7,7 +7,7 @@ import {toShortUrl} from '#/lib/strings/url-helpers' import {isNative} from '#/platform/detection' import {atoms as a, flatten, native, TextStyleProp, useTheme, web} from '#/alf' import {useInteractionState} from '#/components/hooks/useInteractionState' -import {InlineLink} from '#/components/Link' +import {InlineLinkText} from '#/components/Link' import {TagMenu, useTagMenuControl} from '#/components/TagMenu' import {Text, TextProps} from '#/components/Typography' @@ -84,7 +84,7 @@ export function RichText({ !disableLinks ) { els.push( - <InlineLink + <InlineLinkText selectable={selectable} key={key} to={`/profile/${mention.did}`} @@ -92,14 +92,14 @@ export function RichText({ // @ts-ignore TODO dataSet={WORD_WRAP}> {segment.text} - </InlineLink>, + </InlineLinkText>, ) } else if (link && AppBskyRichtextFacet.validateLink(link).success) { if (disableLinks) { els.push(toShortUrl(segment.text)) } else { els.push( - <InlineLink + <InlineLinkText selectable={selectable} key={key} to={link.uri} @@ -108,7 +108,7 @@ export function RichText({ dataSet={WORD_WRAP} shareOnLongPress> {toShortUrl(segment.text)} - </InlineLink>, + </InlineLinkText>, ) } } else if ( diff --git a/src/components/dialogs/MutedWords.tsx b/src/components/dialogs/MutedWords.tsx index 46f319adf..0eced11e3 100644 --- a/src/components/dialogs/MutedWords.tsx +++ b/src/components/dialogs/MutedWords.tsx @@ -1,37 +1,36 @@ import React from 'react' import {Keyboard, View} from 'react-native' +import {AppBskyActorDefs, sanitizeMutedWordValue} from '@atproto/api' import {msg, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' -import {AppBskyActorDefs, sanitizeMutedWordValue} from '@atproto/api' +import {logger} from '#/logger' +import {isNative} from '#/platform/detection' import { usePreferencesQuery, - useUpsertMutedWordsMutation, useRemoveMutedWordMutation, + useUpsertMutedWordsMutation, } from '#/state/queries/preferences' -import {isNative} from '#/platform/detection' import { atoms as a, - useTheme, + native, useBreakpoints, + useTheme, ViewStyleProp, web, - native, } from '#/alf' -import {Text} from '#/components/Typography' import {Button, ButtonIcon, ButtonText} from '#/components/Button' -import {PlusLarge_Stroke2_Corner0_Rounded as Plus} from '#/components/icons/Plus' -import {TimesLarge_Stroke2_Corner0_Rounded as X} from '#/components/icons/Times' +import * as Dialog from '#/components/Dialog' +import {useGlobalDialogsControlContext} from '#/components/dialogs/Context' +import {Divider} from '#/components/Divider' +import * as Toggle from '#/components/forms/Toggle' import {Hashtag_Stroke2_Corner0_Rounded as Hashtag} from '#/components/icons/Hashtag' import {PageText_Stroke2_Corner0_Rounded as PageText} from '#/components/icons/PageText' -import {Divider} from '#/components/Divider' +import {PlusLarge_Stroke2_Corner0_Rounded as Plus} from '#/components/icons/Plus' +import {TimesLarge_Stroke2_Corner0_Rounded as X} from '#/components/icons/Times' import {Loader} from '#/components/Loader' -import {logger} from '#/logger' -import * as Dialog from '#/components/Dialog' -import * as Toggle from '#/components/forms/Toggle' import * as Prompt from '#/components/Prompt' - -import {useGlobalDialogsControlContext} from '#/components/dialogs/Context' +import {Text} from '#/components/Typography' export function MutedWordsDialog() { const {mutedWordsDialogControl: control} = useGlobalDialogsControlContext() @@ -130,9 +129,9 @@ function MutedWordsInner({}: {control: Dialog.DialogOuterProps['control']}) { <TargetToggle> <View style={[a.flex_row, a.align_center, a.gap_sm]}> <Toggle.Radio /> - <Toggle.Label> + <Toggle.LabelText> <Trans>Mute in text & tags</Trans> - </Toggle.Label> + </Toggle.LabelText> </View> <PageText size="sm" /> </TargetToggle> @@ -145,9 +144,9 @@ function MutedWordsInner({}: {control: Dialog.DialogOuterProps['control']}) { <TargetToggle> <View style={[a.flex_row, a.align_center, a.gap_sm]}> <Toggle.Radio /> - <Toggle.Label> + <Toggle.LabelText> <Trans>Mute in tags only</Trans> - </Toggle.Label> + </Toggle.LabelText> </View> <Hashtag size="sm" /> </TargetToggle> diff --git a/src/components/forms/DateField/index.android.tsx b/src/components/forms/DateField/index.android.tsx index 700d15e6d..1830ca4bf 100644 --- a/src/components/forms/DateField/index.android.tsx +++ b/src/components/forms/DateField/index.android.tsx @@ -8,7 +8,7 @@ import * as TextField from '#/components/forms/TextField' import {DateFieldButton} from './index.shared' export * as utils from '#/components/forms/DateField/utils' -export const Label = TextField.Label +export const LabelText = TextField.LabelText export function DateField({ value, diff --git a/src/components/forms/DateField/index.tsx b/src/components/forms/DateField/index.tsx index 5662bb594..e231ac5ba 100644 --- a/src/components/forms/DateField/index.tsx +++ b/src/components/forms/DateField/index.tsx @@ -13,7 +13,7 @@ import * as TextField from '#/components/forms/TextField' import {DateFieldButton} from './index.shared' export * as utils from '#/components/forms/DateField/utils' -export const Label = TextField.Label +export const LabelText = TextField.LabelText /** * Date-only input. Accepts a date in the format YYYY-MM-DD, and reports date diff --git a/src/components/forms/DateField/index.web.tsx b/src/components/forms/DateField/index.web.tsx index 982d32711..b764620e3 100644 --- a/src/components/forms/DateField/index.web.tsx +++ b/src/components/forms/DateField/index.web.tsx @@ -9,7 +9,7 @@ import * as TextField from '#/components/forms/TextField' import {CalendarDays_Stroke2_Corner0_Rounded as CalendarDays} from '#/components/icons/CalendarDays' export * as utils from '#/components/forms/DateField/utils' -export const Label = TextField.Label +export const LabelText = TextField.LabelText const InputBase = React.forwardRef<HTMLInputElement, TextInputProps>( ({style, ...props}, ref) => { diff --git a/src/components/forms/TextField.tsx b/src/components/forms/TextField.tsx index 0bdeca645..73a660ea6 100644 --- a/src/components/forms/TextField.tsx +++ b/src/components/forms/TextField.tsx @@ -225,7 +225,7 @@ export function createInput(Component: typeof TextInput) { export const Input = createInput(TextInput) -export function Label({ +export function LabelText({ nativeID, children, }: React.PropsWithChildren<{nativeID?: string}>) { @@ -288,7 +288,7 @@ export function Icon({icon: Comp}: {icon: React.ComponentType<SVGIconProps>}) { ) } -export function Suffix({ +export function SuffixText({ children, label, accessibilityHint, diff --git a/src/components/forms/Toggle.tsx b/src/components/forms/Toggle.tsx index 7a4b5ac95..7285e5fac 100644 --- a/src/components/forms/Toggle.tsx +++ b/src/components/forms/Toggle.tsx @@ -3,16 +3,16 @@ import {Pressable, View, ViewStyle} from 'react-native' import {HITSLOP_10} from 'lib/constants' import { - useTheme, atoms as a, - native, flatten, - ViewStyleProp, + native, TextStyleProp, + useTheme, + ViewStyleProp, } from '#/alf' -import {Text} from '#/components/Typography' import {useInteractionState} from '#/components/hooks/useInteractionState' import {CheckThick_Stroke2_Corner0_Rounded as Checkmark} from '#/components/icons/Check' +import {Text} from '#/components/Typography' export type ItemState = { name: string @@ -234,7 +234,7 @@ export function Item({ ) } -export function Label({ +export function LabelText({ children, style, }: React.PropsWithChildren<TextStyleProp>) { diff --git a/src/components/moderation/LabelPreference.tsx b/src/components/moderation/LabelPreference.tsx index 028bd1a39..990e73622 100644 --- a/src/components/moderation/LabelPreference.tsx +++ b/src/components/moderation/LabelPreference.tsx @@ -13,7 +13,7 @@ import { } from '#/state/queries/preferences' import {atoms as a, useBreakpoints, useTheme} from '#/alf' import * as ToggleButton from '#/components/forms/ToggleButton' -import {InlineLink} from '#/components/Link' +import {InlineLinkText} from '#/components/Link' import {Text} from '#/components/Typography' import {CircleInfo_Stroke2_Corner0_Rounded as CircleInfo} from '../icons/CircleInfo' @@ -243,9 +243,9 @@ export function LabelerLabelPreference({ ) : isGlobalLabel ? ( <Trans> Configured in{' '} - <InlineLink to="/moderation" style={a.text_sm}> + <InlineLinkText to="/moderation" style={a.text_sm}> moderation settings - </InlineLink> + </InlineLinkText> . </Trans> ) : null} diff --git a/src/components/moderation/LabelsOnMeDialog.tsx b/src/components/moderation/LabelsOnMeDialog.tsx index 6eddbc7ce..95e3d242b 100644 --- a/src/components/moderation/LabelsOnMeDialog.tsx +++ b/src/components/moderation/LabelsOnMeDialog.tsx @@ -1,20 +1,19 @@ import React from 'react' import {View} from 'react-native' +import {ComAtprotoLabelDefs, ComAtprotoModerationDefs} from '@atproto/api' import {msg, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' -import {ComAtprotoLabelDefs, ComAtprotoModerationDefs} from '@atproto/api' import {useLabelInfo} from '#/lib/moderation/useLabelInfo' import {makeProfileLink} from '#/lib/routes/links' import {sanitizeHandle} from '#/lib/strings/handles' import {getAgent} from '#/state/session' - +import * as Toast from '#/view/com/util/Toast' import {atoms as a, useBreakpoints, useTheme} from '#/alf' -import {Text} from '#/components/Typography' -import * as Dialog from '#/components/Dialog' import {Button, ButtonText} from '#/components/Button' -import {InlineLink} from '#/components/Link' -import * as Toast from '#/view/com/util/Toast' +import * as Dialog from '#/components/Dialog' +import {InlineLinkText} from '#/components/Link' +import {Text} from '#/components/Typography' import {Divider} from '../Divider' export {useDialogControl as useLabelsOnMeDialogControl} from '#/components/Dialog' @@ -145,13 +144,13 @@ function Label({ <View style={[a.px_md, a.py_sm, t.atoms.bg_contrast_25]}> <Text style={[t.atoms.text_contrast_medium]}> <Trans>Source:</Trans>{' '} - <InlineLink + <InlineLinkText to={makeProfileLink( labeler ? labeler.creator : {did: label.src, handle: ''}, )} onPress={() => control.close()}> {labeler ? sanitizeHandle(labeler.creator.handle, '@') : label.src} - </InlineLink> + </InlineLinkText> </Text> </View> </View> @@ -204,14 +203,14 @@ function AppealForm({ <Text style={[a.text_md, a.leading_snug]}> <Trans> This appeal will be sent to{' '} - <InlineLink + <InlineLinkText to={makeProfileLink( labeler ? labeler.creator : {did: label.src, handle: ''}, )} onPress={() => control.close()} style={[a.text_md, a.leading_snug]}> {labeler ? sanitizeHandle(labeler.creator.handle, '@') : label.src} - </InlineLink> + </InlineLinkText> . </Trans> </Text> diff --git a/src/components/moderation/ModerationDetailsDialog.tsx b/src/components/moderation/ModerationDetailsDialog.tsx index da490cb43..da57de4df 100644 --- a/src/components/moderation/ModerationDetailsDialog.tsx +++ b/src/components/moderation/ModerationDetailsDialog.tsx @@ -1,19 +1,18 @@ import React from 'react' import {View} from 'react-native' +import {ModerationCause} from '@atproto/api' import {msg, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' -import {ModerationCause} from '@atproto/api' -import {listUriToHref} from '#/lib/strings/url-helpers' import {useModerationCauseDescription} from '#/lib/moderation/useModerationCauseDescription' import {makeProfileLink} from '#/lib/routes/links' - +import {listUriToHref} from '#/lib/strings/url-helpers' import {isNative} from '#/platform/detection' -import {useTheme, atoms as a} from '#/alf' -import {Text} from '#/components/Typography' +import {atoms as a, useTheme} from '#/alf' import * as Dialog from '#/components/Dialog' -import {InlineLink} from '#/components/Link' import {Divider} from '#/components/Divider' +import {InlineLinkText} from '#/components/Link' +import {Text} from '#/components/Typography' export {useDialogControl as useModerationDetailsDialogControl} from '#/components/Dialog' @@ -55,9 +54,9 @@ function ModerationDetailsDialogInner({ description = ( <Trans> This user is included in the{' '} - <InlineLink to={listUriToHref(list.uri)} style={[a.text_sm]}> + <InlineLinkText to={listUriToHref(list.uri)} style={[a.text_sm]}> {list.name} - </InlineLink>{' '} + </InlineLinkText>{' '} list which you have blocked. </Trans> ) @@ -84,9 +83,9 @@ function ModerationDetailsDialogInner({ description = ( <Trans> This user is included in the{' '} - <InlineLink to={listUriToHref(list.uri)} style={[a.text_sm]}> + <InlineLinkText to={listUriToHref(list.uri)} style={[a.text_sm]}> {list.name} - </InlineLink>{' '} + </InlineLinkText>{' '} list which you have muted. </Trans> ) @@ -127,12 +126,12 @@ function ModerationDetailsDialogInner({ {modcause.source.type === 'user' ? ( <Trans>the author</Trans> ) : ( - <InlineLink + <InlineLinkText to={makeProfileLink({did: modcause.label.src, handle: ''})} onPress={() => control.close()} style={a.text_md}> {desc.source} - </InlineLink> + </InlineLinkText> )} . </Trans> |