Skip to content

Send files directly between devices over the internet - no cloud storage, no size limits.

Add shared MenuItem component for settings rows

Denis Lupookova2b0f8afe4f8
diff --git a/apps/desktop/src/renderer/components/Settings/sections/AboutSection.tsx b/apps/desktop/src/renderer/components/Settings/sections/AboutSection.tsx
index 317bfc2..3ff8683 100644
--- a/apps/desktop/src/renderer/components/Settings/sections/AboutSection.tsx
+++ b/apps/desktop/src/renderer/components/Settings/sections/AboutSection.tsx
@@ -1,4 +1,4 @@
-import { LinkCard, LinkRow, useTheme } from '@altersend/components'
+import { MenuGroup, MenuItem, useTheme } from '@altersend/components'
import {
ArrowUpRightIcon,
DiscordIcon,
@@ -39,24 +39,27 @@ export function AboutSection({ version }: { version: string }) {
return (
<SectionShell title={t('settings:sections.about')}>
- <div className='mb-4 flex items-center gap-[14px] rounded-xl border border-border-primary bg-background-subtle px-[18px] py-4'>
- <div className='h-10 w-10 shrink-0 overflow-hidden rounded-[10px]'>
- <img src={logo} alt='' aria-hidden className='h-full w-full object-cover' />
- </div>
- <p className='m-0 min-w-0 flex-1 text-[15px] font-semibold text-text-primary'>AlterSend</p>
- <span className='shrink-0 text-[14px] tabular-nums text-text-muted'>v{version}</span>
- </div>
-
<div className='flex flex-col gap-4'>
+ <MenuGroup>
+ <MenuItem
+ isLast
+ iconSize={36}
+ icon={
+ <img src={logo} alt='' aria-hidden className='h-9 w-9 rounded-[10px] object-cover' />
+ }
+ label='AlterSend'
+ value={`v${version}`}
+ />
+ </MenuGroup>
+
{aboutLinkGroups.map((group) => (
- <LinkCard key={group[0].key}>
+ <MenuGroup key={group[0].key}>
{group.map(({ key, labelKey, url }, index) => {
const Icon = linkIcons[key]
return (
- <LinkRow
+ <MenuItem
key={key}
- compact
- icon={<Icon size={16} color={c.colorTextSecondary} />}
+ icon={<Icon size={19} color={c.colorTextSecondary} />}
label={t(labelKey)}
trailing={<ArrowUpRightIcon size={14} color={c.colorTextMuted} />}
onPress={() => openUrl(url)}
@@ -64,7 +67,7 @@ export function AboutSection({ version }: { version: string }) {
/>
)
})}
- </LinkCard>
+ </MenuGroup>
))}
</div>
diff --git a/apps/mobile/app/about.tsx b/apps/mobile/app/about.tsx
index 9b2c45f..fb21f8f 100644
--- a/apps/mobile/app/about.tsx
+++ b/apps/mobile/app/about.tsx
@@ -1,6 +1,6 @@
import { Image, Linking, StyleSheet, View } from 'react-native'
import Constants from 'expo-constants'
-import { LinkCard, LinkRow, useTheme } from '@altersend/components'
+import { MenuGroup, MenuItem, useTheme } from '@altersend/components'
import {
ArrowUpRightIcon,
DiscordIcon,
@@ -63,21 +63,21 @@ export default function AboutScreen() {
</View>
{aboutLinkGroups.map((group) => (
- <LinkCard key={group[0].key}>
+ <MenuGroup key={group[0].key}>
{group.map(({ key, labelKey, url }, index) => {
const Icon = linkIcons[key]
return (
- <LinkRow
+ <MenuItem
key={key}
label={t(labelKey)}
- icon={<Icon size={16} color={c.colorTextSecondary} />}
+ icon={<Icon size={19} color={c.colorTextSecondary} />}
trailing={<ArrowUpRightIcon size={15} color={c.colorTextMuted} />}
onPress={() => openUrl(url)}
isLast={index === group.length - 1}
/>
)
})}
- </LinkCard>
+ </MenuGroup>
))}
<Text style={[styles.footer, { color: c.colorTextFaint }]}>
diff --git a/apps/mobile/app/language.tsx b/apps/mobile/app/language.tsx
index a936000..0d57ba2 100644
--- a/apps/mobile/app/language.tsx
+++ b/apps/mobile/app/language.tsx
@@ -47,7 +47,7 @@ export default function LanguageScreen() {
}
return (
- <Layout description={t('settings:languageHint')} hasNativeHeader>
+ <Layout hasNativeHeader>
<LinkCard>
{LOCALE_OPTIONS.map((option, index) => {
const selected = option.preference === preference
diff --git a/apps/mobile/app/receive/incoming.tsx b/apps/mobile/app/receive/incoming.tsx
index e72a617..1f57761 100644
--- a/apps/mobile/app/receive/incoming.tsx
+++ b/apps/mobile/app/receive/incoming.tsx
@@ -2,11 +2,12 @@ import { useCallback, useEffect } from 'react'
import { View, StyleSheet, Pressable } from 'react-native'
import { Paths } from 'expo-file-system'
import { Button, useTheme } from '@altersend/components'
-import { ArrowLeftIcon, DownloadIcon, InfoIcon, PlayIcon } from '@altersend/components/icons'
+import { DownloadIcon, InfoIcon, PlayIcon } from '@altersend/components/icons'
import { useTranslation } from '@altersend/locales'
import { useNavigation, useRouter } from 'expo-router'
import { uriToPath } from '@/src/api/mobileApi'
import { Layout, IllustrationLayout } from '@/src/components'
+import { IconButton } from '@/src/components/IconButton'
import { ReceiveIncomingView, ReceiveReconnectingView } from '@/src/transfer/receive'
import { useErrorToast } from '@/src/transfer/receive/utils/useErrorToast'
import { exitToReceiveTab } from '@/src/transfer/receive/utils/exitToReceiveTab'
@@ -66,19 +67,7 @@ export default function ReceiveIncomingScreen() {
navigation.setOptions({
headerBackVisible: false,
headerLeft: () => (
- <Pressable
- accessibilityRole='button'
- accessibilityLabel={t('common:actions.back')}
- onPress={handleEndSession}
- hitSlop={12}
- style={({ pressed }) => ({
- paddingHorizontal: 8,
- paddingVertical: 4,
- opacity: pressed ? 0.6 : 1
- })}
- >
- <ArrowLeftIcon size={22} color={theme.colors.colorTextPrimary} />
- </Pressable>
+ <IconButton icon='back' label={t('common:actions.back')} onPress={handleEndSession} />
)
})
}, [navigation, handleEndSession, t, theme.colors.colorTextPrimary])
diff --git a/apps/mobile/app/receive/scan.tsx b/apps/mobile/app/receive/scan.tsx
index 300a46b..fcef884 100644
--- a/apps/mobile/app/receive/scan.tsx
+++ b/apps/mobile/app/receive/scan.tsx
@@ -1,5 +1,5 @@
import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { ActivityIndicator, Linking, Pressable, StyleSheet, View } from 'react-native'
+import { ActivityIndicator, Linking, StyleSheet, View } from 'react-native'
import {
CameraView,
scanFromURLAsync,
@@ -8,12 +8,13 @@ import {
} from 'expo-camera'
import * as ImagePicker from 'expo-image-picker'
import { Button, useTheme, withAlpha } from '@altersend/components'
-import { ArrowLeftIcon, QrCodeIcon } from '@altersend/components/icons'
+import { QrCodeIcon } from '@altersend/components/icons'
import { useTranslation } from '@altersend/locales'
import { useNavigation, useRouter } from 'expo-router'
import { extractJoinCode, useTransferStore } from '@altersend/domain'
import { joinSession } from '@altersend/domain'
import { Layout } from '@/src/components'
+import { IconButton } from '@/src/components/IconButton'
import { useToast } from '@/src/components/Toast'
import { Text } from '@/src/components/ThemedText'
@@ -46,21 +47,7 @@ export default function ReceiveScanScreen() {
useEffect(() => {
navigation.setOptions({
headerBackVisible: false,
- headerLeft: () => (
- <Pressable
- accessibilityLabel={t('common:actions.back')}
- accessibilityRole='button'
- hitSlop={12}
- onPress={goBack}
- style={({ pressed }) => ({
- paddingHorizontal: 8,
- paddingVertical: 4,
- opacity: pressed ? 0.6 : 1
- })}
- >
- <ArrowLeftIcon size={22} color={theme.colors.colorTextPrimary} />
- </Pressable>
- )
+ headerLeft: () => <IconButton icon='back' label={t('common:actions.back')} onPress={goBack} />
})
}, [goBack, navigation, t, theme.colors.colorTextPrimary])
diff --git a/apps/mobile/app/send/preparing.tsx b/apps/mobile/app/send/preparing.tsx
index 3ff9091..87ecd9f 100644
--- a/apps/mobile/app/send/preparing.tsx
+++ b/apps/mobile/app/send/preparing.tsx
@@ -1,11 +1,10 @@
import { useCallback, useEffect } from 'react'
-import { Pressable } from 'react-native'
import { useTheme } from '@altersend/components'
-import { ArrowLeftIcon } from '@altersend/components/icons'
import { getSendStep, isShareStep, useTransferStore } from '@altersend/domain'
import { clearSenderFlow } from '@altersend/domain'
import { useTranslation } from '@altersend/locales'
import { Layout } from '@/src/components'
+import { IconButton } from '@/src/components/IconButton'
import { PreparingView } from '@/src/transfer/send'
import { useNavigation, useRouter } from 'expo-router'
@@ -30,19 +29,7 @@ export default function SendPreparingScreen() {
navigation.setOptions({
headerBackVisible: false,
headerLeft: () => (
- <Pressable
- accessibilityRole='button'
- accessibilityLabel={t('common:actions.back')}
- onPress={handleBack}
- hitSlop={12}
- style={({ pressed }) => ({
- paddingHorizontal: 8,
- paddingVertical: 4,
- opacity: pressed ? 0.6 : 1
- })}
- >
- <ArrowLeftIcon size={22} color={theme.colors.colorTextPrimary} />
- </Pressable>
+ <IconButton icon='back' label={t('common:actions.back')} onPress={handleBack} />
)
})
}, [navigation, handleBack, t, theme.colors.colorTextPrimary])
diff --git a/apps/mobile/app/send/share.tsx b/apps/mobile/app/send/share.tsx
index 409cd31..0cea437 100644
--- a/apps/mobile/app/send/share.tsx
+++ b/apps/mobile/app/send/share.tsx
@@ -1,10 +1,10 @@
import { useCallback, useEffect } from 'react'
-import { Platform, Pressable, View } from 'react-native'
+import { Platform, View } from 'react-native'
import { Button, useTheme } from '@altersend/components'
-import { ArrowLeftIcon } from '@altersend/components/icons'
import { clearSenderFlow, getSendPageCopy, getSendStep, useTransferStore } from '@altersend/domain'
import { useTranslation } from '@altersend/locales'
import { Layout } from '@/src/components'
+import { IconButton } from '@/src/components/IconButton'
import { ShareView } from '@/src/transfer/send'
import { useNavigation } from 'expo-router'
@@ -26,19 +26,7 @@ export default function SendShareScreen() {
navigation.setOptions({
headerBackVisible: false,
headerLeft: () => (
- <Pressable
- accessibilityRole='button'
- accessibilityLabel={t('common:actions.back')}
- onPress={handleBack}
- hitSlop={12}
- style={({ pressed }) => ({
- paddingHorizontal: 8,
- paddingVertical: 4,
- opacity: pressed ? 0.6 : 1
- })}
- >
- <ArrowLeftIcon size={22} color={theme.colors.colorTextPrimary} />
- </Pressable>
+ <IconButton icon='back' label={t('common:actions.back')} onPress={handleBack} />
)
})
}, [navigation, handleBack, t, theme.colors.colorTextPrimary])
diff --git a/apps/mobile/app/settings.tsx b/apps/mobile/app/settings.tsx
index a4f3596..17a4ce2 100644
--- a/apps/mobile/app/settings.tsx
+++ b/apps/mobile/app/settings.tsx
@@ -3,17 +3,16 @@ import { StyleSheet, View } from 'react-native'
import { useFocusEffect, useRouter } from 'expo-router'
import { LOCALE_OPTIONS, useTranslation, type LocalePreference } from '@altersend/locales'
import { loadPeers, useTransferStore } from '@altersend/domain'
-import { LinkCard, LinkRow, useTheme } from '@altersend/components'
+import { MenuGroup, MenuItem, useTheme } from '@altersend/components'
import {
- AlertCircleIcon,
GlobeIcon,
InfoIcon,
+ MailIcon,
SlidersHorizontalIcon,
SmartphoneIcon,
WaypointsIcon
} from '@altersend/components/icons'
import { Layout } from '@/src/components'
-import { Text } from '@/src/components/ThemedText'
import {
getLocalePreferenceSnapshot,
getSavedLocalePreference,
@@ -59,59 +58,45 @@ export default function SettingsScreen() {
return (
<Layout hasNativeHeader>
<View style={styles.container}>
- <View style={styles.section}>
- <Text style={[styles.sectionTitle, { color: c.colorTextMuted }]}>
- {t('settings:sections.general')}
- </Text>
- <LinkCard>
- <LinkRow
- label={t('settings:pairing.pairedDevices')}
- subtitle={
- peers.length === 0
- ? t('settings:rows.noDevices')
- : t('settings:rows.pairedCount', { count: peers.length })
- }
- icon={<SmartphoneIcon size={16} color={c.colorTextSecondary} />}
- onPress={() => router.push('/devices')}
- />
- <LinkRow
- label={t('settings:sections.general')}
- icon={<SlidersHorizontalIcon size={16} color={c.colorTextSecondary} />}
- onPress={() => router.push('/general')}
- />
- <LinkRow
- label={t('common:labels.language')}
- subtitle={languageLabel}
- icon={<GlobeIcon size={16} color={c.colorTextSecondary} />}
- onPress={() => router.push('/language')}
- />
- <LinkRow
- isLast
- label={t('settings:rows.connection')}
- icon={<WaypointsIcon size={16} color={c.colorTextSecondary} />}
- onPress={() => router.push('/connection')}
- />
- </LinkCard>
- </View>
+ <MenuGroup title={t('settings:sections.general')}>
+ <MenuItem
+ label={t('settings:pairing.pairedDevices')}
+ value={peers.length === 0 ? undefined : String(peers.length)}
+ icon={<SmartphoneIcon size={19} color={c.colorTextSecondary} />}
+ onPress={() => router.push('/devices')}
+ />
+ <MenuItem
+ label={t('settings:sections.general')}
+ icon={<SlidersHorizontalIcon size={19} color={c.colorTextSecondary} />}
+ onPress={() => router.push('/general')}
+ />
+ <MenuItem
+ label={t('common:labels.language')}
+ value={languageLabel}
+ icon={<GlobeIcon size={19} color={c.colorTextSecondary} />}
+ onPress={() => router.push('/language')}
+ />
+ <MenuItem
+ isLast
+ label={t('settings:rows.connection')}
+ icon={<WaypointsIcon size={19} color={c.colorTextSecondary} />}
+ onPress={() => router.push('/connection')}
+ />
+ </MenuGroup>
- <View style={styles.section}>
- <Text style={[styles.sectionTitle, { color: c.colorTextMuted }]}>
- {t('settings:sections.support')}
- </Text>
- <LinkCard>
- <LinkRow
- label={t('settings:rows.feedback')}
- icon={<AlertCircleIcon size={16} color={c.colorTextSecondary} />}
- onPress={() => router.push('/report')}
- />
- <LinkRow
- isLast
- label={t('settings:sections.about')}
- icon={<InfoIcon size={16} color={c.colorTextSecondary} />}
- onPress={() => router.push('/about')}
- />
- </LinkCard>
- </View>
+ <MenuGroup title={t('settings:sections.support')}>
+ <MenuItem
+ label={t('settings:rows.feedback')}
+ icon={<MailIcon size={19} color={c.colorTextSecondary} />}
+ onPress={() => router.push('/report')}
+ />
+ <MenuItem
+ isLast
+ label={t('settings:sections.about')}
+ icon={<InfoIcon size={19} color={c.colorTextSecondary} />}
+ onPress={() => router.push('/about')}
+ />
+ </MenuGroup>
</View>
</Layout>
)
@@ -120,15 +105,5 @@ export default function SettingsScreen() {
const styles = StyleSheet.create({
container: {
gap: 22
- },
- section: {
- gap: 8
- },
- sectionTitle: {
- fontSize: 11,
- fontWeight: '600',
- textTransform: 'uppercase',
- letterSpacing: 0.5,
- paddingHorizontal: 4
}
})
diff --git a/apps/mobile/src/components/AddPairDeviceSheet/index.tsx b/apps/mobile/src/components/AddPairDeviceSheet/index.tsx
index 771eadc..01fa06e 100644
--- a/apps/mobile/src/components/AddPairDeviceSheet/index.tsx
+++ b/apps/mobile/src/components/AddPairDeviceSheet/index.tsx
@@ -1,5 +1,5 @@
import { StyleSheet, View } from 'react-native'
-import { ListItem, useTheme } from '@altersend/components'
+import { MenuItem, useTheme } from '@altersend/components'
import { ClipboardIcon, CodeIcon, QrCodeIcon } from '@altersend/components/icons'
import { useTranslation } from '@altersend/locales'
import { BottomSheet } from '../BottomSheet'
@@ -28,31 +28,24 @@ export function AddPairDeviceSheet({
return (
<BottomSheet open={open} onClose={onClose} onDismiss={onDismiss} sheetStyle={styles.sheet}>
<View style={styles.actionList}>
- <ListItem
- icon={<QrCodeIcon size={15} />}
+ <MenuItem
+ chevron={false}
+ icon={<QrCodeIcon size={19} color={c.colorTextSecondary} />}
label={t('settings:pairing.showQrCode')}
- variant='plain'
- size='large'
- square
- onClick={onShowQrCode}
+ onPress={onShowQrCode}
/>
- <View style={[styles.divider, { backgroundColor: c.colorBorderPrimary }]} />
- <ListItem
- icon={<CodeIcon size={15} />}
+ <MenuItem
+ chevron={false}
+ icon={<CodeIcon size={19} color={c.colorTextSecondary} />}
label={t('settings:pairing.scanQrCode')}
- variant='plain'
- size='large'
- square
- onClick={onScanQrCode}
+ onPress={onScanQrCode}
/>
- <View style={[styles.divider, { backgroundColor: c.colorBorderPrimary }]} />
- <ListItem
- icon={<ClipboardIcon size={15} />}
+ <MenuItem
+ isLast
+ chevron={false}
+ icon={<ClipboardIcon size={19} color={c.colorTextSecondary} />}
label={t('settings:pairing.enterCode')}
- variant='plain'
- size='large'
- square
- onClick={onEnterCode}
+ onPress={onEnterCode}
/>
</View>
</BottomSheet>
@@ -61,6 +54,5 @@ export function AddPairDeviceSheet({
const styles = StyleSheet.create({
sheet: { paddingBottom: 46, gap: 10 },
- actionList: { paddingTop: 8 },
- divider: { height: 1, marginRight: 20, marginLeft: 50 }
+ actionList: { paddingTop: 8 }
})
diff --git a/apps/mobile/src/components/DeviceActionsSheet/index.tsx b/apps/mobile/src/components/DeviceActionsSheet/index.tsx
index 97af1d1..6555541 100644
--- a/apps/mobile/src/components/DeviceActionsSheet/index.tsx
+++ b/apps/mobile/src/components/DeviceActionsSheet/index.tsx
@@ -1,5 +1,5 @@
import { StyleSheet, View } from 'react-native'
-import { ListItem } from '@altersend/components'
+import { MenuItem, useTheme } from '@altersend/components'
import { PencilIcon, TrashIcon } from '@altersend/components/icons'
import { useTranslation } from '@altersend/locales'
import { BottomSheet } from '../BottomSheet'
@@ -13,24 +13,25 @@ interface DeviceActionsSheetProps {
export function DeviceActionsSheet({ open, onClose, onRemove, onRename }: DeviceActionsSheetProps) {
const { t } = useTranslation(['settings'])
+ const { theme } = useTheme()
+ const c = theme.colors
return (
<BottomSheet open={open} onClose={onClose} sheetStyle={styles.sheet}>
<View style={styles.actionList}>
- <ListItem
- size='large'
- square
- icon={<PencilIcon size={16} />}
+ <MenuItem
+ chevron={false}
+ icon={<PencilIcon size={19} color={c.colorTextSecondary} />}
label={t('settings:pairing.renameDevice')}
- onClick={onRename}
+ onPress={onRename}
/>
- <ListItem
+ <MenuItem
+ isLast
+ chevron={false}
tone='danger'
- size='large'
- square
- icon={<TrashIcon size={16} />}
+ icon={<TrashIcon size={19} color={c.colorDanger} />}
label={t('settings:pairing.removeDevice')}
- onClick={onRemove}
+ onPress={onRemove}
/>
</View>
</BottomSheet>
diff --git a/packages/components/src/components/ListItem/ListItem.tsx b/packages/components/src/components/ListItem/ListItem.tsx
index 2728bf8..0a7e43b 100644
--- a/packages/components/src/components/ListItem/ListItem.tsx
+++ b/packages/components/src/components/ListItem/ListItem.tsx
@@ -1,6 +1,5 @@
import { cloneElement, isValidElement, type ReactElement, type ReactNode } from 'react'
import { html } from 'react-strict-dom'
-import { ChevronRightIcon } from '../../icons'
import { usePressState } from '../../hooks/usePressState'
import { useTheme } from '../../theme'
import { Tooltip } from '../Tooltip'
@@ -14,12 +13,8 @@ export interface ListItemProps {
active?: boolean
collapsed?: boolean
showDot?: boolean
- chevron?: boolean
tone?: 'default' | 'danger'
variant?: 'default' | 'plain'
- size?: 'default' | 'large'
- square?: boolean
- subtitle?: string
}
export function ListItem({
@@ -30,18 +25,13 @@ export function ListItem({
active = false,
collapsed = false,
showDot = false,
- chevron = false,
tone = 'default',
- variant = 'default',
- size = 'default',
- square = false,
- subtitle
+ variant = 'default'
}: ListItemProps) {
const { theme } = useTheme()
const c = theme.colors
const { isHovered, isPressed, pressHandlers } = usePressState()
const hot = isHovered || isPressed
- const large = size === 'large' && !collapsed
const contentColor = active
? c.colorTextPrimary
@@ -84,32 +74,16 @@ export function ListItem({
style={[
styles.base,
collapsed ? styles.collapsed : styles.expanded,
- large && styles.expandedLarge,
- square && styles.square,
{ backgroundColor } as never
]}
>
{collapsed ? (
iconSlot
) : (
- <>
- <html.div style={[styles.left, large && styles.leftLarge]}>
- {iconSlot}
- {subtitle ? (
- <html.div style={styles.textColumn}>
- <html.span style={[styles.label, { color: contentColor } as never]}>
- {label}
- </html.span>
- <html.span style={styles.subtitle}>{subtitle}</html.span>
- </html.div>
- ) : (
- <html.span style={[styles.label, { color: contentColor } as never]}>
- {label}
- </html.span>
- )}
- </html.div>
- {chevron ? <ChevronRightIcon size={14} color={contentColor} /> : null}
- </>
+ <html.div style={styles.left}>
+ {iconSlot}
+ <html.span style={[styles.label, { color: contentColor } as never]}>{label}</html.span>
+ </html.div>
)}
{collapsed && tooltip ? <Tooltip label={tooltip} visible={isHovered} side='right' /> : null}
diff --git a/packages/components/src/components/ListItem/styles.ts b/packages/components/src/components/ListItem/styles.ts
index 5726f4e..8cfc79d 100644
--- a/packages/components/src/components/ListItem/styles.ts
+++ b/packages/components/src/components/ListItem/styles.ts
@@ -36,24 +36,11 @@ export const styles = css.create({
paddingTop: tokens.space25,
paddingBottom: tokens.space25
},
- expandedLarge: {
- minHeight: tokens.space14,
- gap: tokens.space3,
- paddingLeft: tokens.space5,
- paddingRight: tokens.space5,
- paddingTop: tokens.space4,
- paddingBottom: tokens.space4,
- fontSize: tokens.fontSizeLg,
- fontWeight: tokens.fontWeightSemibold
- },
collapsed: {
width: tokens.space10,
height: tokens.space10,
justifyContent: 'center'
},
- square: {
- borderRadius: 0
- },
left: {
display: 'flex',
flexDirection: 'row',
@@ -61,9 +48,6 @@ export const styles = css.create({
minWidth: 0,
gap: tokens.space25
},
- leftLarge: {
- gap: tokens.space3
- },
iconSlot: {
position: 'relative',
display: 'flex',
@@ -81,27 +65,11 @@ export const styles = css.create({
backgroundColor: tokens.colorSuccess,
boxShadow: `0 0 0 2px ${tokens.colorBackgroundDeep}`
},
- textColumn: {
- display: 'flex',
- flexDirection: 'column',
- minWidth: 0,
- gap: 2
- },
label: {
margin: 0,
overflow: 'hidden',
textOverflow: 'ellipsis',
whiteSpace: 'nowrap',
lineHeight: tokens.lineHeightTight
- },
- subtitle: {
- margin: 0,
- overflow: 'hidden',
- textOverflow: 'ellipsis',
- whiteSpace: 'nowrap',
- fontSize: tokens.fontSizeSm,
- fontWeight: tokens.fontWeightRegular,
- lineHeight: tokens.lineHeightTight,
- color: tokens.colorTextMuted
}
})
diff --git a/packages/components/src/components/Menu/MenuGroup.tsx b/packages/components/src/components/Menu/MenuGroup.tsx
new file mode 100644
index 0000000..0dada69
--- /dev/null
+++ b/packages/components/src/components/Menu/MenuGroup.tsx
@@ -0,0 +1,17 @@
+import type { ReactNode } from 'react'
+import { html } from 'react-strict-dom'
+import { styles } from './styles'
+
+export interface MenuGroupProps {
+ title?: string
+ children: ReactNode
+}
+
+export function MenuGroup({ title, children }: MenuGroupProps) {
+ return (
+ <html.div style={styles.group}>
+ {title ? <html.p style={styles.heading}>{title}</html.p> : null}
+ <html.div style={styles.card}>{children}</html.div>
+ </html.div>
+ )
+}
diff --git a/packages/components/src/components/Menu/MenuItem.tsx b/packages/components/src/components/Menu/MenuItem.tsx
new file mode 100644
index 0000000..150954c
--- /dev/null
+++ b/packages/components/src/components/Menu/MenuItem.tsx
@@ -0,0 +1,108 @@
+import type { ReactNode } from 'react'
+import { html } from 'react-strict-dom'
+import { ChevronRightIcon } from '../../icons'
+import { usePressState } from '../../hooks/usePressState'
+import { useTheme } from '../../theme'
+import { styles } from './styles'
+
+const ROW_PADDING = 16
+const ICON_GAP = 14
+const DEFAULT_ICON_SIZE = 20
+
+const toneLabelStyle = {
+ default: null,
+ danger: styles.labelDanger
+} as const
+
+export interface MenuItemProps {
+ icon?: ReactNode
+ iconSize?: number
+ label: string
+ labelFontFamily?: string
+ subtitle?: string
+ value?: string
+ trailing?: ReactNode
+ chevron?: boolean
+ tone?: 'default' | 'danger'
+ onPress?: () => void
+ isLast?: boolean
+ disabled?: boolean
+}
+
+export function MenuItem({
+ icon,
+ iconSize = DEFAULT_ICON_SIZE,
+ label,
+ labelFontFamily,
+ subtitle,
+ value,
+ trailing,
+ chevron = true,
+ tone = 'default',
+ onPress,
+ isLast = false,
+ disabled = false
+}: MenuItemProps) {
+ const { theme } = useTheme()
+ const { isPressed, pressHandlers } = usePressState()
+ const interactive = !!onPress && !disabled
+
+ const renderTrailing = (): ReactNode => {
+ if (trailing !== undefined) return trailing
+ if (interactive && chevron)
+ return <ChevronRightIcon size={16} color={theme.colors.colorTextMuted} />
+ return null
+ }
+
+ const trailingContent = renderTrailing()
+
+ return (
+ <>
+ <html.div
+ {...(interactive ? pressHandlers : {})}
+ aria-disabled={disabled || undefined}
+ onClick={disabled ? undefined : onPress}
+ role={interactive ? 'button' : undefined}
+ style={[
+ styles.item,
+ interactive && styles.itemPressable,
+ interactive &&
+ isPressed &&
+ ({ backgroundColor: theme.colors.colorSurfacePrimary } as never)
+ ]}
+ tabIndex={interactive ? 0 : undefined}
+ >
+ {icon ? (
+ <html.div style={[styles.iconSlot, styles.iconSlotSize(iconSize)]}>{icon}</html.div>
+ ) : null}
+ <html.div style={styles.text}>
+ <html.p
+ style={[
+ styles.label,
+ toneLabelStyle[tone],
+ disabled && styles.labelDisabled,
+ labelFontFamily ? ({ fontFamily: labelFontFamily } as never) : null
+ ]}
+ >
+ {label}
+ </html.p>
+ {subtitle ? <html.p style={styles.subtitle}>{subtitle}</html.p> : null}
+ </html.div>
+ {value || trailingContent ? (
+ <html.div style={styles.trailing}>
+ {value ? <html.p style={styles.value}>{value}</html.p> : null}
+ {trailingContent}
+ </html.div>
+ ) : null}
+ </html.div>
+ {isLast ? null : (
+ <html.div
+ style={[
+ styles.divider,
+ styles.dividerInset(icon ? ROW_PADDING + iconSize + ICON_GAP : ROW_PADDING)
+ ]}
+ />
+ )}
+ </>
+ )
+}
diff --git a/packages/components/src/components/Menu/index.ts b/packages/components/src/components/Menu/index.ts
new file mode 100644
index 0000000..d13c806
--- /dev/null
+++ b/packages/components/src/components/Menu/index.ts
@@ -0,0 +1,2 @@
+export * from './MenuGroup'
+export * from './MenuItem'
diff --git a/packages/components/src/components/Menu/styles.ts b/packages/components/src/components/Menu/styles.ts
new file mode 100644
index 0000000..e81654f
--- /dev/null
+++ b/packages/components/src/components/Menu/styles.ts
@@ -0,0 +1,122 @@
+import { css } from 'react-strict-dom'
+import { tokens } from '../../theme/tokens.css'
+
+export const styles = css.create({
+ group: {
+ display: 'flex',
+ flexDirection: 'column',
+ gap: tokens.space2
+ },
+ heading: {
+ margin: 0,
+ paddingInline: tokens.space4,
+ color: tokens.colorTextMuted,
+ fontFamily: tokens.fontFamilySans,
+ fontSize: tokens.fontSizeLg,
+ fontWeight: tokens.fontWeightMedium,
+ lineHeight: tokens.lineHeightSnug
+ },
+ card: {
+ borderWidth: 1,
+ borderStyle: 'solid',
+ borderColor: tokens.colorBorderPrimary,
+ borderRadius: tokens.radius2xl,
+ overflow: 'hidden',
+ backgroundColor: tokens.colorBackgroundSubtle
+ },
+ item: {
+ display: 'flex',
+ flexDirection: 'row',
+ alignItems: 'center',
+ gap: tokens.space35,
+ paddingInline: tokens.space4,
+ paddingBlock: tokens.space4,
+ backgroundColor: 'transparent',
+ borderWidth: 0,
+ outlineStyle: 'none',
+ textAlign: 'left',
+ width: '100%',
+ boxSizing: 'border-box',
+ ':focus-visible': {
+ outlineStyle: 'none',
+ boxShadow: 'none'
+ }
+ },
+ itemPressable: {
+ cursor: 'pointer',
+ transitionDuration: '150ms',
+ transitionProperty: 'background-color',
+ transitionTimingFunction: 'ease',
+ ':hover': {
+ backgroundColor: tokens.colorSurfacePrimary
+ }
+ },
+ iconSlot: {
+ flexShrink: 0,
+ display: 'flex',
+ alignItems: 'center',
+ justifyContent: 'center'
+ },
+ iconSlotSize: (size: number) => ({
+ width: size,
+ height: size
+ }),
+ text: {
+ minWidth: 0,
+ flex: 1,
+ display: 'flex',
+ flexDirection: 'column',
+ gap: tokens.space05
+ },
+ label: {
+ margin: 0,
+ overflow: 'hidden',
+ textOverflow: 'ellipsis',
+ whiteSpace: 'nowrap',
+ color: tokens.colorTextPrimary,
+ fontFamily: tokens.fontFamilySans,
+ fontSize: tokens.fontSizeLg,
+ fontWeight: tokens.fontWeightMedium,
+ lineHeight: tokens.lineHeightSnug
+ },
+ labelDisabled: {
+ color: tokens.colorTextMuted
+ },
+ labelDanger: {
+ color: tokens.colorDanger
+ },
+ subtitle: {
+ margin: 0,
+ overflow: 'hidden',
+ textOverflow: 'ellipsis',
+ whiteSpace: 'nowrap',
+ color: tokens.colorTextMuted,
+ fontFamily: tokens.fontFamilySans,
+ fontSize: tokens.fontSizeSm,
+ lineHeight: tokens.lineHeightNormal
+ },
+ trailing: {
+ marginLeft: 'auto',
+ flexShrink: 0,
+ display: 'flex',
+ flexDirection: 'row',
+ alignItems: 'center',
+ gap: tokens.space2
+ },
+ value: {
+ margin: 0,
+ color: tokens.colorTextMuted,
+ fontFamily: tokens.fontFamilySans,
+ fontSize: tokens.fontSizeLg,
+ lineHeight: tokens.lineHeightSnug,
+ whiteSpace: 'nowrap'
+ },
+ divider: {
+ height: 1,
+ marginRight: tokens.space4,
+ backgroundColor: tokens.colorBorderPrimary
+ },
+ dividerInset: (marginLeft: number) => ({
+ marginLeft
+ })
+})
diff --git a/packages/components/src/components/index.ts b/packages/components/src/components/index.ts
index 061586b..ea7c4b2 100644
--- a/packages/components/src/components/index.ts
+++ b/packages/components/src/components/index.ts
@@ -12,6 +12,7 @@ export * from './Input/index'
export * from './KeepAppOpenHint/index'
export * from './LinkRow/index'
export * from './ListItem/index'
+export * from './Menu/index'
export * from './Modal'
export * from './PaginationDots/index'
export * from './PeerListCard/index'
diff --git a/packages/locales/src/locales/de-DE/settings.json b/packages/locales/src/locales/de-DE/settings.json
index a484663..a3583d1 100644
--- a/packages/locales/src/locales/de-DE/settings.json
+++ b/packages/locales/src/locales/de-DE/settings.json
@@ -1,7 +1,6 @@
{
"title": "Einstellungen",
"languageTitle": "Sprache",
- "languageHint": "Wählen Sie die von AlterSend verwendete Sprache.",
"sections": {
"general": "Allgemein",
"support": "Unterstützung",
@@ -31,8 +30,6 @@
"terms": "Nutzungsbedingungen",
"termsHint": "Regeln für die Verwendung von AlterSend",
"website": "Webseite",
- "noDevices": "Noch keine Geräte",
- "pairedCount": "{{count}} gekoppelt",
"connection": "Relay"
},
"pairing": {
diff --git a/packages/locales/src/locales/en-GB/settings.json b/packages/locales/src/locales/en-GB/settings.json
index 8a91679..b8cc015 100644
--- a/packages/locales/src/locales/en-GB/settings.json
+++ b/packages/locales/src/locales/en-GB/settings.json
@@ -1,7 +1,6 @@
{
"title": "Settings",
"languageTitle": "Language",
- "languageHint": "Choose the language used by AlterSend.",
"sections": {
"general": "General",
"support": "Support",
@@ -31,8 +30,6 @@
"terms": "Terms of service",
"termsHint": "Rules for using AlterSend",
"website": "Website",
- "noDevices": "No devices yet",
- "pairedCount": "{{count}} paired",
"connection": "Relay"
},
"pairing": {
diff --git a/packages/locales/src/locales/en-US/settings.json b/packages/locales/src/locales/en-US/settings.json
index 9f12255..f2b3d37 100644
--- a/packages/locales/src/locales/en-US/settings.json
+++ b/packages/locales/src/locales/en-US/settings.json
@@ -1,7 +1,6 @@
{
"title": "Settings",
"languageTitle": "Language",
- "languageHint": "Choose the language used by AlterSend.",
"sections": {
"general": "General",
"support": "Support",
@@ -47,8 +46,6 @@
"terms": "Terms of service",
"termsHint": "Rules for using AlterSend",
"website": "Website",
- "noDevices": "No devices yet",
- "pairedCount": "{{count}} paired",
"connection": "Relay"
},
"pairing": {
diff --git a/packages/locales/src/locales/es-419/settings.json b/packages/locales/src/locales/es-419/settings.json
index 6350add..d5077af 100644
--- a/packages/locales/src/locales/es-419/settings.json
+++ b/packages/locales/src/locales/es-419/settings.json
@@ -1,7 +1,6 @@
{
"title": "Configuración",
"languageTitle": "Idioma",
- "languageHint": "Elige el idioma utilizado por AlterSend.",
"sections": {
"general": "General",
"support": "Soporte",
@@ -31,8 +30,6 @@
"terms": "Términos de servicio",
"termsHint": "Reglas para usar AlterSend",
"website": "Sitio web",
- "noDevices": "Aún no hay dispositivos",
- "pairedCount": "{{count}} emparejados",
"connection": "Relé"
},
"pairing": {
diff --git a/packages/locales/src/locales/es-ES/settings.json b/packages/locales/src/locales/es-ES/settings.json
index 644e2d1..dd1ba60 100644
--- a/packages/locales/src/locales/es-ES/settings.json
+++ b/packages/locales/src/locales/es-ES/settings.json
@@ -1,7 +1,6 @@
{
"title": "Ajustes",
"languageTitle": "Idioma",
- "languageHint": "Elige el idioma utilizado por AlterSend.",
"sections": {
"general": "General",
"support": "Soporte",
@@ -31,8 +30,6 @@
"terms": "Términos de servicio",
"termsHint": "Reglas para usar AlterSend",
"website": "Sitio web",
- "noDevices": "Aún no hay dispositivos",
- "pairedCount": "{{count}} emparejados",
"connection": "Relé"
},
"pairing": {
diff --git a/packages/locales/src/locales/fr-FR/settings.json b/packages/locales/src/locales/fr-FR/settings.json
index 7d97f72..81ad54c 100644
--- a/packages/locales/src/locales/fr-FR/settings.json
+++ b/packages/locales/src/locales/fr-FR/settings.json
@@ -1,7 +1,6 @@
{
"title": "Paramètres",
"languageTitle": "Langue",
- "languageHint": "Choisissez la langue utilisée par AlterSend.",
"sections": {
"general": "Général",
"support": "Assistance",
@@ -31,8 +30,6 @@
"terms": "Conditions d'utilisation",
"termsHint": "Règles d'utilisation de AlterSend",
"website": "Site Web",
- "noDevices": "Aucun appareil pour l’instant",
- "pairedCount": "{{count}} associé(s)",
"connection": "Relais"
},
"pairing": {
diff --git a/packages/locales/src/locales/it-IT/settings.json b/packages/locales/src/locales/it-IT/settings.json
index 37ca196..3701b08 100644
--- a/packages/locales/src/locales/it-IT/settings.json
+++ b/packages/locales/src/locales/it-IT/settings.json
@@ -1,7 +1,6 @@
{
"title": "Impostazioni",
"languageTitle": "Lingua",
- "languageHint": "Scegli la lingua utilizzata da AlterSend.",
"sections": {
"general": "Generale",
"support": "Supporto",
@@ -31,8 +30,6 @@
"terms": "Termini di servizio",
"termsHint": "Regole per l'utilizzo di AlterSend",
"website": "Sito web",
- "noDevices": "Ancora nessun dispositivo",
- "pairedCount": "{{count}} accoppiati",
"connection": "Relay"
},
"pairing": {
diff --git a/packages/locales/src/locales/ja-JP/settings.json b/packages/locales/src/locales/ja-JP/settings.json
index 97f1af5..54a2c2b 100644
--- a/packages/locales/src/locales/ja-JP/settings.json
+++ b/packages/locales/src/locales/ja-JP/settings.json
@@ -1,7 +1,6 @@
{
"title": "設定",
"languageTitle": "言語",
- "languageHint": "AlterSend で使用する言語を選択します。",
"sections": {
"general": "一般",
"support": "サポート",
@@ -31,8 +30,6 @@
"terms": "利用規約",
"termsHint": "AlterSend の利用ルール",
"website": "Webサイト",
- "noDevices": "デバイスはまだありません",
- "pairedCount": "{{count}} 台ペアリング済み",
"connection": "リレー"
},
"pairing": {
diff --git a/packages/locales/src/locales/ko-KR/settings.json b/packages/locales/src/locales/ko-KR/settings.json
index 54e4b96..7635a6b 100644
--- a/packages/locales/src/locales/ko-KR/settings.json
+++ b/packages/locales/src/locales/ko-KR/settings.json
@@ -1,7 +1,6 @@
{
"title": "설정",
"languageTitle": "언어",
- "languageHint": "AlterSend에서 사용하는 언어를 선택하세요.",
"sections": {
"general": "일반",
"support": "지원",
@@ -31,8 +30,6 @@
"terms": "서비스 약관",
"termsHint": "AlterSend 사용 규칙",
"website": "웹사이트",
- "noDevices": "아직 기기가 없습니다",
- "pairedCount": "{{count}}개 페어링됨",
"connection": "릴레이"
},
"pairing": {
diff --git a/packages/locales/src/locales/pt-BR/settings.json b/packages/locales/src/locales/pt-BR/settings.json
index 6312f9c..4472a2c 100644
--- a/packages/locales/src/locales/pt-BR/settings.json
+++ b/packages/locales/src/locales/pt-BR/settings.json
@@ -1,7 +1,6 @@
{
"title": "Configurações",
"languageTitle": "Idioma",
- "languageHint": "Escolha o idioma usado pelo AlterSend.",
"sections": {
"general": "Geral",
"support": "Suporte",
@@ -31,8 +30,6 @@
"terms": "Termos de serviço",
"termsHint": "Regras para usar o AlterSend",
"website": "Site",
- "noDevices": "Ainda não há dispositivos",
- "pairedCount": "{{count}} emparelhados",
"connection": "Retransmissor"
},
"pairing": {
diff --git a/packages/locales/src/locales/ru-RU/settings.json b/packages/locales/src/locales/ru-RU/settings.json
index b5c22df..87d96d2 100644
--- a/packages/locales/src/locales/ru-RU/settings.json
+++ b/packages/locales/src/locales/ru-RU/settings.json
@@ -1,7 +1,6 @@
{
"title": "Настройки",
"languageTitle": "Язык",
- "languageHint": "Выберите язык, используемый AlterSend.",
"sections": {
"general": "Основные",
"support": "Поддержка",
@@ -47,8 +46,6 @@
"terms": "Условия использования",
"termsHint": "Правила использования AlterSend",
"website": "Веб-сайт",
- "noDevices": "Пока нет устройств",
- "pairedCount": "{{count}} в сопряжении",
"connection": "Ретранслятор"
},
"pairing": {
diff --git a/packages/locales/src/locales/zh-CN/settings.json b/packages/locales/src/locales/zh-CN/settings.json
index 6ad3c31..e64f802 100644
--- a/packages/locales/src/locales/zh-CN/settings.json
+++ b/packages/locales/src/locales/zh-CN/settings.json
@@ -1,7 +1,6 @@
{
"title": "设置",
"languageTitle": "语言",
- "languageHint": "选择 AlterSend 使用的语言。",
"sections": {
"general": "通用",
"support": "支持",
@@ -31,8 +30,6 @@
"terms": "服务条款",
"termsHint": "AlterSend 使用规则",
"website": "网站",
- "noDevices": "暂无设备",
- "pairedCount": "已配对 {{count}} 台",
"connection": "中继"
},
"pairing": {
diff --git a/packages/locales/src/locales/zh-TW/settings.json b/packages/locales/src/locales/zh-TW/settings.json
index 35f9c25..e6c21e5 100644
--- a/packages/locales/src/locales/zh-TW/settings.json
+++ b/packages/locales/src/locales/zh-TW/settings.json
@@ -1,7 +1,6 @@
{
"title": "設定",
"languageTitle": "語言",
- "languageHint": "選擇 AlterSend 使用的語言。",
"sections": {
"general": "一般",
"support": "支援",
@@ -31,8 +30,6 @@
"terms": "服務條款",
"termsHint": "AlterSend 使用規則",
"website": "網站",
- "noDevices": "尚無裝置",
- "pairedCount": "已配對 {{count}} 台",
"connection": "中繼"
},
"pairing": {
diff --git a/packages/locales/src/mobile-font-coverage.test.ts b/packages/locales/src/mobile-font-coverage.test.ts
index 83d3b3d..6e8fbfc 100644
--- a/packages/locales/src/mobile-font-coverage.test.ts
+++ b/packages/locales/src/mobile-font-coverage.test.ts
@@ -60,6 +60,10 @@ describe('mobile font coverage', () => {
join(repoRoot.pathname, 'packages/components/src/components/LinkRow/styles.ts'),
'utf8'
)
+ const menuSource = readFileSync(
+ join(repoRoot.pathname, 'packages/components/src/components/Menu/styles.ts'),
+ 'utf8'
+ )
expect(linkRowSource).toMatch(
/label:\s*\{[^}]*fontSize:\s*tokens\.fontSizeBase,[^}]*lineHeight:\s*tokens\.lineHeightSnug/s
@@ -67,6 +71,15 @@ describe('mobile font coverage', () => {
expect(linkRowSource).toMatch(
/subtitle:\s*\{[^}]*fontSize:\s*tokens\.fontSizeSm,[^}]*lineHeight:\s*tokens\.lineHeightNormal/s
)
+ expect(menuSource).toMatch(
+ /label:\s*\{[^}]*fontSize:\s*tokens\.fontSizeLg,[^}]*lineHeight:\s*tokens\.lineHeightSnug/s
+ )
+ expect(menuSource).toMatch(
+ /subtitle:\s*\{[^}]*fontSize:\s*tokens\.fontSizeSm,[^}]*lineHeight:\s*tokens\.lineHeightNormal/s
+ )
+ expect(menuSource).toMatch(
+ /value:\s*\{[^}]*fontSize:\s*tokens\.fontSizeLg,[^}]*lineHeight:\s*tokens\.lineHeightSnug/s
+ )
expect(aboutSource).toMatch(/brandName:\s*\{[^}]*fontSize:\s*20,[^}]*lineHeight:\s*26/s)
})
@@ -102,12 +115,19 @@ describe('mobile font coverage', () => {
it('does not send translated back titles to Android native stack headers', () => {
const layoutSource = readFileSync(join(mobileRoot.pathname, 'app/_layout.tsx'), 'utf8')
- const flowOptionsMatch = layoutSource.match(/function getFlowScreenOptions\([\s\S]*?\n\}/)?.[0]
+ const headerOptionsMatch = layoutSource.match(/function getHeaderOptions\([\s\S]*?\n\}/)?.[0]
expect(layoutSource).toContain('import { Platform')
- expect(flowOptionsMatch).toBeDefined()
- expect(flowOptionsMatch).toContain("Platform.OS === 'ios'")
- expect(flowOptionsMatch).not.toContain('headerBackTitle')
+ expect(headerOptionsMatch).toBeDefined()
+ expect(headerOptionsMatch).toContain("Platform.OS === 'ios'")
+ expect(layoutSource).not.toContain('headerBackTitle')
+ })
+
+ it('renders native stack header titles with the active locale font', () => {
+ const layoutSource = readFileSync(join(mobileRoot.pathname, 'app/_layout.tsx'), 'utf8')
+
+ expect(layoutSource).toContain('function getTitledScreenOptions')
+ expect(layoutSource).toMatch(/headerTitleStyle:\s*\{\s*fontFamily:\s*fontFamilyName\s*\}/)
})
it('registers CJK font weights through Expo and the runtime font loader', () => {