Skip to content

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

Wire text feature into UI (#46)

Denis Lupookov54e822e2cfd0
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index a50e516..fa39bf1 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -1,7 +1,7 @@
{
"name": "@altersend/desktop",
"productName": "AlterSend",
- "version": "1.4.0",
+ "version": "1.5.0",
"upgrade": "pear://w5u4xqsncqyfhb1owdqogr3mpg6b5tcdzn65pk88ispgew5jegso",
"description": "Peer-to-peer file transfer. No servers, no accounts.",
"license": "Apache-2.0",
@@ -33,10 +33,10 @@
"pear:build:win:x64": "npx pear-build --package=./package.json --win32-x64-app ./out/AlterSend-win32-x64/AlterSend.msix --target ..\\..\\.\\altersend-desktop-%npm_package_version%"
},
"dependencies": {
- "@altersend/components": "1.4.0",
- "@altersend/core": "1.4.0",
- "@altersend/domain": "1.4.0",
- "@altersend/locales": "1.4.0",
+ "@altersend/components": "1.5.0",
+ "@altersend/core": "1.5.0",
+ "@altersend/domain": "1.5.0",
+ "@altersend/locales": "1.5.0",
"@sentry/electron": "^7.13.0",
"b4a": "^1.8.0",
"bare-rpc": "^1.2.0",
diff --git a/apps/desktop/src/renderer/components/InviteBanner/InviteBanner.tsx b/apps/desktop/src/renderer/components/InviteBanner/InviteBanner.tsx
index 7bbbe9d..c16e5a3 100644
--- a/apps/desktop/src/renderer/components/InviteBanner/InviteBanner.tsx
+++ b/apps/desktop/src/renderer/components/InviteBanner/InviteBanner.tsx
@@ -1,9 +1,16 @@
import { useEffect, useState } from 'react'
-import { declineInvite, formatFileSize, useTransferStore } from '@altersend/domain'
+import {
+ declineInvite,
+ formatFileSize,
+ formatItemsCount,
+ useTransferStore
+} from '@altersend/domain'
+import { useTranslation } from '@altersend/locales'
import { Button } from '@altersend/components'
import { CheckIcon, CloseIcon, deviceIcon } from '@altersend/components/icons'
export function InviteBanner({ onAccept }: { onAccept: (topic: string) => void }) {
+ const { t } = useTranslation(['common'])
const invite = useTransferStore((s) => s.remember.incomingInvite)
const [accepted, setAccepted] = useState(false)
@@ -15,12 +22,15 @@ export function InviteBanner({ onAccept }: { onAccept: (topic: string) => void }
const Icon = deviceIcon(invite.deviceType)
- const fileLabel =
- invite.fileCount != null
- ? `${invite.fileCount} ${invite.fileCount === 1 ? 'file' : 'files'}`
- : 'files'
+ const fileCount = invite.fileCount ?? 0
+ const textCount = invite.textCount ?? 0
+ const hasCounts = fileCount > 0 || textCount > 0
+
+ const fileLabel = hasCounts
+ ? formatItemsCount(fileCount, textCount, t)
+ : t('common:files.filesGeneric')
const sizeLabel =
- invite.totalSize != null && invite.totalSize > 0 ? ` · ${formatFileSize(invite.totalSize)}` : ''
+ fileCount > 0 && invite.totalSize != null ? ` · ${formatFileSize(invite.totalSize)}` : ''
const accept = () => {
setAccepted(true)
@@ -54,8 +64,7 @@ export function InviteBanner({ onAccept }: { onAccept: (topic: string) => void }
{invite.displayName}
</p>
<p className='m-0 mt-0.5 text-[12px] leading-snug text-text-secondary'>
- wants to send you {fileLabel}
- {sizeLabel}
+ {t('common:status.wantsToSend', { label: fileLabel, size: sizeLabel })}
</p>
</div>
diff --git a/apps/desktop/src/renderer/components/Popover/Popover.tsx b/apps/desktop/src/renderer/components/Popover/Popover.tsx
index 321b138..6d73f9c 100644
--- a/apps/desktop/src/renderer/components/Popover/Popover.tsx
+++ b/apps/desktop/src/renderer/components/Popover/Popover.tsx
@@ -48,13 +48,19 @@ export function Popover({ trigger, children, align = 'right', variant = 'menu' }
: { top: anchorRect.bottom + 2, left: anchorRect.left }
: {}
+ const transformOrigin = variant === 'plain' || align === 'left' ? 'top left' : 'top right'
+
return (
<div ref={triggerRef}>
<div className='cursor-pointer' onClick={handleToggle}>
{trigger}
</div>
{open && anchorRect && (
- <div ref={popoverRef} className={`fixed z-[200] ${menuClass}`} style={posStyle}>
+ <div
+ ref={popoverRef}
+ className={`fixed z-[200] ${menuClass}`}
+ style={{ ...posStyle, transformOrigin, animation: 'as-scale-in 130ms ease-out' }}
+ >
{children(close)}
</div>
)}
diff --git a/apps/desktop/src/renderer/components/Settings/sections/DevicesSection.tsx b/apps/desktop/src/renderer/components/Settings/sections/DevicesSection.tsx
index 8ba01c2..381658e 100644
--- a/apps/desktop/src/renderer/components/Settings/sections/DevicesSection.tsx
+++ b/apps/desktop/src/renderer/components/Settings/sections/DevicesSection.tsx
@@ -3,7 +3,7 @@ import { createPortal } from 'react-dom'
import { Button, LinkRow, ListItem, useTheme } from '@altersend/components'
import {
ClipboardIcon,
- MoreVerticalIcon,
+ MoreHorizontalIcon,
PlusIcon,
QrCodeIcon,
TrashIcon,
@@ -103,7 +103,7 @@ export function DevicesSection() {
size='sm'
iconOnly
aria-label={t('settings:pairing.deviceActions')}
- icon={<MoreVerticalIcon size={14} />}
+ icon={<MoreHorizontalIcon size={14} />}
/>
}
>
diff --git a/apps/desktop/src/renderer/components/Settings/sections/FeedbackSection.tsx b/apps/desktop/src/renderer/components/Settings/sections/FeedbackSection.tsx
index be305e7..8890934 100644
--- a/apps/desktop/src/renderer/components/Settings/sections/FeedbackSection.tsx
+++ b/apps/desktop/src/renderer/components/Settings/sections/FeedbackSection.tsx
@@ -1,5 +1,5 @@
import { useState } from 'react'
-import { Button, FeedbackTypeSelector } from '@altersend/components'
+import { Button, FeedbackTypeSelector, Textarea } from '@altersend/components'
import { SendIcon } from '@altersend/components/icons'
import type { FeedbackType } from '@altersend/components'
import { submitFeedback } from '@altersend/domain'
@@ -45,9 +45,8 @@ export function FeedbackSection({ version }: { version: string }) {
disabled={reportState === 'sending'}
/>
</div>
- <textarea
- className='w-full resize-none rounded-lg border border-border-primary bg-background-subtle px-3 py-3 font-sans text-[13px] text-text-primary placeholder:text-text-muted focus:border-border-strong focus:outline-none disabled:opacity-50'
- rows={5}
+ <Textarea
+ minHeight={120}
placeholder={
reportType === 'bug'
? t('feedback:placeholders.desktopBug')
@@ -57,7 +56,7 @@ export function FeedbackSection({ version }: { version: string }) {
}
value={reportMessage}
disabled={reportState === 'sending'}
- onChange={(e) => {
+ onChange={(e: React.ChangeEvent<HTMLTextAreaElement>) => {
setReportMessage(e.target.value)
if (reportState === 'error') setReportState('idle')
}}
diff --git a/apps/desktop/src/renderer/components/Sidebar/Sidebar.tsx b/apps/desktop/src/renderer/components/Sidebar/Sidebar.tsx
index 89e1ee1..9a31c5b 100644
--- a/apps/desktop/src/renderer/components/Sidebar/Sidebar.tsx
+++ b/apps/desktop/src/renderer/components/Sidebar/Sidebar.tsx
@@ -46,17 +46,29 @@ export function Sidebar({
{!collapsed && (
<img src={logoMark} alt='AlterSend' className='h-6 w-auto shrink-0 object-contain' />
)}
- <Button
- variant='ghost'
- iconOnly
- size={collapsed ? 'md' : 'sm'}
- aria-label={toggleLabel}
- onClick={onToggleCollapsed}
- icon={collapsed ? <PanelLeftOpenIcon size={17} /> : <PanelLeftCloseIcon size={17} />}
- />
+ {collapsed ? (
+ <ListItem
+ icon={<PanelLeftOpenIcon size={17} />}
+ label={toggleLabel}
+ tooltip={toggleLabel}
+ collapsed
+ onClick={onToggleCollapsed}
+ />
+ ) : (
+ <Button
+ variant='ghost'
+ iconOnly
+ size='sm'
+ aria-label={toggleLabel}
+ tooltip={toggleLabel}
+ tooltipSide='bottom'
+ onClick={onToggleCollapsed}
+ icon={<PanelLeftCloseIcon size={17} />}
+ />
+ )}
</div>
- {collapsed && <div className='mx-3 mt-1 border-t border-border-primary' />}
+ {collapsed && <div className='mx-3 mt-3 border-t border-border-primary' />}
<nav
className={`flex flex-col gap-1 px-3 ${collapsed ? 'items-center pt-3' : 'pt-8'}`}
@@ -65,6 +77,7 @@ export function Sidebar({
<ListItem
icon={<SendIcon size={18} />}
label={t('common:labels.send')}
+ tooltip={t('common:labels.send')}
collapsed={collapsed}
active={activeTab === 'send'}
showDot={role === 'sender'}
@@ -73,6 +86,7 @@ export function Sidebar({
<ListItem
icon={<DownloadIcon size={18} />}
label={t('common:labels.receive')}
+ tooltip={t('common:labels.receive')}
collapsed={collapsed}
active={activeTab === 'receive'}
showDot={role === 'receiver'}
@@ -86,6 +100,7 @@ export function Sidebar({
<ListItem
icon={<SlidersHorizontalIcon size={18} />}
label={t('common:labels.settings')}
+ tooltip={t('common:labels.settings')}
collapsed={collapsed}
onClick={() => openSettingsPanel()}
/>
diff --git a/apps/desktop/src/renderer/components/TransferPrimitives/TransferPrimitives.tsx b/apps/desktop/src/renderer/components/TransferPrimitives/TransferPrimitives.tsx
index be96c22..2a7fb22 100644
--- a/apps/desktop/src/renderer/components/TransferPrimitives/TransferPrimitives.tsx
+++ b/apps/desktop/src/renderer/components/TransferPrimitives/TransferPrimitives.tsx
@@ -7,6 +7,7 @@ interface TransferCardProps {
children: ReactNode
footer?: ReactNode
badge?: ReactNode
+ headerRight?: ReactNode
}
type TransferTone = 'neutral' | 'success' | 'critical'
@@ -29,7 +30,8 @@ export function TransferCardFrame({
description,
footer,
title,
- badge
+ badge,
+ headerRight
}: TransferCardProps) {
const hasHeader = !!(title || badge)
return (
@@ -37,13 +39,16 @@ export function TransferCardFrame({
{hasHeader ? (
<div className='shrink-0'>
{badge ? <div className='mb-4'>{badge}</div> : null}
- <div className='max-w-[720px]'>
- <h2 className='m-0 text-[23px] font-semibold leading-[1.2] tracking-[-0.02em] text-text-primary'>
- {title}
- </h2>
- {description ? (
- <p className='m-0 mt-1 text-[14px] leading-6 text-text-secondary'>{description}</p>
- ) : null}
+ <div className='flex items-center justify-between gap-4'>
+ <div className='max-w-[720px]'>
+ <h2 className='m-0 text-[23px] font-semibold leading-[1.2] tracking-[-0.02em] text-text-primary'>
+ {title}
+ </h2>
+ {description ? (
+ <p className='m-0 mt-1 text-[14px] leading-6 text-text-secondary'>{description}</p>
+ ) : null}
+ </div>
+ {headerRight ? <div className='shrink-0'>{headerRight}</div> : null}
</div>
</div>
) : null}
diff --git a/apps/desktop/src/renderer/pages/ReceivePage/ReceiveConnectedView.tsx b/apps/desktop/src/renderer/pages/ReceivePage/ReceiveConnectedView.tsx
index a952d54..705735f 100644
--- a/apps/desktop/src/renderer/pages/ReceivePage/ReceiveConnectedView.tsx
+++ b/apps/desktop/src/renderer/pages/ReceivePage/ReceiveConnectedView.tsx
@@ -1,5 +1,5 @@
import { Fragment, useMemo, useState } from 'react'
-import { Button, LinkRow, useTheme } from '@altersend/components'
+import { Button, LinkRow, ReceivedTextRow, useTheme } from '@altersend/components'
import { ChevronRightIcon, DownloadIcon, FolderIcon } from '@altersend/components/icons'
import { useTranslation } from '@altersend/locales'
import { bridgeApi } from '../../api/bridgeApi'
@@ -13,12 +13,13 @@ import {
getFolderRowDisplay,
getOfferKey,
groupReceiveRows,
- type ReceiveFolderRow,
+ useCopiedFlag,
useTransferStore
} from '@altersend/domain'
import type { IncomingFileOffer } from '@altersend/core'
type FileOffer = Extract<IncomingFileOffer, { kind: 'file' }>
+type TextOffer = Extract<IncomingFileOffer, { kind: 'text' }>
type DownloadRow = ReturnType<typeof getDownloadRowDisplay>
function getDownloadStatusLabel(t: ReturnType<typeof useTranslation>['t'], row: DownloadRow) {
@@ -41,8 +42,12 @@ export function ReceiveConnectedView() {
const downloadStates = useTransferStore((s) => s.receiveDownloadStates)
const peerCount = useTransferStore((s) => s.peerCount)
const [expandedFolders, setExpandedFolders] = useState<Set<string>>(new Set())
+ const { copiedId, flashCopied } = useCopiedFlag()
- const hasIncomingFiles = incomingFileOffers.length > 0
+ const textOffers = useMemo(
+ () => incomingFileOffers.filter((offer): offer is TextOffer => offer.kind === 'text'),
+ [incomingFileOffers]
+ )
const rows = useMemo(() => groupReceiveRows(incomingFileOffers), [incomingFileOffers])
const totals = useMemo(
() => getDownloadTotals(incomingFileOffers, downloadStates),
@@ -80,55 +85,17 @@ export function ReceiveConnectedView() {
)
}
- const renderFolderRow = (folderRow: ReceiveFolderRow, isFirst = false) => {
- const folder = getFolderRowDisplay(folderRow.offers, downloadStates)
- const isExpanded = expandedFolders.has(folderRow.name)
- return (
- <Fragment key={`folder:${folderRow.name}`}>
- <LinkRow
- icon={<FolderIcon size={16} />}
- bare
- compact
- isFirst={isFirst}
- label={folderRow.name}
- size={folderRow.totalSize}
- description={folder.description}
- status={statusFor(folder)}
- progressPercent={folder.progressPercent}
- onPress={() => toggleFolder(folderRow.name)}
- trailing={
- <span
- className={`inline-flex transition-transform duration-200 ${isExpanded ? 'rotate-90' : ''}`}
- >
- <ChevronRightIcon size={14} color={theme.colors.colorTextMuted} />
- </span>
- }
- />
- {isExpanded ? (
- <div className='pl-10'>{folderRow.offers.map((offer) => renderFileRow(offer))}</div>
- ) : null}
- </Fragment>
- )
+ const copyText = (id: string, content: string) => {
+ void navigator.clipboard.writeText(content)
+ flashCopied(id)
}
+ const fileOffers = incomingFileOffers.filter((f): f is FileOffer => f.kind === 'file')
+ const hasDownloadableFiles = fileOffers.length > 0
const isDownloading = totals.activeCount > 0
- const allCompleted = hasIncomingFiles && totals.completedCount === incomingFileOffers.length
-
- const textOffer = incomingFileOffers.find((f) => f.kind === 'text')
- const isTextTransfer = textOffer !== undefined
-
- const isUrl = useMemo(() => {
- if (textOffer?.kind !== 'text') return false
- try {
- const url = new URL(textOffer.content)
- return url.protocol === 'https:' || url.protocol === 'http:'
- } catch {
- return false
- }
- }, [textOffer])
+ const allFilesDownloaded = hasDownloadableFiles && totals.completedCount === fileOffers.length
const downloadAll = async () => {
- const fileOffers = incomingFileOffers.filter((f) => f.kind === 'file')
if (fileOffers.length === 0 || isDownloading) return
const isSingleLooseFile = rows.length === 1 && rows[0].kind === 'file'
@@ -157,48 +124,81 @@ export function ReceiveConnectedView() {
return (
<div className='flex h-full min-h-0 w-full flex-1 flex-col'>
- {isTextTransfer ? (
- <div className='flex-1 flex flex-col justify-center items-center'>
- <div className='p-4 bg-background-subtle rounded-lg border border-border-primary w-full break-words'>
- <p className='text-text-primary text-center select-text'>{textOffer.content}</p>
+ <div className='flex min-h-0 flex-1 flex-col gap-6 overflow-y-auto pr-1'>
+ {rows.length > 0 ? (
+ <div>
+ <p className='m-0 mb-2 text-[13px] font-medium text-text-muted'>
+ {t('common:files.files')}
+ </p>
+ <div className='overflow-hidden rounded-[10px] border border-border-primary bg-background-subtle'>
+ {rows.map((row, index) => {
+ if (row.kind === 'file') return renderFileRow(row.offer, index === 0)
+
+ const folder = getFolderRowDisplay(row.offers, downloadStates)
+ const isExpanded = expandedFolders.has(row.name)
+ return (
+ <Fragment key={`folder:${row.name}`}>
+ <LinkRow
+ icon={<FolderIcon size={16} />}
+ bare
+ compact
+ isFirst={index === 0}
+ label={row.name}
+ size={row.totalSize}
+ description={folder.description}
+ status={statusFor(folder)}
+ progressPercent={folder.progressPercent}
+ onPress={() => toggleFolder(row.name)}
+ trailing={
+ <span
+ className={`inline-flex transition-transform duration-200 ${isExpanded ? 'rotate-90' : ''}`}
+ >
+ <ChevronRightIcon size={14} color={theme.colors.colorTextMuted} />
+ </span>
+ }
+ />
+ {isExpanded ? (
+ <div className='pl-10'>{row.offers.map((offer) => renderFileRow(offer))}</div>
+ ) : null}
+ </Fragment>
+ )
+ })}
+ </div>
</div>
- </div>
- ) : (
- <div className='min-h-0 flex-1 overflow-y-auto pr-1'>
- <div className='overflow-hidden rounded-[10px] border border-border-primary bg-background-subtle'>
- {rows.map((row, index) =>
- row.kind === 'file'
- ? renderFileRow(row.offer, index === 0)
- : renderFolderRow(row, index === 0)
- )}
+ ) : null}
+
+ {textOffers.length > 0 ? (
+ <div>
+ <p className='m-0 mb-2 text-[13px] font-medium text-text-muted'>
+ {t('common:files.text')}
+ </p>
+ <div className='overflow-hidden rounded-[10px] border border-border-primary bg-background-subtle'>
+ {textOffers.map((offer, index) => (
+ <ReceivedTextRow
+ key={getOfferKey(offer)}
+ content={offer.content}
+ isFirst={index === 0}
+ copied={copiedId === offer.id}
+ subtitleLabel={t('common:files.text')}
+ copyLabel={t('common:actions.copyText')}
+ copiedLabel={t('common:actions.copied')}
+ showMoreLabel={t('common:actions.showMore')}
+ showLessLabel={t('common:actions.showLess')}
+ onCopy={() => copyText(offer.id, offer.content)}
+ onOpenLink={(url) => void bridgeApi.openExternalUrl(url)}
+ />
+ ))}
+ </div>
</div>
- </div>
- )}
+ ) : null}
+ </div>
<div className='mt-4 flex shrink-0 items-center justify-end gap-4'>
<div className='flex shrink-0 items-center gap-2'>
<Button onClick={clearSession} size='sm' variant='secondary'>
{t('common:actions.endSession')}
</Button>
- {isTextTransfer ? (
- isUrl ? (
- <Button
- onClick={() => void bridgeApi.openExternalUrl(textOffer.content!)}
- size='sm'
- variant='primary'
- >
- {t('common:actions.openLink')}
- </Button>
- ) : (
- <Button
- onClick={() => void navigator.clipboard.writeText(textOffer.content!)}
- size='sm'
- variant='primary'
- >
- {t('common:actions.copyText')}
- </Button>
- )
- ) : peerCount > 0 && hasIncomingFiles && !allCompleted ? (
+ {hasDownloadableFiles && peerCount > 0 && !allFilesDownloaded ? (
<Button
disabled={isDownloading}
icon={<DownloadIcon size={14} />}
diff --git a/apps/desktop/src/renderer/pages/ReceivePage/ReceiveDisconnectedView.tsx b/apps/desktop/src/renderer/pages/ReceivePage/ReceiveDisconnectedView.tsx
index d317499..7c17892 100644
--- a/apps/desktop/src/renderer/pages/ReceivePage/ReceiveDisconnectedView.tsx
+++ b/apps/desktop/src/renderer/pages/ReceivePage/ReceiveDisconnectedView.tsx
@@ -1,5 +1,4 @@
import { Button, LinkRow } from '@altersend/components'
-import { CloseIcon } from '@altersend/components/icons'
import { clearSession, formatFileSize, getOfferKey, useTransferStore } from '@altersend/domain'
import { useTranslation } from '@altersend/locales'
import { TransferActionGroup } from '../../components'
@@ -15,24 +14,8 @@ export function ReceiveDisconnectedView() {
return (
<div className='flex h-full min-h-0 w-full flex-col gap-4'>
- <div className='flex shrink-0 items-center gap-3 rounded-[12px] border border-warning/22 bg-warning/8 px-4 py-3.5'>
- <div className='flex h-[32px] w-[32px] shrink-0 items-center justify-center rounded-[8px] bg-warning/18 text-warning'>
- <CloseIcon size={16} />
- </div>
- <div>
- <p className='m-0 text-[14px] font-bold text-warning'>
- {total > 0
- ? t('receive:summary.receivedCount', { completed: completedCount, count: total })
- : t('receive:page.interrupted.title')}
- </p>
- <p className='m-0 mt-0.5 text-[12px] leading-5 text-text-secondary'>
- {t('receive:summary.senderLeftBeforeFinishing')}
- </p>
- </div>
- </div>
-
{total > 0 ? (
- <div className='flex min-h-0 flex-1 flex-col overflow-hidden rounded-[12px] border border-border-primary bg-surface-primary'>
+ <div className='flex min-h-0 flex-1 flex-col overflow-hidden rounded-[12px] border border-border-primary'>
<div className='flex shrink-0 items-center justify-between border-b border-border-primary pl-[14px] pr-3 py-3'>
<p className='m-0 text-[14px] font-semibold text-text-primary'>
{t('common:files.files')}
diff --git a/apps/desktop/src/renderer/pages/ReceivePage/index.tsx b/apps/desktop/src/renderer/pages/ReceivePage/index.tsx
index 56a2676..0ff2daf 100644
--- a/apps/desktop/src/renderer/pages/ReceivePage/index.tsx
+++ b/apps/desktop/src/renderer/pages/ReceivePage/index.tsx
@@ -28,8 +28,10 @@ export default function ReceivePage() {
() => getDownloadTotals(incomingFileOffers, receiveDownloadStates),
[incomingFileOffers, receiveDownloadStates]
)
- const allDownloadsCompleted =
- hasIncomingFiles && totals.completedCount === incomingFileOffers.length
+ const fileCount = incomingFileOffers.filter((f) => f.kind === 'file').length
+ const textCount = incomingFileOffers.length - fileCount
+ const hasDownloadableFiles = fileCount > 0
+ const allDownloadsCompleted = hasDownloadableFiles && totals.completedCount === fileCount
const step = getReceiveStep({
hasIncomingFiles,
@@ -38,16 +40,18 @@ export default function ReceivePage() {
peerCount
})
- const totalBytes = incomingFileOffers.reduce(
- (sum, f) => sum + (f.kind === 'file' ? f.size : 0),
- 0
+ const { title, description } = getReceivePageCopy(
+ t,
+ step,
+ fileCount,
+ textCount,
+ totals.totalBytes
)
- const { title, description } = getReceivePageCopy(t, step, incomingFileOffers.length, totalBytes)
const connectedBadge =
isConnectedStep(step) && step !== 'completed' && step !== 'interrupted' ? (
- <div className='inline-flex items-center gap-2 rounded-full border border-success/22 bg-success/8 px-3 py-1.5 text-[12px] font-medium text-success'>
- <span className='h-1.5 w-1.5 shrink-0 rounded-full bg-success' />
+ <div className='inline-flex items-center gap-1.5 rounded-full bg-success/12 px-2.5 py-1 text-[12px] font-semibold text-success'>
+ <span className='h-2 w-2 shrink-0 rounded-full bg-success' />
{t('common:status.connected')}
</div>
) : undefined
diff --git a/apps/desktop/src/renderer/pages/SendPage/SelectFilesView.tsx b/apps/desktop/src/renderer/pages/SendPage/SelectFilesView.tsx
index 2592736..d9a0d89 100644
--- a/apps/desktop/src/renderer/pages/SendPage/SelectFilesView.tsx
+++ b/apps/desktop/src/renderer/pages/SendPage/SelectFilesView.tsx
@@ -1,19 +1,28 @@
import { useState } from 'react'
-import { DropZoneLink, ErrorBanner, FileDropZone, LinkRow, useTheme } from '@altersend/components'
-import { FolderIcon } from '@altersend/components/icons'
+import {
+ Button,
+ DropZoneLink,
+ ErrorBanner,
+ FileDropZone,
+ LinkRow,
+ Textarea,
+ useTheme
+} from '@altersend/components'
+import { FolderIcon, MessageSquareIcon } from '@altersend/components/icons'
import { useTranslation } from '@altersend/locales'
import {
addSelectedFiles,
type BrowserFileLike,
+ createTextSnippet,
formatFileSize,
+ formatTextSnippetPreview,
groupSelectedFiles,
normalizeSelectedFiles,
removeSelectedFile,
useTransferStore,
- ENABLE_TEXT_SHARING
+ type SendComposeMode
} from '@altersend/domain'
import { bridgeApi } from '../../api/bridgeApi'
-import { Input, Button } from '@altersend/components'
function readAllEntries(reader: FileSystemDirectoryReader): Promise<FileSystemEntry[]> {
return new Promise((resolve, reject) => {
@@ -56,7 +65,7 @@ async function collectDroppedEntries(
}
}
-export function SelectFilesView() {
+export function SelectFilesView({ mode = 'files' }: { mode?: SendComposeMode }) {
const { t } = useTranslation(['send', 'common'])
const { theme } = useTheme()
const c = theme.colors
@@ -66,6 +75,10 @@ export function SelectFilesView() {
const [textInput, setTextInput] = useState('')
const hasSelectedFiles = selectedFiles.length > 0
+ const trimmedText = textInput.trim()
+ const fileItems = selectedFiles.filter((file) => file.kind !== 'text')
+ const textItems = selectedFiles.filter((file) => file.kind === 'text')
+ const fileRows = groupSelectedFiles(fileItems)
const browseDescription = (() => {
const raw = t('send:dropzone.browseDescription')
@@ -127,102 +140,139 @@ export function SelectFilesView() {
}
const addTextItem = () => {
- const text = textInput.trim()
- if (!text) return
- const name = text.length > 20 ? text.substring(0, 20) + '...' : text
- addSelectedFiles([
- {
- name,
- path: `text-${Date.now()}`,
- kind: 'text',
- content: text,
- isTemporary: true,
- size: text.length
- }
- ])
+ if (!trimmedText) return
+ addSelectedFiles([createTextSnippet(textInput)])
setTextInput('')
}
return (
<div className='flex h-full min-h-0 flex-col gap-[34px]'>
<div className={hasSelectedFiles ? 'shrink-0' : ''}>
- <FileDropZone
- description={browseDescription}
- hasFiles={hasSelectedFiles}
- isDragging={isDropZoneDragging}
- onClick={() => void browse()}
- onDragLeave={(event) => {
- event.preventDefault()
- setIsDropZoneDragging(false)
- }}
- onDragOver={(event) => {
- event.preventDefault()
- setIsDropZoneDragging(true)
- }}
- onDrop={onDrop}
- title={t('send:actions.dragAndDrop')}
- />
+ {mode === 'text' ? (
+ <Textarea
+ placeholder={t('send:actions.typeSnippet')}
+ height={hasSelectedFiles ? 141 : 198}
+ value={textInput}
+ onChange={(e: React.ChangeEvent<HTMLTextAreaElement>) => setTextInput(e.target.value)}
+ onKeyDown={(event) => {
+ const e = event as typeof event & {
+ shiftKey?: boolean
+ preventDefault?: () => void
+ }
+ if (e.key === 'Enter' && !e.shiftKey) {
+ e.preventDefault?.()
+ addTextItem()
+ }
+ }}
+ footer={
+ <>
+ {trimmedText.length > 0 ? (
+ <span className='text-[13px] text-text-faint'>
+ {t('common:units.chars', { count: textInput.length })}
+ </span>
+ ) : (
+ <span />
+ )}
+ <Button
+ disabled={trimmedText.length === 0}
+ onClick={addTextItem}
+ size='sm'
+ variant='primary'
+ >
+ {t('common:actions.add')}
+ </Button>
+ </>
+ }
+ />
+ ) : (
+ <FileDropZone
+ description={browseDescription}
+ hasFiles={hasSelectedFiles}
+ isDragging={isDropZoneDragging}
+ onClick={() => void browse()}
+ onDragLeave={(event) => {
+ event.preventDefault()
+ setIsDropZoneDragging(false)
+ }}
+ onDragOver={(event) => {
+ event.preventDefault()
+ setIsDropZoneDragging(true)
+ }}
+ onDrop={onDrop}
+ title={t('send:actions.dragAndDrop')}
+ />
+ )}
</div>
{hasSelectedFiles ? (
- <div className='min-h-0 flex-1 overflow-y-auto'>
- <div className='flex flex-col gap-2'>
- {groupSelectedFiles(selectedFiles).map((row) =>
- row.kind === 'file' ? (
- <LinkRow
- key={row.file.path}
- file
- standalone
- compact
- label={row.file.name}
- subtitle={fileSubtitle(row.file.name, row.file.size)}
- subtitleTone='faint'
- onRemove={() => removeSelectedFile(row.file.path)}
- removeLabel={t('send:files.removeLabel', { name: row.file.name })}
- />
- ) : (
- <LinkRow
- key={`folder:${row.name}`}
- icon={<FolderIcon size={17} color={c.colorTextMuted} />}
- iconBackground={c.colorSurfacePrimary}
- standalone
- compact
- label={row.name}
- subtitle={t('common:files.count', { count: row.files.length })}
- subtitleTone='faint'
- onRemove={() => row.files.forEach((file) => removeSelectedFile(file.path))}
- removeLabel={t('send:files.removeLabel', { name: row.name })}
- />
- )
- )}
- </div>
- </div>
- ) : null}
+ <div className='flex min-h-0 flex-1 flex-col gap-6 overflow-y-auto'>
+ {fileRows.length > 0 ? (
+ <div>
+ <p className='m-0 mb-2 text-[13px] font-medium text-text-muted'>
+ {t('send:files.addedFiles')}
+ </p>
+ <div className='flex flex-col gap-2'>
+ {fileRows.map((row) =>
+ row.kind === 'folder' ? (
+ <LinkRow
+ key={`folder:${row.name}`}
+ icon={<FolderIcon size={17} color={c.colorTextMuted} />}
+ iconBackground={c.colorSurfacePrimary}
+ standalone
+ compact
+ label={row.name}
+ subtitle={t('common:files.count', { count: row.files.length })}
+ subtitleTone='faint'
+ onRemove={() => row.files.forEach((file) => removeSelectedFile(file.path))}
+ removeLabel={t('send:files.removeLabel', { name: row.name })}
+ />
+ ) : (
+ <LinkRow
+ key={row.file.path}
+ file
+ standalone
+ compact
+ label={row.file.name}
+ subtitle={fileSubtitle(row.file.name, row.file.size)}
+ subtitleTone='faint'
+ onRemove={() => removeSelectedFile(row.file.path)}
+ removeLabel={t('send:files.removeLabel', { name: row.file.name })}
+ />
+ )
+ )}
+ </div>
+ </div>
+ ) : null}
- {ENABLE_TEXT_SHARING && (
- <div className='flex shrink-0 flex-row gap-2 mt-2 items-center'>
- <div className='flex-1'>
- <Input
- placeholder='Type a message or paste a link...'
- value={textInput}
- onChange={(e: React.ChangeEvent<HTMLInputElement>) => setTextInput(e.target.value)}
- onKeyDown={(e) => {
- if (e.key === 'Enter' && textInput.trim().length > 0) {
- addTextItem()
- }
- }}
- />
- </div>
- <Button
- disabled={textInput.trim().length === 0}
- onClick={addTextItem}
- size='sm'
- variant='secondary'
- >
- Add
- </Button>
+ {textItems.length > 0 ? (
+ <div>
+ <p className='m-0 mb-2 text-[13px] font-medium text-text-muted'>
+ {t('send:files.addedText')}
+ </p>
+ <div className='flex flex-col gap-2'>
+ {textItems.map((item) => {
+ const preview = formatTextSnippetPreview(item.content ?? item.name)
+ const chars = (item.content ?? '').length
+ return (
+ <LinkRow
+ key={item.path}
+ icon={<MessageSquareIcon size={17} color={c.colorInfo} />}
+ iconBackground={c.colorInfoSubtle}
+ standalone
+ compact
+ label={preview}
+ subtitle={`${t('common:files.text')} · ${t('common:units.chars', { count: chars })}`}
+ subtitleTone='faint'
+ onRemove={() => removeSelectedFile(item.path)}
+ removeLabel={t('send:files.removeLabel', { name: preview })}
+ />
+ )
+ })}
+ </div>
+ </div>
+ ) : null}
</div>
- )}
+ ) : null}
<ErrorBanner message={selectionError} />
</div>
diff --git a/apps/desktop/src/renderer/pages/SendPage/ShareView.tsx b/apps/desktop/src/renderer/pages/SendPage/ShareView.tsx
index 0de5532..3734fb3 100644
--- a/apps/desktop/src/renderer/pages/SendPage/ShareView.tsx
+++ b/apps/desktop/src/renderer/pages/SendPage/ShareView.tsx
@@ -2,6 +2,8 @@ import { useState } from 'react'
import {
buildJoinUrl,
formatFileSize,
+ formatItemsCount,
+ formatTextSnippetPreview,
groupSelectedFiles,
useShareViewModel
} from '@altersend/domain'
@@ -10,6 +12,7 @@ import {
ChevronsUpDownIcon,
deviceIcon,
FolderIcon,
+ MessageSquareIcon,
QrCodeIcon,
ShareIcon
} from '@altersend/components/icons'
@@ -51,53 +54,71 @@ export function ShareView() {
vm.markCopied()
}
- const filesCard = (
- <Popover
- variant='plain'
- align='left'
- trigger={
- <LinkRow
- standalone
- compact
- icon={<FolderIcon size={16} color={c.colorTextSecondary} />}
- label={
- singleFolder ? singleFolder.name : t('common:files.count', { count: vm.files.length })
- }
- subtitle={formatFileSize(vm.totalSize)}
- trailing={<ChevronsUpDownIcon size={16} color={c.colorTextMuted} />}
- />
- }
- >
- {() => (
- <div style={{ maxHeight: 280, overflowY: 'auto' }}>
- <LinkCard>
- {fileRows.map((row, index) =>
- row.kind === 'folder' ? (
- <LinkRow
- key={`folder:${row.name}`}
- compact
- icon={<FolderIcon size={16} color={c.colorTextSecondary} />}
- label={row.name}
- size={row.totalSize}
- subtitle={t('common:files.count', { count: row.files.length })}
- isLast={index === fileRows.length - 1}
- />
- ) : (
+ const hasTexts = vm.texts.length > 0
+ const filesCard =
+ vm.files.length === 0 && !hasTexts ? null : (
+ <Popover
+ variant='plain'
+ align='left'
+ trigger={
+ <LinkRow
+ standalone
+ compact
+ icon={<FolderIcon size={16} color={c.colorTextSecondary} />}
+ label={
+ hasTexts
+ ? formatItemsCount(vm.files.length, vm.texts.length, t)
+ : singleFolder
+ ? singleFolder.name
+ : t('common:files.count', { count: vm.files.length })
+ }
+ subtitle={vm.totalSize > 0 ? formatFileSize(vm.totalSize) : undefined}
+ trailing={<ChevronsUpDownIcon size={16} color={c.colorTextMuted} />}
+ />
+ }
+ >
+ {() => (
+ <div style={{ maxHeight: 280, overflowY: 'auto' }}>
+ <LinkCard>
+ {fileRows.map((row, index) =>
+ row.kind === 'folder' ? (
+ <LinkRow
+ key={`folder:${row.name}`}
+ compact
+ icon={<FolderIcon size={16} color={c.colorTextSecondary} />}
+ label={row.name}
+ size={row.totalSize}
+ subtitle={t('common:files.count', { count: row.files.length })}
+ isLast={!hasTexts && index === fileRows.length - 1}
+ />
+ ) : (
+ <LinkRow
+ key={row.file.path}
+ compact
+ file
+ label={row.file.name}
+ size={row.file.size}
+ isLast={!hasTexts && index === fileRows.length - 1}
+ />
+ )
+ )}
+ {vm.texts.map((text, index) => (
<LinkRow
- key={row.file.path}
+ key={text.path}
compact
- file
- label={row.file.name}
- size={row.file.size}
- isLast={index === fileRows.length - 1}
+ icon={<MessageSquareIcon size={16} color={c.colorInfo} />}
+ iconBackground={c.colorInfoSubtle}
+ label={formatTextSnippetPreview(text.content)}
+ subtitle={t('common:files.text')}
+ subtitleTone='faint'
+ isLast={index === vm.texts.length - 1}
/>
- )
- )}
- </LinkCard>
- </div>
- )}
- </Popover>
- )
+ ))}
+ </LinkCard>
+ </div>
+ )}
+ </Popover>
+ )
return (
<>
@@ -180,7 +201,7 @@ export function ShareView() {
</div>
)}
- {hasConnectedDevices && <div>{filesCard}</div>}
+ {hasConnectedDevices && filesCard && <div>{filesCard}</div>}
{vm.hasDevices && (
<div className='flex flex-col gap-2'>
diff --git a/apps/desktop/src/renderer/pages/SendPage/index.tsx b/apps/desktop/src/renderer/pages/SendPage/index.tsx
index 282b32b..dd63e88 100644
--- a/apps/desktop/src/renderer/pages/SendPage/index.tsx
+++ b/apps/desktop/src/renderer/pages/SendPage/index.tsx
@@ -1,14 +1,17 @@
-import { Button } from '@altersend/components'
+import { useState } from 'react'
+import { Button, Tabs, TabsList, TabsTrigger } from '@altersend/components'
import { SendIcon } from '@altersend/components/icons'
import { useTranslation } from '@altersend/locales'
import {
clearSenderFlow,
continueShare,
formatFileSize,
+ formatItemsCount,
getSendPageCopy,
getSendStep,
isShareStep,
- useTransferStore
+ useTransferStore,
+ type SendComposeMode
} from '@altersend/domain'
import { TransferActionGroup, TransferCardFrame } from '../../components'
import { PreparingView } from './PreparingView'
@@ -20,17 +23,19 @@ export default function SendPage() {
const selectedFiles = useTransferStore((s) => s.selectedFiles)
const draftPhase = useTransferStore((s) => s.draftPhase)
const connectionState = useTransferStore((s) => s.connectionState)
+ const [mode, setMode] = useState<SendComposeMode>('files')
const step = getSendStep({ draftPhase, isPeerConnected: connectionState === 'peer-connected' })
const copy = getSendPageCopy(t, step)
const hasSelectedFiles = selectedFiles.length > 0
+ const showTabs = !isShareStep(step) && step !== 'preparing'
function renderView() {
if (isShareStep(step)) {
return <ShareView />
}
- return <SelectFilesView />
+ return <SelectFilesView mode={showTabs ? mode : 'files'} />
}
function renderFooter() {
@@ -52,15 +57,18 @@ export default function SendPage() {
return null
}
- const totalSize = selectedFiles.reduce((sum, file) => sum + (file.size ?? 0), 0)
+ const fileItems = selectedFiles.filter((file) => file.kind !== 'text')
+ const textItems = selectedFiles.filter((file) => file.kind === 'text')
+ const totalSize = fileItems.reduce((sum, file) => sum + (file.size ?? 0), 0)
+ const countLabel = formatItemsCount(fileItems.length, textItems.length, t)
return (
<div className='flex items-center justify-between gap-4'>
<div className='flex items-baseline gap-2'>
- <span className='text-[14.5px] font-semibold text-text-primary'>
- {t('common:files.count', { count: selectedFiles.length })}
- </span>
- <span className='text-[13px] text-text-faint'>{formatFileSize(totalSize)}</span>
+ <span className='text-[14.5px] font-semibold text-text-primary'>{countLabel}</span>
+ {totalSize > 0 ? (
+ <span className='text-[13px] text-text-faint'>{formatFileSize(totalSize)}</span>
+ ) : null}
</div>
<TransferActionGroup>
<Button onClick={clearSenderFlow} size='sm' variant='ghost'>
@@ -83,10 +91,20 @@ export default function SendPage() {
return <PreparingView />
}
+ const headerTabs = showTabs ? (
+ <Tabs size='sm' value={mode} onValueChange={(value) => setMode(value as SendComposeMode)}>
+ <TabsList>
+ <TabsTrigger value='files'>{t('common:files.files')}</TabsTrigger>
+ <TabsTrigger value='text'>{t('common:files.text')}</TabsTrigger>
+ </TabsList>
+ </Tabs>
+ ) : undefined
+
return (
<TransferCardFrame
description={isShareStep(step) ? copy.description : ''}
footer={renderFooter()}
+ headerRight={headerTabs}
title={copy.title}
>
<div className='h-full overflow-y-auto'>{renderView()}</div>
diff --git a/apps/mobile/app.json b/apps/mobile/app.json
index 9dc8665..1cff8d7 100644
--- a/apps/mobile/app.json
+++ b/apps/mobile/app.json
@@ -2,7 +2,7 @@
"expo": {
"name": "AlterSend",
"slug": "altersend",
- "version": "1.4.0",
+ "version": "1.5.0",
"newArchEnabled": true,
"orientation": "portrait",
"scheme": "altersend",
diff --git a/apps/mobile/app/(tabs)/receive/index.tsx b/apps/mobile/app/(tabs)/receive/index.tsx
index 5186a45..c2c4edf 100644
--- a/apps/mobile/app/(tabs)/receive/index.tsx
+++ b/apps/mobile/app/(tabs)/receive/index.tsx
@@ -67,8 +67,9 @@ export default function ReceiveScreen() {
() => getDownloadTotals(incomingFileOffers, receiveDownloadStates),
[incomingFileOffers, receiveDownloadStates]
)
+ const downloadableFileCount = incomingFileOffers.filter((offer) => offer.kind === 'file').length
const allDownloadsCompleted =
- hasIncomingFiles && totals.completedCount === incomingFileOffers.length
+ downloadableFileCount > 0 && totals.completedCount === downloadableFileCount
const step = getReceiveStep({
hasIncomingFiles,
@@ -94,11 +95,8 @@ export default function ReceiveScreen() {
}
}, [step])
- const totalBytes = incomingFileOffers.reduce(
- (sum, file) => sum + (file.kind === 'file' ? file.size : 0),
- 0
- )
- const copy = getReceivePageCopy(t, step, incomingFileOffers.length, totalBytes)
+ const textCount = incomingFileOffers.length - downloadableFileCount
+ const copy = getReceivePageCopy(t, step, downloadableFileCount, textCount, totals.totalBytes)
const title = step === 'join' ? t('receive:page.tabTitle') : copy.title
const footer =
diff --git a/apps/mobile/app/(tabs)/send/index.tsx b/apps/mobile/app/(tabs)/send/index.tsx
index 9c606fc..5ad670f 100644
--- a/apps/mobile/app/(tabs)/send/index.tsx
+++ b/apps/mobile/app/(tabs)/send/index.tsx
@@ -7,7 +7,13 @@ import { Layout, PairDeviceSheet } from '@/src/components'
import { consumePairPromptPending } from '@/src/onboarding/pairPromptSignal'
import { SelectFilesView } from '@/src/transfer/send'
import { usePathname, useRouter } from 'expo-router'
-import { getSendPageCopy, getSendStep, isShareStep, useTransferStore } from '@altersend/domain'
+import {
+ formatSendButtonLabel,
+ getSendPageCopy,
+ getSendStep,
+ isShareStep,
+ useTransferStore
+} from '@altersend/domain'
import { continueShare } from '@altersend/domain'
function NavigationController() {
@@ -51,6 +57,8 @@ export default function SendSelectScreen() {
const step = getSendStep({ draftPhase, isPeerConnected: connectionState === 'peer-connected' })
const copy = getSendPageCopy(t, step)
const hasSelectedFiles = selectedFiles.length > 0
+ const fileCount = selectedFiles.filter((file) => file.kind !== 'text').length
+ const textCount = selectedFiles.length - fileCount
const openMenu = useCallback(() => router.push('/settings'), [router])
@@ -69,7 +77,7 @@ export default function SendSelectScreen() {
width='full'
icon={<SendIcon size={18} />}
>
- {t('send:actions.sendFiles', { count: selectedFiles.length })}
+ {formatSendButtonLabel(fileCount, textCount, t)}
</Button>
) : undefined
}
diff --git a/apps/mobile/app/devices.tsx b/apps/mobile/app/devices.tsx
index 79aa9d9..ffc259b 100644
--- a/apps/mobile/app/devices.tsx
+++ b/apps/mobile/app/devices.tsx
@@ -1,6 +1,6 @@
import { StyleSheet, View } from 'react-native'
import { Button, LinkRow, useTheme } from '@altersend/components'
-import { MoreVerticalIcon, PlusIcon, deviceIcon } from '@altersend/components/icons'
+import { MoreHorizontalIcon, PlusIcon, deviceIcon } from '@altersend/components/icons'
import { useTranslation } from '@altersend/locales'
import {
AddPairDeviceSheet,
@@ -64,7 +64,7 @@ export default function DevicesScreen() {
size='sm'
iconOnly
aria-label={t('settings:pairing.deviceActions')}
- icon={<MoreVerticalIcon size={14} />}
+ icon={<MoreHorizontalIcon size={14} />}
onClick={() =>
flow.openDeviceActions(peer.remoteDevicePubkey, peer.displayName)
}
diff --git a/apps/mobile/app/receive/incoming.tsx b/apps/mobile/app/receive/incoming.tsx
index b7d6f8f..6388e23 100644
--- a/apps/mobile/app/receive/incoming.tsx
+++ b/apps/mobile/app/receive/incoming.tsx
@@ -1,7 +1,7 @@
import { useCallback, useEffect, useMemo } from 'react'
import { View, StyleSheet, Pressable } from 'react-native'
import { Paths } from 'expo-file-system'
-import { Button, useTheme, withAlpha } from '@altersend/components'
+import { Button, useTheme } from '@altersend/components'
import { ArrowLeftIcon, DownloadIcon } from '@altersend/components/icons'
import { useTranslation } from '@altersend/locales'
import { useNavigation, useRouter } from 'expo-router'
@@ -40,8 +40,10 @@ export default function ReceiveIncomingScreen() {
)
const hasIncomingFiles = incomingFileOffers.length > 0
+ const downloadableFileCount = incomingFileOffers.filter((offer) => offer.kind === 'file').length
+ const hasDownloadableFiles = downloadableFileCount > 0
const allDownloadsCompleted =
- hasIncomingFiles && totals.completedCount === incomingFileOffers.length
+ hasDownloadableFiles && totals.completedCount === downloadableFileCount
const step = getReceiveStep({
hasIncomingFiles,
allDownloadsCompleted,
@@ -83,11 +85,15 @@ export default function ReceiveIncomingScreen() {
})
}, [navigation, handleEndSession, t, theme.colors.colorTextPrimary])
- const totalBytes = incomingFileOffers.reduce(
- (sum, f) => sum + (f.kind === 'file' ? f.size : 0),
- 0
+ const totalBytes = totals.totalBytes
+ const textCount = incomingFileOffers.length - downloadableFileCount
+ const { title, description } = getReceivePageCopy(
+ t,
+ step,
+ downloadableFileCount,
+ textCount,
+ totalBytes
)
- const { title, description } = getReceivePageCopy(t, step, incomingFileOffers.length, totalBytes)
const handleDownloadAll = async () => {
if (incomingFileOffers.length === 0 || isDownloading) return
@@ -141,15 +147,7 @@ export default function ReceiveIncomingScreen() {
}
const badge = (
- <View
- style={[
- styles.badge,
- {
- borderColor: withAlpha(theme.colors.colorSuccess, 0.22),
- backgroundColor: withAlpha(theme.colors.colorSuccess, 0.08)
- }
- ]}
- >
+ <View style={[styles.badge, { backgroundColor: theme.colors.colorSuccessSubtle }]}>
<View style={[styles.badgeDot, { backgroundColor: theme.colors.colorSuccess }]} />
<Text style={[styles.badgeText, { color: theme.colors.colorSuccess }]}>
{t('common:status.connected')}
@@ -165,20 +163,22 @@ export default function ReceiveIncomingScreen() {
hasNativeHeader
footer={
<View style={styles.footerStack}>
- <Button
- disabled={isDownloading}
- icon={<DownloadIcon size={18} color={theme.colors.colorOnAccent} />}
- onClick={() => void handleDownloadAll()}
- size='lg'
- variant='light'
- width='full'
- >
- {isDownloading
- ? t('receive:actions.downloadingPercent', { percent: totals.percent })
- : sizeLabel
- ? t('receive:actions.downloadAllWithSize', { size: formatFileSize(totalBytes) })
- : t('receive:actions.downloadAll')}
- </Button>
+ {hasDownloadableFiles ? (
+ <Button
+ disabled={isDownloading}
+ icon={<DownloadIcon size={18} color={theme.colors.colorOnAccent} />}
+ onClick={() => void handleDownloadAll()}
+ size='lg'
+ variant='light'
+ width='full'
+ >
+ {isDownloading
+ ? t('receive:actions.downloadingPercent', { percent: totals.percent })
+ : sizeLabel
+ ? t('receive:actions.downloadAllWithSize', { size: formatFileSize(totalBytes) })
+ : t('receive:actions.downloadAll')}
+ </Button>
+ ) : null}
{endSessionButton}
</View>
}
@@ -195,20 +195,20 @@ const styles = StyleSheet.create({
badge: {
flexDirection: 'row',
alignItems: 'center',
- gap: 8,
+ alignSelf: 'flex-start',
+ gap: 6,
borderRadius: 100,
- borderWidth: 1,
paddingHorizontal: 10,
- paddingVertical: 5
+ paddingVertical: 4
},
badgeDot: {
- width: 6,
- height: 6,
- borderRadius: 3
+ width: 8,
+ height: 8,
+ borderRadius: 4
},
badgeText: {
fontSize: 12,
- fontWeight: '500'
+ fontWeight: '600'
},
footerStack: {
gap: 8,
diff --git a/apps/mobile/package.json b/apps/mobile/package.json
index 5594e54..aaae37e 100644
--- a/apps/mobile/package.json
+++ b/apps/mobile/package.json
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@altersend/mobile",
- "version": "1.4.0",
+ "version": "1.5.0",
"description": "AlterSend mobile app (React Native / Expo)",
"main": "expo-router/entry",
"scripts": {
@@ -35,10 +35,10 @@
},
"homepage": "https://github.com/denislupookov/altersend#readme",
"dependencies": {
- "@altersend/components": "1.4.0",
- "@altersend/core": "1.4.0",
- "@altersend/domain": "1.4.0",
- "@altersend/locales": "1.4.0",
+ "@altersend/components": "1.5.0",
+ "@altersend/core": "1.5.0",
+ "@altersend/domain": "1.5.0",
+ "@altersend/locales": "1.5.0",
"@expo/vector-icons": "^15.0.2",
"@sentry/react-native": "^8.11.0",
"b4a": "^1.6.7",
diff --git a/apps/mobile/src/components/BottomSheet/index.tsx b/apps/mobile/src/components/BottomSheet/index.tsx
index fdf2526..97b33c5 100644
--- a/apps/mobile/src/components/BottomSheet/index.tsx
+++ b/apps/mobile/src/components/BottomSheet/index.tsx
@@ -1,5 +1,7 @@
-import { type ReactNode } from 'react'
+import { useEffect, useRef, useState, type ReactNode } from 'react'
import {
+ Animated,
+ Easing,
KeyboardAvoidingView,
Modal,
Platform,
@@ -24,6 +26,10 @@ interface BottomSheetProps {
children: ReactNode
}
+const ENTER_DURATION = 240
+const EXIT_DURATION = 180
+const SHEET_RISE = 24
+
export function BottomSheet({
open,
onClose,
@@ -37,13 +43,59 @@ export function BottomSheet({
}: BottomSheetProps) {
const { theme } = useTheme()
const c = theme.colors
+ const [mounted, setMounted] = useState(open)
+ const backdropOpacity = useRef(new Animated.Value(0)).current
+ const sheetTranslate = useRef(new Animated.Value(SHEET_RISE)).current
+ const sheetOpacity = useRef(new Animated.Value(0)).current
+ const hasOpenedRef = useRef(open)
+
+ useEffect(() => {
+ if (open) hasOpenedRef.current = true
+ if (!hasOpenedRef.current) return
+
+ if (open) setMounted(true)
+
+ const duration = open ? ENTER_DURATION : EXIT_DURATION
+ const easing = open ? Easing.out(Easing.cubic) : Easing.in(Easing.cubic)
+
+ const animation = Animated.parallel([
+ Animated.timing(backdropOpacity, {
+ toValue: open ? 1 : 0,
+ duration,
+ easing,
+ useNativeDriver: true
+ }),
+ Animated.timing(sheetTranslate, {
+ toValue: open ? 0 : SHEET_RISE,
+ duration,
+ easing,
+ useNativeDriver: true
+ }),
+ Animated.timing(sheetOpacity, {
+ toValue: open ? 1 : 0,
+ duration,
+ easing,
+ useNativeDriver: true
+ })
+ ])
+ animation.start(({ finished }) => {
+ if (finished && !open) {
+ setMounted(false)
+ onDismiss?.()
+ }
+ })
+ return () => animation.stop()
+ }, [open, backdropOpacity, sheetTranslate, sheetOpacity, onDismiss])
+
+ if (!mounted) return null
const sheet = (
- <View
+ <Animated.View
style={[
styles.sheet,
!keyboardAvoiding && styles.sheetAnchored,
{ backgroundColor: c.colorBackground, borderColor: c.colorBorderPrimary },
+ { opacity: sheetOpacity, transform: [{ translateY: sheetTranslate }] },
sheetStyle
]}
>
@@ -59,21 +111,19 @@ export function BottomSheet({
</View>
)}
{children}
- </View>
+ </Animated.View>
)
return (
- <Modal
- visible={open}
- transparent
- animationType='slide'
- onDismiss={onDismiss}
- onRequestClose={onClose}
- >
- <Pressable
- style={[styles.backdrop, { backgroundColor: withAlpha(c.colorScrim, 0.55) }]}
- onPress={onClose}
- />
+ <Modal visible={mounted} transparent animationType='none' onRequestClose={onClose}>
+ <Animated.View
+ style={[
+ styles.backdrop,
+ { backgroundColor: withAlpha(c.colorScrim, 0.55), opacity: backdropOpacity }
+ ]}
+ >
+ <Pressable style={StyleSheet.absoluteFill} onPress={onClose} />
+ </Animated.View>
{keyboardAvoiding ? (
<KeyboardAvoidingView
behavior={Platform.OS === 'ios' ? 'padding' : undefined}
diff --git a/apps/mobile/src/components/InviteBanner/index.tsx b/apps/mobile/src/components/InviteBanner/index.tsx
index f2fc8b9..cfa4c37 100644
--- a/apps/mobile/src/components/InviteBanner/index.tsx
+++ b/apps/mobile/src/components/InviteBanner/index.tsx
@@ -7,13 +7,16 @@ import {
declineInvite,
dismissInvite,
formatFileSize,
+ formatItemsCount,
joinSession,
useTransferStore
} from '@altersend/domain'
+import { useTranslation } from '@altersend/locales'
import { Text } from '@/src/components/ThemedText'
import { useRouter } from 'expo-router'
export function InviteBanner() {
+ const { t } = useTranslation(['common'])
const { theme } = useTheme()
const c = theme.colors
const insets = useSafeAreaInsets()
@@ -42,6 +45,16 @@ export function InviteBanner() {
const Icon = invite ? deviceIcon(invite.deviceType) : null
+ const fileCount = invite?.fileCount ?? 0
+ const textCount = invite?.textCount ?? 0
+ const hasCounts = fileCount > 0 || textCount > 0
+
+ const fileLabel = hasCounts
+ ? formatItemsCount(fileCount, textCount, t)
+ : t('common:files.filesGeneric')
+ const sizeLabel =
+ fileCount > 0 && invite?.totalSize != null ? ` · ${formatFileSize(invite.totalSize)}` : ''
+
return (
<Modal
visible={visible}
@@ -61,11 +74,7 @@ export function InviteBanner() {
</Text>
<Text style={[styles.subtitle, { color: c.colorTextSecondary }]}>
- {`wants to send you ${
- invite.fileCount != null
- ? `${invite.fileCount} ${invite.fileCount === 1 ? 'file' : 'files'}`
- : 'files'
- }${invite.totalSize != null && invite.totalSize > 0 ? ` · ${formatFileSize(invite.totalSize)}` : ''}`}
+ {t('common:status.wantsToSend', { label: fileLabel, size: sizeLabel })}
</Text>
</View>
diff --git a/apps/mobile/src/transfer/receive/views/ReceiveIncomingView.tsx b/apps/mobile/src/transfer/receive/views/ReceiveIncomingView.tsx
index e6585a0..805912c 100644
--- a/apps/mobile/src/transfer/receive/views/ReceiveIncomingView.tsx
+++ b/apps/mobile/src/transfer/receive/views/ReceiveIncomingView.tsx
@@ -1,89 +1,101 @@
-import React from 'react'
-import { View, StyleSheet, Linking } from 'react-native'
+import { Linking, View, StyleSheet } from 'react-native'
import * as Clipboard from 'expo-clipboard'
-import { LinkRow, Button, useTheme } from '@altersend/components'
-import { getDownloadRowDisplay, getOfferKey, useTransferStore } from '@altersend/domain'
+import { LinkRow, ReceivedTextRow, useTheme } from '@altersend/components'
+import {
+ getDownloadRowDisplay,
+ getOfferKey,
+ useCopiedFlag,
+ useTransferStore
+} from '@altersend/domain'
import { useTranslation } from '@altersend/locales'
import { Text } from '@/src/components/ThemedText'
export function ReceiveIncomingView() {
- const { t } = useTranslation(['receive'])
+ const { t } = useTranslation(['receive', 'common'])
const incomingFileOffers = useTransferStore((s) => s.incomingFileOffers)
const downloadStates = useTransferStore((s) => s.receiveDownloadStates)
const { theme } = useTheme()
+ const c = theme.colors
+ const { copiedId, flashCopied } = useCopiedFlag()
- const textOffer = incomingFileOffers.find((f) => f.kind === 'text')
- const isTextTransfer = textOffer !== undefined
+ const copyText = (id: string, content: string) => {
+ void Clipboard.setStringAsync(content)
+ flashCopied(id)
+ }
- const isUrl = React.useMemo(() => {
- if (textOffer?.kind !== 'text') return false
- try {
- const url = new URL(textOffer.content)
- return url.protocol === 'https:' || url.protocol === 'http:'
- } catch {
- return false
- }
- }, [textOffer])
+ const fileOffers = incomingFileOffers.filter(
+ (o): o is Extract<typeof o, { kind: 'file' }> => o.kind === 'file'
+ )
+ const textOffers = incomingFileOffers.filter(
+ (o): o is Extract<typeof o, { kind: 'text' }> => o.kind === 'text'
+ )
+
+ if (incomingFileOffers.length === 0) {
+ return (
+ <View style={styles.container}>
+ <Text style={[styles.waitingText, { color: c.colorTextMuted }]}>
+ {t('receive:status.waitingForFiles')}
+ </Text>
+ </View>
+ )
+ }
+
+ const cardStyle = [
+ styles.card,
+ { borderColor: c.colorBorderPrimary, backgroundColor: c.colorBackgroundSubtle }
+ ]
return (
<View style={styles.container}>
- {isTextTransfer ? (
- <View style={styles.textContainer}>
- <Text style={[styles.textContent, { color: theme.colors.colorTextPrimary }]}>
- {textOffer.content}
+ {fileOffers.length > 0 ? (
+ <View style={styles.section}>
+ <Text style={[styles.heading, { color: c.colorTextMuted }]}>
+ {t('common:files.files')}
</Text>
- <View style={styles.textActions}>
- {isUrl ? (
- <Button
- onClick={() => void Linking.openURL(textOffer.content!)}
- size='sm'
- variant='primary'
- >
- {t('common:actions.openLink')}
- </Button>
- ) : (
- <Button
- onClick={() => void Clipboard.setStringAsync(textOffer.content!)}
- size='sm'
- variant='primary'
- >
- {t('common:actions.copyText')}
- </Button>
- )}
+ <View style={cardStyle}>
+ {fileOffers.map((offer, index) => {
+ const row = getDownloadRowDisplay(offer, downloadStates[getOfferKey(offer)])
+ return (
+ <LinkRow
+ key={getOfferKey(offer)}
+ file
+ bare
+ isFirst={index === 0}
+ label={offer.name}
+ size={offer.size}
+ description={row.isActive ? `${row.description} · ${row.percent}%` : undefined}
+ progressPercent={row.isActive || row.isCompleted ? row.percent : undefined}
+ />
+ )
+ })}
</View>
</View>
- ) : incomingFileOffers.length > 0 ? (
- <View
- style={[
- styles.card,
- {
- borderColor: theme.colors.colorBorderPrimary,
- backgroundColor: theme.colors.colorBackgroundSubtle
- }
- ]}
- >
- {incomingFileOffers.map((file, index) => {
- if (file.kind !== 'file') return null
- const row = getDownloadRowDisplay(file, downloadStates[getOfferKey(file)])
- return (
- <LinkRow
- key={getOfferKey(file)}
- file
- bare
+ ) : null}
+
+ {textOffers.length > 0 ? (
+ <View style={styles.section}>
+ <Text style={[styles.heading, { color: c.colorTextMuted }]}>
+ {t('common:files.text')}
+ </Text>
+ <View style={cardStyle}>
+ {textOffers.map((offer, index) => (
+ <ReceivedTextRow
+ key={getOfferKey(offer)}
+ content={offer.content}
isFirst={index === 0}
- label={file.name}
- size={file.size}
- description={row.isActive ? `${row.description} · ${row.percent}%` : undefined}
- progressPercent={row.isActive || row.isCompleted ? row.percent : undefined}
+ copied={copiedId === offer.id}
+ subtitleLabel={t('common:files.text')}
+ copyLabel={t('common:actions.copyText')}
+ copiedLabel={t('common:actions.copied')}
+ showMoreLabel={t('common:actions.showMore')}
+ showLessLabel={t('common:actions.showLess')}
+ onCopy={() => copyText(offer.id, offer.content)}
+ onOpenLink={(url) => void Linking.openURL(url)}
/>
- )
- })}
+ ))}
+ </View>
</View>
- ) : (
- <Text style={[styles.waitingText, { color: theme.colors.colorTextMuted }]}>
- {t('receive:status.waitingForFiles')}
- </Text>
- )}
+ ) : null}
</View>
)
}
@@ -91,7 +103,14 @@ export function ReceiveIncomingView() {
const styles = StyleSheet.create({
container: {
flex: 1,
- gap: 16
+ gap: 20
+ },
+ section: {
+ gap: 8
+ },
+ heading: {
+ fontSize: 13,
+ fontWeight: '500'
},
card: {
borderRadius: 12,
@@ -100,19 +119,5 @@ const styles = StyleSheet.create({
},
waitingText: {
fontSize: 13
- },
- textContainer: {
- flex: 1,
- justifyContent: 'center',
- alignItems: 'center',
- gap: 16
- },
- textContent: {
- fontSize: 16,
- textAlign: 'center'
- },
- textActions: {
- flexDirection: 'row',
- gap: 8
}
})
diff --git a/apps/mobile/src/transfer/send/views/SelectFilesView.tsx b/apps/mobile/src/transfer/send/views/SelectFilesView.tsx
index a011e50..63ae85d 100644
--- a/apps/mobile/src/transfer/send/views/SelectFilesView.tsx
+++ b/apps/mobile/src/transfer/send/views/SelectFilesView.tsx
@@ -1,22 +1,30 @@
import { useState } from 'react'
import { View, StyleSheet, ActionSheetIOS, Alert, Platform } from 'react-native'
+import { Text } from '@/src/components/ThemedText'
import * as DocumentPicker from 'expo-document-picker'
import * as ImagePicker from 'expo-image-picker'
import {
addSelectedFiles,
+ createTextSnippet,
+ formatTextSnippetPreview,
removeSelectedFile,
useTransferStore,
- ENABLE_TEXT_SHARING,
- type SelectedFile
+ type SelectedFile,
+ type SendComposeMode
} from '@altersend/domain'
import {
DropZoneLink,
ErrorBanner,
FileDropZone,
LinkRow,
- Input,
- Button
+ Tabs,
+ TabsList,
+ TabsTrigger,
+ Textarea,
+ Button,
+ useTheme
} from '@altersend/components'
+import { MessageSquareIcon } from '@altersend/components/icons'
import { useTranslation } from '@altersend/locales'
function uriToFilePath(uri: string): string {
@@ -31,11 +39,17 @@ function uriToFilePath(uri: string): string {
export function SelectFilesView() {
const { t } = useTranslation(['send', 'common'])
+ const { theme } = useTheme()
+ const c = theme.colors
const selectedFiles = useTransferStore((s) => s.selectedFiles)
const [selectionError, setSelectionError] = useState<string | null>(null)
const [textInput, setTextInput] = useState('')
+ const [mode, setMode] = useState<SendComposeMode>('files')
const hasSelectedFiles = selectedFiles.length > 0
+ const trimmedText = textInput.trim()
+ const fileItems = selectedFiles.filter((file) => file.kind !== 'text')
+ const textItems = selectedFiles.filter((file) => file.kind === 'text')
const pickFromFiles = async () => {
try {
@@ -115,48 +129,75 @@ export function SelectFilesView() {
}
const addTextItem = () => {
- const text = textInput.trim()
- if (!text) return
- const name = text.length > 20 ? text.substring(0, 20) + '...' : text
- addSelectedFiles([
- {
- name,
- path: `text-${Date.now()}`,
- kind: 'text',
- content: text,
- isTemporary: true,
- size: text.length
- }
- ])
+ if (!trimmedText) return
+ addSelectedFiles([createTextSnippet(textInput)])
setTextInput('')
}
return (
<View style={styles.container}>
- <View style={styles.dropZoneContainer}>
- <FileDropZone
- description={
- hasSelectedFiles ? (
- <>
- {t('send:dropzone.tapTo')}{' '}
- <DropZoneLink>{t('send:dropzone.addMoreLink')}</DropZoneLink>
- </>
- ) : (
- <>
- {t('send:dropzone.tapTo')}{' '}
- <DropZoneLink>{t('send:dropzone.browseLink')}</DropZoneLink>
- </>
- )
+ <Tabs stretch value={mode} onValueChange={(value) => setMode(value as SendComposeMode)}>
+ <TabsList>
+ <TabsTrigger value='files'>{t('common:files.files')}</TabsTrigger>
+ <TabsTrigger value='text'>{t('common:files.text')}</TabsTrigger>
+ </TabsList>
+ </Tabs>
+
+ {mode === 'text' ? (
+ <Textarea
+ placeholder={t('send:actions.typeSnippet')}
+ height={hasSelectedFiles ? 141 : 198}
+ value={textInput}
+ onChange={(e: React.ChangeEvent<HTMLTextAreaElement>) => setTextInput(e.target.value)}
+ footer={
+ <>
+ {trimmedText.length > 0 ? (
+ <Text style={[styles.charCount, { color: c.colorTextFaint }]}>
+ {t('common:units.chars', { count: textInput.length })}
+ </Text>
+ ) : (
+ <View />
+ )}
+ <Button
+ disabled={trimmedText.length === 0}
+ onClick={addTextItem}
+ size='sm'
+ variant='primary'
+ >
+ {t('common:actions.add')}
+ </Button>
+ </>
}
- hasFiles={hasSelectedFiles}
- onClick={() => void browse()}
- title={hasSelectedFiles ? t('send:actions.addMoreFiles') : t('send:actions.addFiles')}
/>
- </View>
+ ) : (
+ <View style={styles.dropZoneContainer}>
+ <FileDropZone
+ description={
+ hasSelectedFiles ? (
+ <>
+ {t('send:dropzone.tapTo')}{' '}
+ <DropZoneLink>{t('send:dropzone.addMoreLink')}</DropZoneLink>
+ </>
+ ) : (
+ <>
+ {t('send:dropzone.tapTo')}{' '}
+ <DropZoneLink>{t('send:dropzone.browseLink')}</DropZoneLink>
+ </>
+ )
+ }
+ hasFiles={hasSelectedFiles}
+ onClick={() => void browse()}
+ title={hasSelectedFiles ? t('send:actions.addMoreFiles') : t('send:actions.addFiles')}
+ />
+ </View>
+ )}
- {hasSelectedFiles && (
+ {fileItems.length > 0 && (
<View style={styles.fileList}>
- {selectedFiles.map((file) => (
+ <Text style={[styles.listHeading, { color: c.colorTextMuted }]}>
+ {t('send:files.addedFiles')}
+ </Text>
+ {fileItems.map((file) => (
<LinkRow
key={file.path}
file
@@ -170,25 +211,28 @@ export function SelectFilesView() {
</View>
)}
- {ENABLE_TEXT_SHARING && (
- <View style={styles.textInputRow}>
- <View style={styles.textInputWrapper}>
- <Input
- placeholder={t('send:actions.typeMessageOrLink', {
- defaultValue: 'Type a message or link...'
- })}
- value={textInput}
- onChange={(e: React.ChangeEvent<HTMLInputElement>) => setTextInput(e.target.value)}
- />
- </View>
- <Button
- disabled={textInput.trim().length === 0}
- onClick={addTextItem}
- size='sm'
- variant='secondary'
- >
- {t('common:actions.add', { defaultValue: 'Add' })}
- </Button>
+ {textItems.length > 0 && (
+ <View style={styles.fileList}>
+ <Text style={[styles.listHeading, { color: c.colorTextMuted }]}>
+ {t('send:files.addedText')}
+ </Text>
+ {textItems.map((file) => {
+ const preview = formatTextSnippetPreview(file.content ?? file.name)
+ const chars = (file.content ?? '').length
+ return (
+ <LinkRow
+ key={file.path}
+ icon={<MessageSquareIcon size={17} color={c.colorInfo} />}
+ iconBackground={c.colorInfoSubtle}
+ standalone
+ label={preview}
+ subtitle={`${t('common:files.text')} · ${t('common:units.chars', { count: chars })}`}
+ subtitleTone='faint'
+ onRemove={() => removeSelectedFile(file.path)}
+ removeLabel={t('send:files.removeLabel', { name: preview })}
+ />
+ )
+ })}
</View>
)}
@@ -207,13 +251,11 @@ const styles = StyleSheet.create({
fileList: {
gap: 8
},
- textInputRow: {
- flexDirection: 'row',
- alignItems: 'center',
- gap: 8,
- marginTop: 8
+ listHeading: {
+ fontSize: 13,
+ fontWeight: '500'
},
- textInputWrapper: {
- flex: 1
+ charCount: {
+ fontSize: 13
}
})
diff --git a/apps/mobile/src/transfer/send/views/ShareFilesSheet.tsx b/apps/mobile/src/transfer/send/views/ShareFilesSheet.tsx
index 888e6a9..857dfd5 100644
--- a/apps/mobile/src/transfer/send/views/ShareFilesSheet.tsx
+++ b/apps/mobile/src/transfer/send/views/ShareFilesSheet.tsx
@@ -1,22 +1,35 @@
import { ScrollView, StyleSheet } from 'react-native'
-import { LinkRow } from '@altersend/components'
-import { formatFileSize, type FileRow } from '@altersend/domain'
+import { LinkRow, useTheme } from '@altersend/components'
+import { MessageSquareIcon } from '@altersend/components/icons'
+import {
+ formatFileSize,
+ formatItemsCount,
+ formatTextSnippetPreview,
+ type FileRow,
+ type TextRow
+} from '@altersend/domain'
+import { useTranslation } from '@altersend/locales'
import { BottomSheet } from '@/src/components'
interface ShareFilesSheetProps {
open: boolean
files: FileRow[]
+ texts: TextRow[]
totalSize: number
onClose: () => void
}
-export function ShareFilesSheet({ open, files, totalSize, onClose }: ShareFilesSheetProps) {
+export function ShareFilesSheet({ open, files, texts, totalSize, onClose }: ShareFilesSheetProps) {
+ const { t } = useTranslation(['common'])
+ const { theme } = useTheme()
+ const c = theme.colors
+
return (
<BottomSheet
open={open}
onClose={onClose}
- title={files.length === 1 ? '1 file' : `${files.length} files`}
- subtitle={formatFileSize(totalSize)}
+ title={formatItemsCount(files.length, texts.length, t)}
+ subtitle={totalSize > 0 ? formatFileSize(totalSize) : undefined}
sheetStyle={styles.sheet}
>
<ScrollView style={styles.list} contentContainerStyle={styles.listContent}>
@@ -28,7 +41,20 @@ export function ShareFilesSheet({ open, files, totalSize, onClose }: ShareFilesS
label={file.name}
size={file.size}
isFirst={index === 0}
- isLast={index === files.length - 1}
+ isLast={texts.length === 0 && index === files.length - 1}
+ />
+ ))}
+ {texts.map((text, index) => (
+ <LinkRow
+ key={text.path}
+ bare
+ icon={<MessageSquareIcon size={18} color={c.colorInfo} />}
+ iconBackground={c.colorInfoSubtle}
+ label={formatTextSnippetPreview(text.content)}
+ subtitle={t('common:files.text')}
+ subtitleTone='faint'
+ isFirst={files.length === 0 && index === 0}
+ isLast={index === texts.length - 1}
/>
))}
</ScrollView>
diff --git a/apps/mobile/src/transfer/send/views/ShareView.tsx b/apps/mobile/src/transfer/send/views/ShareView.tsx
index c646ac7..97deabd 100644
--- a/apps/mobile/src/transfer/send/views/ShareView.tsx
+++ b/apps/mobile/src/transfer/send/views/ShareView.tsx
@@ -1,7 +1,12 @@
import { useState } from 'react'
import { Pressable, ScrollView, Share, StyleSheet, View } from 'react-native'
import * as Clipboard from 'expo-clipboard'
-import { buildInviteText, formatFileSize, useShareViewModel } from '@altersend/domain'
+import {
+ buildInviteText,
+ formatFileSize,
+ formatItemsCount,
+ useShareViewModel
+} from '@altersend/domain'
import { Button, Input, LinkCard, LinkRow, WaitingRadar, useTheme } from '@altersend/components'
import {
CheckIcon,
@@ -85,6 +90,7 @@ export function ShareView() {
<View style={styles.tile}>
<Button
variant='secondary'
+ width='full'
icon={vm.isCopied ? <CheckIcon size={16} /> : <CopyIcon size={16} />}
onClick={() => void copyTopic()}
>
@@ -94,6 +100,7 @@ export function ShareView() {
<View style={styles.tile}>
<Button
variant='secondary'
+ width='full'
icon={<QrCodeIcon size={16} />}
onClick={() => setIsQrOpen(true)}
>
@@ -131,13 +138,13 @@ export function ShareView() {
</View>
)}
- {vm.files.length > 0 && (
+ {(vm.files.length > 0 || vm.texts.length > 0) && (
<View style={styles.filesWrap}>
<LinkCard>
<LinkRow
icon={<FolderIcon size={20} color={c.colorTextSecondary} />}
- label={t('common:files.count', { count: vm.files.length })}
- subtitle={formatFileSize(vm.totalSize)}
+ label={formatItemsCount(vm.files.length, vm.texts.length, t)}
+ subtitle={vm.totalSize > 0 ? formatFileSize(vm.totalSize) : undefined}
onPress={() => setIsFilesSheetOpen(true)}
trailing={<ChevronsUpDownIcon size={18} color={c.colorTextMuted} />}
isLast
@@ -262,6 +269,7 @@ export function ShareView() {
<ShareFilesSheet
open={isFilesSheetOpen}
files={vm.files}
+ texts={vm.texts}
totalSize={vm.totalSize}
onClose={() => setIsFilesSheetOpen(false)}
/>
diff --git a/package-lock.json b/package-lock.json
index 4ab16d9..473a79f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "altersend",
- "version": "1.4.0",
+ "version": "1.5.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "altersend",
- "version": "1.4.0",
+ "version": "1.5.0",
"license": "Apache-2.0",
"workspaces": [
"packages/*",
@@ -31,13 +31,13 @@
},
"apps/desktop": {
"name": "@altersend/desktop",
- "version": "1.4.0",
+ "version": "1.5.0",
"license": "Apache-2.0",
"dependencies": {
- "@altersend/components": "1.4.0",
- "@altersend/core": "1.4.0",
- "@altersend/domain": "1.4.0",
- "@altersend/locales": "1.4.0",
+ "@altersend/components": "1.5.0",
+ "@altersend/core": "1.5.0",
+ "@altersend/domain": "1.5.0",
+ "@altersend/locales": "1.5.0",
"@sentry/electron": "^7.13.0",
"b4a": "^1.8.0",
"bare-rpc": "^1.2.0",
@@ -104,14 +104,14 @@
},
"apps/mobile": {
"name": "@altersend/mobile",
- "version": "1.4.0",
+ "version": "1.5.0",
"hasInstallScript": true,
"license": "Apache-2.0",
"dependencies": {
- "@altersend/components": "1.4.0",
- "@altersend/core": "1.4.0",
- "@altersend/domain": "1.4.0",
- "@altersend/locales": "1.4.0",
+ "@altersend/components": "1.5.0",
+ "@altersend/core": "1.5.0",
+ "@altersend/domain": "1.5.0",
+ "@altersend/locales": "1.5.0",
"@expo/vector-icons": "^15.0.2",
"@sentry/react-native": "^8.11.0",
"b4a": "^1.6.7",
@@ -27157,10 +27157,10 @@
},
"packages/components": {
"name": "@altersend/components",
- "version": "1.4.0",
+ "version": "1.5.0",
"license": "Apache-2.0",
"dependencies": {
- "@altersend/domain": "1.4.0",
+ "@altersend/domain": "1.5.0",
"react-strict-dom": "^0.0.55"
},
"devDependencies": {
@@ -27328,7 +27328,7 @@
},
"packages/core": {
"name": "@altersend/core",
- "version": "1.4.0",
+ "version": "1.5.0",
"license": "Apache-2.0",
"dependencies": {
"b4a": "^1.8.0",
@@ -27361,10 +27361,10 @@
},
"packages/domain": {
"name": "@altersend/domain",
- "version": "1.4.0",
+ "version": "1.5.0",
"license": "Apache-2.0",
"dependencies": {
- "@altersend/core": "1.4.0"
+ "@altersend/core": "1.5.0"
},
"devDependencies": {
"@types/react": "^19.0.0",
@@ -27380,7 +27380,7 @@
},
"packages/locales": {
"name": "@altersend/locales",
- "version": "1.4.0",
+ "version": "1.5.0",
"license": "Apache-2.0",
"dependencies": {
"i18next": "^26.2.0",
diff --git a/package.json b/package.json
index 838aad2..505d458 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
"prettier": "^3.0.0",
"typescript-eslint": "^8.59.2"
},
- "version": "1.4.0",
+ "version": "1.5.0",
"dependencies": {
"expo": "~55.0.15",
"react": "19.2.0",
diff --git a/packages/components/package.json b/packages/components/package.json
index 775a5e9..8048dec 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
{
"name": "@altersend/components",
- "version": "1.4.0",
+ "version": "1.5.0",
"private": true,
"type": "module",
"description": "Shared AlterSend UI theme and React Strict DOM setup",
@@ -69,7 +69,7 @@
}
},
"dependencies": {
- "@altersend/domain": "1.4.0",
+ "@altersend/domain": "1.5.0",
"react-strict-dom": "^0.0.55"
},
"devDependencies": {
diff --git a/packages/components/src/components/Button/Button.tsx b/packages/components/src/components/Button/Button.tsx
index 685a6a8..2962050 100644
--- a/packages/components/src/components/Button/Button.tsx
+++ b/packages/components/src/components/Button/Button.tsx
@@ -3,6 +3,7 @@ import { html } from 'react-strict-dom'
import { usePressState } from '../../hooks/usePressState'
import { useTheme } from '../../theme'
import { Spinner } from '../Spinner'
+import { Tooltip, type TooltipSide } from '../Tooltip'
import { styles } from './styles'
type ButtonElementProps = Parameters<typeof html.button>[0]
@@ -17,6 +18,8 @@ export interface ButtonProps extends Omit<ButtonElementProps, 'children' | 'styl
loading?: boolean
pill?: boolean
size?: ButtonSize
+ tooltip?: string
+ tooltipSide?: TooltipSide
variant?: ButtonVariant
width?: 'auto' | 'full'
}
@@ -83,6 +86,8 @@ export function Button({
loading = false,
pill,
size = 'md',
+ tooltip,
+ tooltipSide = 'top',
type = 'button',
variant = 'primary',
width = 'auto',
@@ -143,6 +148,7 @@ export function Button({
) : (
children
)}
+ {tooltip ? <Tooltip label={tooltip} visible={showHover} side={tooltipSide} /> : null}
</html.button>
)
}
diff --git a/packages/components/src/components/Button/styles.ts b/packages/components/src/components/Button/styles.ts
index 3d81a2a..b5964f0 100644
--- a/packages/components/src/components/Button/styles.ts
+++ b/packages/components/src/components/Button/styles.ts
@@ -3,6 +3,7 @@ import { tokens } from '../../theme/tokens.css'
export const styles = css.create({
base: {
+ position: 'relative',
display: 'flex',
flexDirection: 'row',
boxSizing: 'border-box',
@@ -62,8 +63,8 @@ export const styles = css.create({
iconOnlyMd: {
paddingTop: tokens.space25,
paddingBottom: tokens.space25,
- paddingLeft: tokens.space2,
- paddingRight: tokens.space2,
+ paddingLeft: tokens.space25,
+ paddingRight: tokens.space25,
borderRadius: tokens.radiusMd
},
iconOnlyLg: {
diff --git a/packages/components/src/components/FeedbackTypeSelector/FeedbackTypeSelector.test.ts b/packages/components/src/components/FeedbackTypeSelector/FeedbackTypeSelector.test.ts
index 6585330..8cb88b3 100644
--- a/packages/components/src/components/FeedbackTypeSelector/FeedbackTypeSelector.test.ts
+++ b/packages/components/src/components/FeedbackTypeSelector/FeedbackTypeSelector.test.ts
@@ -1,10 +1,11 @@
import { readFileSync } from 'node:fs'
import { describe, expect, it } from 'vitest'
-const source = readFileSync(new URL('./FeedbackTypeSelector.tsx', import.meta.url), 'utf8')
+const selectorSource = readFileSync(new URL('./FeedbackTypeSelector.tsx', import.meta.url), 'utf8')
+const tabsStyles = readFileSync(new URL('../Tabs/styles.ts', import.meta.url), 'utf8')
function getStyleBlock(name: string, followingName: string): string {
- const block = source.match(
+ const block = tabsStyles.match(
new RegExp(`\\n ${name}: \\{([\\s\\S]*?)\\n \\},\\n ${followingName}`)
)?.[1]
@@ -13,14 +14,19 @@ function getStyleBlock(name: string, followingName: string): string {
}
describe('FeedbackTypeSelector layout', () => {
+ it('renders through the shared Tabs component', () => {
+ expect(selectorSource).toContain('TabsTrigger')
+ expect(selectorSource).toContain('stretch')
+ })
+
it('keeps long translated labels inside single-line segments', () => {
- const chipStyle = getStyleBlock('chip', 'chipDefault')
- const labelStyle = getStyleBlock('label', 'labelDefault')
+ const triggerStretch = getStyleBlock('triggerStretch', 'triggerDisabled')
+ const triggerLabel = getStyleBlock('triggerLabel', 'triggerLabelActive')
- expect(chipStyle).toContain('minWidth: 0')
- expect(labelStyle).toContain("overflow: 'hidden'")
- expect(labelStyle).toContain("textOverflow: 'ellipsis'")
- expect(labelStyle).toContain("whiteSpace: 'nowrap'")
- expect(labelStyle).not.toContain('overflowWrap')
+ expect(triggerStretch).toContain('minWidth: 0')
+ expect(triggerLabel).toContain("overflow: 'hidden'")
+ expect(triggerLabel).toContain("textOverflow: 'ellipsis'")
+ expect(triggerLabel).toContain("whiteSpace: 'nowrap'")
+ expect(triggerLabel).not.toContain('overflowWrap')
})
})
diff --git a/packages/components/src/components/FeedbackTypeSelector/FeedbackTypeSelector.tsx b/packages/components/src/components/FeedbackTypeSelector/FeedbackTypeSelector.tsx
index a736470..00bd08e 100644
--- a/packages/components/src/components/FeedbackTypeSelector/FeedbackTypeSelector.tsx
+++ b/packages/components/src/components/FeedbackTypeSelector/FeedbackTypeSelector.tsx
@@ -1,5 +1,4 @@
-import { css, html } from 'react-strict-dom'
-import { tokens } from '../../theme/tokens.css'
+import { Tabs, TabsList, TabsTrigger } from '../Tabs'
const TYPES = ['bug', 'feature', 'general'] as const
export type FeedbackType = (typeof TYPES)[number]
@@ -12,61 +11,6 @@ interface FeedbackTypeSelectorProps {
disabled?: boolean
}
-const styles = css.create({
- track: {
- display: 'flex',
- flexDirection: 'row',
- gap: 2,
- backgroundColor: tokens.colorBackgroundSubtle,
- borderRadius: tokens.radiusMd,
- padding: 4
- },
- chip: {
- display: 'flex',
- flex: 1,
- minWidth: 0,
- borderRadius: tokens.radiusSm,
- borderWidth: 0,
- paddingTop: 10,
- paddingBottom: 10,
- paddingLeft: 8,
- paddingRight: 8,
- alignItems: 'center',
- justifyContent: 'center',
- cursor: 'pointer',
- transitionProperty: 'background-color',
- transitionDuration: '150ms',
- transitionTimingFunction: 'ease'
- },
- chipDefault: {
- backgroundColor: 'transparent'
- },
- chipSelected: {
- backgroundColor: tokens.colorSurfacePrimary
- },
- chipDisabled: {
- opacity: 0.5,
- cursor: 'not-allowed',
- pointerEvents: 'none'
- },
- label: {
- fontFamily: tokens.fontFamilySans,
- fontSize: tokens.fontSizeMd,
- fontWeight: tokens.fontWeightMedium,
- overflow: 'hidden',
- textAlign: 'center',
- textOverflow: 'ellipsis',
- whiteSpace: 'nowrap',
- width: '100%'
- },
- labelDefault: {
- color: tokens.colorTextSecondary
- },
- labelSelected: {
- color: tokens.colorTextPrimary
- }
-})
-
export function FeedbackTypeSelector({
value,
onChange,
@@ -74,28 +18,14 @@ export function FeedbackTypeSelector({
disabled
}: FeedbackTypeSelectorProps) {
return (
- <html.div style={styles.track}>
- {TYPES.map((t) => {
- const selected = value === t
- return (
- <html.button
- key={t}
- disabled={disabled}
- onClick={() => onChange(t)}
- style={[
- styles.chip,
- selected ? styles.chipSelected : styles.chipDefault,
- disabled ? styles.chipDisabled : null
- ]}
- >
- <html.span
- style={[styles.label, selected ? styles.labelSelected : styles.labelDefault]}
- >
- {labels[t]}
- </html.span>
- </html.button>
- )
- })}
- </html.div>
+ <Tabs stretch value={value} onValueChange={(next) => onChange(next as FeedbackType)}>
+ <TabsList>
+ {TYPES.map((type) => (
+ <TabsTrigger key={type} value={type} disabled={disabled}>
+ {labels[type]}
+ </TabsTrigger>
+ ))}
+ </TabsList>
+ </Tabs>
)
}
diff --git a/packages/components/src/components/LinkRow/LinkRow.tsx b/packages/components/src/components/LinkRow/LinkRow.tsx
index d5c59be..2f849e4 100644
--- a/packages/components/src/components/LinkRow/LinkRow.tsx
+++ b/packages/components/src/components/LinkRow/LinkRow.tsx
@@ -14,6 +14,7 @@ interface LinkRowBaseProps {
icon?: ReactNode
iconBackground?: string
label: string
+ labelNode?: ReactNode
labelFontFamily?: string
size?: number
subtitle?: string
@@ -28,6 +29,7 @@ interface LinkRowBaseProps {
compact?: boolean
bare?: boolean
standalone?: boolean
+ alignTop?: boolean
disabled?: boolean
status?: { label: string; tone?: LinkRowStatusTone }
progress?: LinkRowProgressState
@@ -62,6 +64,12 @@ const statusToneStyle = {
success: styles.statusSuccess
} as const
+const statusLabelToneStyle = {
+ muted: styles.statusLabelMuted,
+ active: styles.statusLabelActive,
+ success: styles.statusLabelSuccess
+} as const
+
const progressStateStyle = {
waiting: styles.progressWaiting,
uploading: styles.progressUploading,
@@ -72,6 +80,7 @@ export function LinkRow({
icon,
iconBackground,
label,
+ labelNode,
labelFontFamily,
size,
subtitle,
@@ -86,6 +95,7 @@ export function LinkRow({
compact = false,
bare = false,
standalone = false,
+ alignTop = false,
disabled = false,
status,
progress,
@@ -162,6 +172,7 @@ export function LinkRow({
standalone && styles.rowStandalone,
bare && styles.rowBare,
bare && isFirst && styles.rowBareFirst,
+ alignTop && styles.rowAlignTop,
onPress && !disabled && styles.rowPressable,
isActive && styles.rowActive,
interactive &&
@@ -184,16 +195,18 @@ export function LinkRow({
<html.div style={styles.content}>
<html.div style={styles.metaRow}>
<html.div style={styles.text}>
- <html.p
- style={[
- styles.label,
- disabled && styles.labelDisabled,
- compact && styles.labelCompact,
- labelFontFamily ? ({ fontFamily: labelFontFamily } as never) : null
- ]}
- >
- {label}
- </html.p>
+ {labelNode ?? (
+ <html.p
+ style={[
+ styles.label,
+ disabled && styles.labelDisabled,
+ compact && styles.labelCompact,
+ labelFontFamily ? ({ fontFamily: labelFontFamily } as never) : null
+ ]}
+ >
+ {label}
+ </html.p>
+ )}
{rowSubtitle ? (
<html.p
style={[
@@ -210,7 +223,9 @@ export function LinkRow({
{status ? (
<html.div style={styles.statusGroup}>
<html.div style={[styles.statusDot, statusToneStyle[status.tone ?? 'muted']]} />
- <html.p style={styles.statusLabel}>{status.label}</html.p>
+ <html.p style={[styles.statusLabel, statusLabelToneStyle[status.tone ?? 'muted']]}>
+ {status.label}
+ </html.p>
</html.div>
) : null}
</html.div>
diff --git a/packages/components/src/components/LinkRow/styles.ts b/packages/components/src/components/LinkRow/styles.ts
index 9a15ed0..73ac6fd 100644
--- a/packages/components/src/components/LinkRow/styles.ts
+++ b/packages/components/src/components/LinkRow/styles.ts
@@ -35,6 +35,9 @@ export const styles = css.create({
paddingLeft: tokens.space25,
paddingRight: tokens.space25
},
+ rowAlignTop: {
+ alignItems: 'flex-start'
+ },
rowStandalone: {
borderWidth: 1,
borderStyle: 'solid',
@@ -186,6 +189,15 @@ export const styles = css.create({
fontSize: tokens.fontSizeSm,
lineHeight: tokens.lineHeightNormal
},
+ statusLabelMuted: {
+ color: tokens.colorTextSecondary
+ },
+ statusLabelActive: {
+ color: tokens.colorTextPrimary
+ },
+ statusLabelSuccess: {
+ color: tokens.colorSuccess
+ },
progressTrack: {
marginTop: tokens.space15,
height: tokens.space1,
diff --git a/packages/components/src/components/ListItem/ListItem.tsx b/packages/components/src/components/ListItem/ListItem.tsx
index 79b0863..2728bf8 100644
--- a/packages/components/src/components/ListItem/ListItem.tsx
+++ b/packages/components/src/components/ListItem/ListItem.tsx
@@ -3,12 +3,14 @@ import { html } from 'react-strict-dom'
import { ChevronRightIcon } from '../../icons'
import { usePressState } from '../../hooks/usePressState'
import { useTheme } from '../../theme'
+import { Tooltip } from '../Tooltip'
import { styles } from './styles'
export interface ListItemProps {
icon: ReactNode
label: string
onClick: () => void
+ tooltip?: string
active?: boolean
collapsed?: boolean
showDot?: boolean
@@ -24,6 +26,7 @@ export function ListItem({
icon,
label,
onClick,
+ tooltip,
active = false,
collapsed = false,
showDot = false,
@@ -108,6 +111,8 @@ export function ListItem({
{chevron ? <ChevronRightIcon size={14} color={contentColor} /> : null}
</>
)}
+
+ {collapsed && tooltip ? <Tooltip label={tooltip} visible={isHovered} side='right' /> : null}
</html.button>
)
}
diff --git a/packages/components/src/components/ListItem/styles.ts b/packages/components/src/components/ListItem/styles.ts
index e539b91..5726f4e 100644
--- a/packages/components/src/components/ListItem/styles.ts
+++ b/packages/components/src/components/ListItem/styles.ts
@@ -3,6 +3,7 @@ import { tokens } from '../../theme/tokens.css'
export const styles = css.create({
base: {
+ position: 'relative',
display: 'flex',
flexDirection: 'row',
alignItems: 'center',
diff --git a/packages/components/src/components/ReceivedTextRow/ReceivedTextRow.native.tsx b/packages/components/src/components/ReceivedTextRow/ReceivedTextRow.native.tsx
new file mode 100644
index 0000000..07c1d4b
--- /dev/null
+++ b/packages/components/src/components/ReceivedTextRow/ReceivedTextRow.native.tsx
@@ -0,0 +1,124 @@
+import { useState } from 'react'
+import { StyleSheet, Text, View } from 'react-native'
+import { linkifyText } from '@altersend/domain'
+import { CheckIcon, CopyIcon, MessageSquareIcon } from '../../icons'
+import { useTheme } from '../../theme'
+import { Button } from '../Button'
+import { LinkRow } from '../LinkRow'
+
+const TEXT_CLAMP_LINES = 5
+
+export interface ReceivedTextRowProps {
+ content: string
+ isFirst?: boolean
+ copied: boolean
+ subtitleLabel: string
+ copyLabel: string
+ copiedLabel: string
+ showMoreLabel: string
+ showLessLabel: string
+ onCopy: () => void
+ onOpenLink: (url: string) => void
+}
+
+export function ReceivedTextRow({
+ content,
+ isFirst = false,
+ copied,
+ subtitleLabel,
+ copyLabel,
+ copiedLabel,
+ showMoreLabel,
+ showLessLabel,
+ onCopy,
+ onOpenLink
+}: ReceivedTextRowProps) {
+ const { theme, fontFamilyName } = useTheme()
+ const c = theme.colors
+ const [expanded, setExpanded] = useState(false)
+ const [fullLineCount, setFullLineCount] = useState<number | null>(null)
+
+ const overflowing = fullLineCount !== null && fullLineCount > TEXT_CLAMP_LINES
+ const numberOfLines =
+ fullLineCount === null || expanded || !overflowing ? undefined : TEXT_CLAMP_LINES
+ const fontStyle = fontFamilyName ? { fontFamily: fontFamilyName } : null
+
+ return (
+ <LinkRow
+ bare
+ alignTop
+ isFirst={isFirst}
+ icon={<MessageSquareIcon size={18} color={c.colorInfo} />}
+ iconBackground={c.colorInfoSubtle}
+ label={content}
+ labelNode={
+ <View>
+ <Text
+ style={[fontStyle, styles.textBody, { color: c.colorTextPrimary }]}
+ numberOfLines={numberOfLines}
+ onTextLayout={(e) => {
+ if (fullLineCount === null) setFullLineCount(e.nativeEvent.lines.length)
+ }}
+ >
+ {linkifyText(content).map((seg, i) =>
+ seg.url ? (
+ <Text
+ key={i}
+ accessibilityRole='link'
+ style={[fontStyle, styles.link, { color: c.colorInfo }]}
+ onPress={() => onOpenLink(seg.url as string)}
+ >
+ {seg.text}
+ </Text>
+ ) : (
+ seg.text
+ )
+ )}
+ </Text>
+ {overflowing ? (
+ <Text
+ style={[fontStyle, styles.showMore, { color: c.colorInfo }]}
+ onPress={() => setExpanded((v) => !v)}
+ >
+ {expanded ? showLessLabel : showMoreLabel}
+ </Text>
+ ) : null}
+ </View>
+ }
+ subtitle={subtitleLabel}
+ subtitleTone='faint'
+ trailing={
+ <Button
+ size='sm'
+ variant={copied ? 'success' : 'ghost'}
+ iconOnly
+ aria-label={copied ? copiedLabel : copyLabel}
+ icon={
+ copied ? (
+ <CheckIcon size={16} color={c.colorSuccess} />
+ ) : (
+ <CopyIcon size={16} color={c.colorTextSecondary} />
+ )
+ }
+ onClick={onCopy}
+ />
+ }
+ />
+ )
+}
+
+const styles = StyleSheet.create({
+ textBody: {
+ fontSize: 14,
+ lineHeight: 20,
+ fontWeight: '500'
+ },
+ showMore: {
+ fontSize: 13,
+ fontWeight: '600',
+ marginTop: 4
+ },
+ link: {
+ textDecorationLine: 'underline'
+ }
+})
diff --git a/packages/components/src/components/ReceivedTextRow/ReceivedTextRow.tsx b/packages/components/src/components/ReceivedTextRow/ReceivedTextRow.tsx
new file mode 100644
index 0000000..78af255
--- /dev/null
+++ b/packages/components/src/components/ReceivedTextRow/ReceivedTextRow.tsx
@@ -0,0 +1,113 @@
+import { useLayoutEffect, useRef, useState, type CSSProperties } from 'react'
+import { linkifyText } from '@altersend/domain'
+import { CheckIcon, CopyIcon, MessageSquareIcon } from '../../icons'
+import { useTheme } from '../../theme'
+import { Button } from '../Button'
+import { LinkRow } from '../LinkRow'
+
+const TEXT_CLAMP_LINES = 5
+
+export interface ReceivedTextRowProps {
+ content: string
+ isFirst?: boolean
+ copied: boolean
+ subtitleLabel: string
+ copyLabel: string
+ copiedLabel: string
+ showMoreLabel: string
+ showLessLabel: string
+ onCopy: () => void
+ onOpenLink: (url: string) => void
+}
+
+export function ReceivedTextRow({
+ content,
+ isFirst = false,
+ copied,
+ subtitleLabel,
+ copyLabel,
+ copiedLabel,
+ showMoreLabel,
+ showLessLabel,
+ onCopy,
+ onOpenLink
+}: ReceivedTextRowProps) {
+ const { theme } = useTheme()
+ const [expanded, setExpanded] = useState(false)
+ const [overflowing, setOverflowing] = useState(false)
+ const textRef = useRef<HTMLParagraphElement>(null)
+
+ useLayoutEffect(() => {
+ const el = textRef.current
+ if (el && !expanded) setOverflowing(el.scrollHeight > el.clientHeight + 1)
+ }, [content, expanded])
+
+ const clampStyle: CSSProperties | undefined = expanded
+ ? undefined
+ : {
+ display: '-webkit-box',
+ WebkitLineClamp: TEXT_CLAMP_LINES,
+ WebkitBoxOrient: 'vertical',
+ overflow: 'hidden'
+ }
+
+ return (
+ <LinkRow
+ bare
+ compact
+ alignTop
+ isFirst={isFirst}
+ icon={<MessageSquareIcon size={16} color={theme.colors.colorInfo} />}
+ iconBackground={theme.colors.colorInfoSubtle}
+ label={content}
+ labelNode={
+ <div>
+ <p
+ ref={textRef}
+ className='m-0 whitespace-pre-wrap break-words text-[14px] font-medium leading-6 text-text-primary'
+ style={clampStyle}
+ >
+ {linkifyText(content).map((seg, i) =>
+ seg.url ? (
+ <a
+ key={i}
+ href={seg.url}
+ className='cursor-pointer text-info underline'
+ onClick={(e) => {
+ e.preventDefault()
+ onOpenLink(seg.url as string)
+ }}
+ >
+ {seg.text}
+ </a>
+ ) : (
+ <span key={i}>{seg.text}</span>
+ )
+ )}
+ </p>
+ {overflowing || expanded ? (
+ <button
+ type='button'
+ className='mt-1 cursor-pointer border-none bg-transparent p-0 text-[13px] font-medium text-info'
+ onClick={() => setExpanded((v) => !v)}
+ >
+ {expanded ? showLessLabel : showMoreLabel}
+ </button>
+ ) : null}
+ </div>
+ }
+ subtitle={subtitleLabel}
+ subtitleTone='faint'
+ trailing={
+ <Button
+ variant={copied ? 'success' : 'ghost'}
+ size='sm'
+ iconOnly
+ aria-label={copied ? copiedLabel : copyLabel}
+ onClick={onCopy}
+ icon={copied ? <CheckIcon size={14} /> : <CopyIcon size={14} />}
+ />
+ }
+ />
+ )
+}
diff --git a/packages/components/src/components/ReceivedTextRow/index.ts b/packages/components/src/components/ReceivedTextRow/index.ts
new file mode 100644
index 0000000..195c675
--- /dev/null
+++ b/packages/components/src/components/ReceivedTextRow/index.ts
@@ -0,0 +1 @@
+export * from './ReceivedTextRow'
diff --git a/packages/components/src/components/Tabs/TabIndicator.native.tsx b/packages/components/src/components/Tabs/TabIndicator.native.tsx
new file mode 100644
index 0000000..1f8cc28
--- /dev/null
+++ b/packages/components/src/components/Tabs/TabIndicator.native.tsx
@@ -0,0 +1,48 @@
+import { useEffect, useRef, useState } from 'react'
+import { Animated, StyleSheet, View, type LayoutChangeEvent } from 'react-native'
+import { useTheme } from '../../theme'
+
+interface TabIndicatorProps {
+ activeIndex: number
+ count: number
+ stretch: boolean
+}
+
+export function TabIndicator({ activeIndex, count, stretch }: TabIndicatorProps) {
+ const { theme } = useTheme()
+ const [width, setWidth] = useState(0)
+ const translateX = useRef(new Animated.Value(0)).current
+ const slot = stretch && count > 0 ? width / count : 0
+
+ useEffect(() => {
+ Animated.timing(translateX, {
+ toValue: activeIndex * slot,
+ duration: 200,
+ useNativeDriver: true
+ }).start()
+ }, [activeIndex, slot, translateX])
+
+ const onLayout = (event: LayoutChangeEvent) => setWidth(event.nativeEvent.layout.width)
+
+ return (
+ <View pointerEvents='none' style={styles.layer} onLayout={onLayout}>
+ {slot > 0 ? (
+ <Animated.View
+ style={[
+ styles.pill,
+ {
+ width: slot,
+ backgroundColor: theme.colors.colorSurfacePrimary,
+ transform: [{ translateX }]
+ }
+ ]}
+ />
+ ) : null}
+ </View>
+ )
+}
+
+const styles = StyleSheet.create({
+ layer: { position: 'absolute', top: 4, left: 4, right: 4, bottom: 4 },
+ pill: { position: 'absolute', top: 0, bottom: 0, borderRadius: 8 }
+})
diff --git a/packages/components/src/components/Tabs/TabIndicator.tsx b/packages/components/src/components/Tabs/TabIndicator.tsx
new file mode 100644
index 0000000..fa098ba
--- /dev/null
+++ b/packages/components/src/components/Tabs/TabIndicator.tsx
@@ -0,0 +1,80 @@
+import { useLayoutEffect, useRef, useState } from 'react'
+import { css, html } from 'react-strict-dom'
+import { tokens } from '../../theme/tokens.css'
+
+interface TabIndicatorProps {
+ activeIndex: number
+ count: number
+ stretch: boolean
+}
+
+const INSET = 4
+
+const styles = css.create({
+ layer: {
+ position: 'absolute',
+ top: INSET,
+ left: INSET,
+ right: INSET,
+ bottom: INSET,
+ pointerEvents: 'none'
+ },
+ pill: {
+ position: 'absolute',
+ top: 0,
+ bottom: 0,
+ borderRadius: tokens.radiusSm,
+ backgroundColor: tokens.colorSurfacePrimary,
+ transitionProperty: 'transform, width',
+ transitionDuration: '200ms',
+ transitionTimingFunction: 'ease'
+ },
+ pillPercent: (widthPct: number, offsetPct: number) => ({
+ width: `${widthPct}%`,
+ transform: `translateX(${offsetPct}%)`
+ }),
+ pillMeasured: (left: number, width: number) => ({
+ width: `${width}px`,
+ transform: `translateX(${left}px)`
+ })
+})
+
+export function TabIndicator({ activeIndex, count, stretch }: TabIndicatorProps) {
+ const layerRef = useRef<HTMLDivElement | null>(null)
+ const [measured, setMeasured] = useState<{ left: number; width: number } | null>(null)
+
+ useLayoutEffect(() => {
+ if (stretch) return
+ const list = layerRef.current?.parentElement
+ if (!list) return
+
+ const measure = () => {
+ const trigger = list.querySelectorAll('[role="tab"]')[activeIndex] as HTMLElement | undefined
+ if (!trigger) return
+ const listRect = list.getBoundingClientRect()
+ const triggerRect = trigger.getBoundingClientRect()
+ setMeasured({ left: triggerRect.left - listRect.left - INSET, width: triggerRect.width })
+ }
+
+ measure()
+ window.addEventListener('resize', measure)
+ return () => window.removeEventListener('resize', measure)
+ }, [activeIndex, count, stretch])
+
+ const showPill = stretch || measured !== null
+
+ return (
+ <html.div ref={layerRef} style={styles.layer}>
+ {showPill ? (
+ <html.div
+ style={[
+ styles.pill,
+ stretch
+ ? styles.pillPercent(100 / count, activeIndex * 100)
+ : styles.pillMeasured(measured!.left, measured!.width)
+ ]}
+ />
+ ) : null}
+ </html.div>
+ )
+}
diff --git a/packages/components/src/components/Tabs/Tabs.tsx b/packages/components/src/components/Tabs/Tabs.tsx
index 305e6c6..bf18db2 100644
--- a/packages/components/src/components/Tabs/Tabs.tsx
+++ b/packages/components/src/components/Tabs/Tabs.tsx
@@ -1,5 +1,7 @@
import {
+ Children,
createContext,
+ isValidElement,
useCallback,
useEffect,
useId,
@@ -9,6 +11,7 @@ import {
} from 'react'
import { html } from 'react-strict-dom'
import { styles } from './styles'
+import { TabIndicator } from './TabIndicator'
type DivElementProps = Parameters<typeof html.div>[0]
type ButtonElementProps = Parameters<typeof html.button>[0]
@@ -35,15 +38,21 @@ interface TabsContextValue {
focusLast: () => void
onValueChange: (value: string) => void
registerTrigger: (registration: TriggerRegistration) => void
+ size: TabsSize
+ stretch: boolean
unregisterTrigger: (value: string) => void
value: string
}
+export type TabsSize = 'sm' | 'md'
+
const TabsContext = createContext<TabsContextValue | null>(null)
export interface TabsProps extends Omit<DivElementProps, 'style'> {
children: ReactNode
onValueChange: (value: string) => void
+ size?: TabsSize
+ stretch?: boolean
value: string
}
@@ -87,7 +96,14 @@ function getEnabledTriggers(
)
}
-export function Tabs({ children, onValueChange, value, ...props }: TabsProps) {
+export function Tabs({
+ children,
+ onValueChange,
+ size = 'md',
+ stretch = false,
+ value,
+ ...props
+}: TabsProps) {
const generatedId = useId()
const baseId = props.id ?? generatedId
const triggerRegistrationsRef = useRef<Map<string, TriggerRegistration>>(new Map())
@@ -160,11 +176,13 @@ export function Tabs({ children, onValueChange, value, ...props }: TabsProps) {
focusLast,
onValueChange,
registerTrigger,
+ size,
+ stretch,
unregisterTrigger,
value
}}
>
- <html.div {...props} style={styles.root}>
+ <html.div {...props} style={[styles.root, stretch && styles.rootStretch]}>
{children}
</html.div>
</TabsContext.Provider>
@@ -172,8 +190,24 @@ export function Tabs({ children, onValueChange, value, ...props }: TabsProps) {
}
export function TabsList({ children, ...props }: TabsListProps) {
+ const { stretch, value } = useTabsContext('TabsList')
+ const triggerValues = Children.toArray(children)
+ .filter(isValidElement)
+ .map((child) => (child.props as { value?: string }).value)
+ .filter((triggerValue): triggerValue is string => typeof triggerValue === 'string')
+ const count = triggerValues.length
+ const activeIndex = Math.max(0, triggerValues.indexOf(value))
+
return (
- <html.div {...props} aria-orientation='horizontal' role='tablist' style={styles.list}>
+ <html.div
+ {...props}
+ aria-orientation='horizontal'
+ role='tablist'
+ style={[styles.list, stretch && styles.listStretch]}
+ >
+ {count > 1 ? (
+ <TabIndicator activeIndex={activeIndex} count={count} stretch={stretch} />
+ ) : null}
{children}
</html.div>
)
@@ -253,11 +287,24 @@ export function TabsTrigger({ children, onClick, value, ...props }: TabsTriggerP
triggerRef.current = element as FocusableElement | null
}}
role='tab'
- style={[styles.trigger, isActive && styles.triggerActive]}
+ style={[
+ styles.trigger,
+ context.size === 'sm' && styles.triggerSm,
+ context.stretch && styles.triggerStretch,
+ disabled && styles.triggerDisabled
+ ]}
tabIndex={isActive ? 0 : -1}
type='button'
>
- <html.span style={styles.triggerLabel}>{children}</html.span>
+ <html.span
+ style={[
+ styles.triggerLabel,
+ context.size === 'sm' && styles.triggerLabelSm,
+ isActive && styles.triggerLabelActive
+ ]}
+ >
+ {children}
+ </html.span>
</html.button>
)
}
diff --git a/packages/components/src/components/Tabs/styles.ts b/packages/components/src/components/Tabs/styles.ts
index e5e179d..e3e0be0 100644
--- a/packages/components/src/components/Tabs/styles.ts
+++ b/packages/components/src/components/Tabs/styles.ts
@@ -11,55 +11,77 @@ export const styles = css.create({
minWidth: 0,
width: '100%'
},
+ rootStretch: {
+ flex: 0
+ },
list: {
+ position: 'relative',
display: 'flex',
+ flexDirection: 'row',
alignItems: 'center',
- gap: tokens.space1,
+ gap: tokens.space05,
alignSelf: 'flex-start',
padding: tokens.space1,
borderWidth: 1,
borderStyle: 'solid',
borderColor: tokens.colorBorderPrimary,
borderRadius: tokens.radiusMd,
- backgroundColor: tokens.colorBackgroundSubtle,
- boxShadow: `inset 0 1px 0 ${tokens.colorBorderPrimary}`
+ backgroundColor: tokens.colorBackgroundSubtle
+ },
+ listStretch: {
+ alignSelf: 'stretch',
+ gap: 0
},
trigger: {
+ position: 'relative',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
minWidth: 88,
- height: tokens.space10,
- paddingBlock: 0,
- paddingInline: tokens.space4,
- borderWidth: 1,
- borderStyle: 'solid',
- borderColor: 'transparent',
+ paddingBlock: tokens.space25,
+ paddingInline: tokens.space2,
+ borderWidth: 0,
borderRadius: tokens.radiusSm,
backgroundColor: 'transparent',
- color: tokens.colorTextSecondary,
fontFamily: tokens.fontFamilySans,
fontSize: tokens.fontSizeBase,
cursor: 'pointer',
- transitionDuration: '160ms',
- transitionProperty: 'color, border-color, background-color, box-shadow',
- ':hover': {
- color: tokens.colorTextPrimary,
- backgroundColor: tokens.colorSurfacePrimary
- },
+ transitionDuration: '150ms',
+ transitionProperty: 'background-color',
+ transitionTimingFunction: 'ease',
':focus-visible': {
outline: 'none',
- boxShadow: `0 0 0 2px ${tokens.colorFocusRing}`
+ boxShadow: `inset 0 0 0 2px ${tokens.colorFocusRing}`
}
},
- triggerActive: {
- backgroundColor: tokens.colorSurfacePrimary,
- borderColor: tokens.colorBorderStrong,
- boxShadow: `0 1px 2px ${tokens.colorShadow}`,
- color: tokens.colorTextPrimary
+ triggerSm: {
+ minWidth: 0,
+ paddingBlock: 7,
+ paddingInline: tokens.space5
+ },
+ triggerStretch: {
+ flex: 1,
+ minWidth: 0
+ },
+ triggerDisabled: {
+ opacity: 0.5,
+ cursor: 'not-allowed',
+ pointerEvents: 'none'
},
triggerLabel: {
- fontWeight: tokens.fontWeightBold,
+ width: '100%',
+ color: tokens.colorTextSecondary,
+ fontWeight: tokens.fontWeightMedium,
+ fontSize: tokens.fontSizeMd,
+ textAlign: 'center',
+ overflow: 'hidden',
+ textOverflow: 'ellipsis',
+ whiteSpace: 'nowrap'
+ },
+ triggerLabelActive: {
+ color: tokens.colorTextPrimary
+ },
+ triggerLabelSm: {
fontSize: tokens.fontSizeMd
},
content: {
diff --git a/packages/components/src/components/Textarea/Textarea.tsx b/packages/components/src/components/Textarea/Textarea.tsx
new file mode 100644
index 0000000..1adefc4
--- /dev/null
+++ b/packages/components/src/components/Textarea/Textarea.tsx
@@ -0,0 +1,58 @@
+import { useId, type ReactNode } from 'react'
+import { html } from 'react-strict-dom'
+import { styles } from './styles'
+
+type TextareaElementProps = Parameters<typeof html.textarea>[0]
+
+export interface TextareaProps extends Omit<TextareaElementProps, 'style'> {
+ label?: string
+ error?: string
+ invalid?: boolean
+ footer?: ReactNode
+ minHeight?: number
+ height?: number
+}
+
+export function Textarea({
+ label,
+ error,
+ invalid,
+ footer,
+ minHeight,
+ height,
+ id,
+ ...props
+}: TextareaProps) {
+ const generatedId = useId()
+ const fieldId = id ?? generatedId
+ const hasError = Boolean(error) || Boolean(invalid)
+
+ return (
+ <html.div style={styles.root}>
+ {label ? (
+ <html.label for={fieldId} style={styles.label}>
+ {label}
+ </html.label>
+ ) : null}
+
+ <html.div
+ style={[
+ styles.box,
+ hasError && styles.boxInvalid,
+ props.disabled && styles.boxDisabled,
+ height ? ({ height } as never) : null
+ ]}
+ >
+ <html.textarea
+ {...props}
+ id={fieldId}
+ aria-invalid={hasError}
+ style={[styles.field, minHeight ? ({ minHeight } as never) : null]}
+ />
+ {footer ? <html.div style={styles.footer}>{footer}</html.div> : null}
+ </html.div>
+
+ {error ? <html.p style={[styles.hint, styles.error]}>{error}</html.p> : null}
+ </html.div>
+ )
+}
diff --git a/packages/components/src/components/Textarea/index.ts b/packages/components/src/components/Textarea/index.ts
new file mode 100644
index 0000000..16fcfa8
--- /dev/null
+++ b/packages/components/src/components/Textarea/index.ts
@@ -0,0 +1 @@
+export { Textarea, type TextareaProps } from './Textarea'
diff --git a/packages/components/src/components/Textarea/styles.ts b/packages/components/src/components/Textarea/styles.ts
new file mode 100644
index 0000000..e41057d
--- /dev/null
+++ b/packages/components/src/components/Textarea/styles.ts
@@ -0,0 +1,90 @@
+import { css } from 'react-strict-dom'
+import { tokens } from '../../theme/tokens.css'
+
+export const styles = css.create({
+ root: {
+ display: 'flex',
+ flexDirection: 'column',
+ gap: tokens.space2,
+ minWidth: 0,
+ width: '100%'
+ },
+ label: {
+ margin: 0,
+ color: tokens.colorTextMuted,
+ fontFamily: tokens.fontFamilySans,
+ fontSize: tokens.fontSizeBase,
+ fontWeight: tokens.fontWeightRegular,
+ lineHeight: tokens.lineHeightNormal
+ },
+ box: {
+ display: 'flex',
+ flexDirection: 'column',
+ width: '100%',
+ boxSizing: 'border-box',
+ overflow: 'hidden',
+ padding: tokens.space3,
+ borderWidth: 1,
+ borderStyle: 'solid',
+ borderColor: tokens.colorBorderPrimary,
+ borderRadius: tokens.radiusLg,
+ backgroundColor: tokens.colorBackgroundSubtle,
+ transitionDuration: '180ms',
+ transitionProperty: 'border-color, height',
+ transitionTimingFunction: 'ease',
+ ':focus-within': {
+ borderColor: tokens.colorBorderStrong
+ }
+ },
+ boxInvalid: {
+ borderColor: tokens.colorDanger
+ },
+ boxDisabled: {
+ opacity: 0.5
+ },
+ field: {
+ flexGrow: 1,
+ flexShrink: 1,
+ minHeight: 0,
+ width: '100%',
+ minWidth: 0,
+ boxSizing: 'border-box',
+ padding: 0,
+ borderWidth: 0,
+ borderStyle: 'solid',
+ borderColor: 'transparent',
+ backgroundColor: 'transparent',
+ resize: 'none',
+ color: tokens.colorTextPrimary,
+ fontFamily: tokens.fontFamilySans,
+ fontSize: tokens.fontSizeMd,
+ fontWeight: tokens.fontWeightRegular,
+ lineHeight: tokens.lineHeightRelaxed,
+ outline: 'none',
+ boxShadow: 'none',
+ '::placeholder': {
+ color: tokens.colorTextMuted
+ }
+ },
+ footer: {
+ display: 'flex',
+ flexDirection: 'row',
+ alignItems: 'center',
+ justifyContent: 'space-between',
+ flexShrink: 0,
+ gap: tokens.space2,
+ marginTop: tokens.space3
+ },
+ hint: {
+ margin: 0,
+ color: tokens.colorTextMuted,
+ fontFamily: tokens.fontFamilySans,
+ fontSize: tokens.fontSizeMd,
+ fontWeight: tokens.fontWeightRegular,
+ lineHeight: tokens.lineHeightRelaxed
+ },
+ error: {
+ color: tokens.colorDanger,
+ fontWeight: tokens.fontWeightMedium
+ }
+})
diff --git a/packages/components/src/components/Tooltip/Tooltip.tsx b/packages/components/src/components/Tooltip/Tooltip.tsx
new file mode 100644
index 0000000..1ce4100
--- /dev/null
+++ b/packages/components/src/components/Tooltip/Tooltip.tsx
@@ -0,0 +1,27 @@
+import { html } from 'react-strict-dom'
+import { styles } from './styles'
+
+export type TooltipSide = 'right' | 'top' | 'bottom'
+
+export interface TooltipProps {
+ label: string
+ visible: boolean
+ side?: TooltipSide
+}
+
+const sideStyle = {
+ right: styles.right,
+ top: styles.top,
+ bottom: styles.bottom
+} as const
+
+export function Tooltip({ label, visible, side = 'top' }: TooltipProps) {
+ return (
+ <html.div
+ role='tooltip'
+ style={[styles.layer, sideStyle[side], visible && styles.layerVisible]}
+ >
+ <html.span style={styles.tooltip}>{label}</html.span>
+ </html.div>
+ )
+}
diff --git a/packages/components/src/components/Tooltip/index.ts b/packages/components/src/components/Tooltip/index.ts
new file mode 100644
index 0000000..ba15f40
--- /dev/null
+++ b/packages/components/src/components/Tooltip/index.ts
@@ -0,0 +1 @@
+export * from './Tooltip'
diff --git a/packages/components/src/components/Tooltip/styles.ts b/packages/components/src/components/Tooltip/styles.ts
new file mode 100644
index 0000000..f72e392
--- /dev/null
+++ b/packages/components/src/components/Tooltip/styles.ts
@@ -0,0 +1,60 @@
+import { css } from 'react-strict-dom'
+import { tokens } from '../../theme/tokens.css'
+
+export const styles = css.create({
+ layer: {
+ position: 'absolute',
+ zIndex: 50,
+ display: 'flex',
+ flexDirection: 'row',
+ pointerEvents: 'none',
+ opacity: 0,
+ transitionProperty: 'opacity',
+ transitionDuration: '150ms',
+ transitionTimingFunction: 'ease'
+ },
+ layerVisible: {
+ opacity: 1
+ },
+ right: {
+ left: '100%',
+ top: 0,
+ bottom: 0,
+ marginLeft: tokens.space2,
+ alignItems: 'center'
+ },
+ top: {
+ bottom: '100%',
+ left: 0,
+ right: 0,
+ marginBottom: tokens.space2,
+ justifyContent: 'center',
+ alignItems: 'flex-end'
+ },
+ bottom: {
+ top: '100%',
+ left: 0,
+ right: 0,
+ marginTop: tokens.space2,
+ justifyContent: 'center',
+ alignItems: 'flex-start'
+ },
+ tooltip: {
+ margin: 0,
+ whiteSpace: 'nowrap',
+ borderWidth: 1,
+ borderStyle: 'solid',
+ borderColor: tokens.colorBorderStrong,
+ borderRadius: tokens.radiusSm,
+ backgroundColor: tokens.colorSurfaceTertiary,
+ color: tokens.colorTextPrimary,
+ paddingTop: tokens.space15,
+ paddingBottom: tokens.space15,
+ paddingLeft: tokens.space25,
+ paddingRight: tokens.space25,
+ fontSize: tokens.fontSizeMd,
+ fontWeight: tokens.fontWeightMedium,
+ lineHeight: tokens.lineHeightTight,
+ boxShadow: `0 8px 24px ${tokens.colorShadow}`
+ }
+})
diff --git a/packages/components/src/components/index.ts b/packages/components/src/components/index.ts
index 89f4c0e..9071c36 100644
--- a/packages/components/src/components/index.ts
+++ b/packages/components/src/components/index.ts
@@ -1,6 +1,7 @@
export * from './Badge/index'
export * from './Button/index'
export * from './Input/index'
+export * from './Textarea/index'
export * from './Tabs/index'
export * from './FileDropZone/index'
export * from './ListItem/index'
@@ -13,8 +14,10 @@ export * from './PeerListCard/index'
export * from './CrashScreen/index'
export * from './ExternalLink/index'
export * from './ToggleSwitch/index'
+export * from './Tooltip/index'
export * from './FeedbackTypeSelector/index'
export * from './LinkRow/index'
export * from './WaitingRadar/index'
export * from './WaitingState/index'
export * from './Spinner/index'
+export * from './ReceivedTextRow/index'
diff --git a/packages/components/src/icons/set.tsx b/packages/components/src/icons/set.tsx
index 095e188..7b7b96c 100644
--- a/packages/components/src/icons/set.tsx
+++ b/packages/components/src/icons/set.tsx
@@ -29,6 +29,7 @@ import {
Lock,
Mail,
Menu,
+ MessageSquare,
Monitor,
MoreHorizontal,
MoreVertical,
@@ -86,6 +87,7 @@ export const TabletIcon = adaptLucide(Tablet)
export const LockIcon = adaptLucide(Lock)
export const MailIcon = adaptLucide(Mail)
export const MenuIcon = adaptLucide(Menu)
+export const MessageSquareIcon = adaptLucide(MessageSquare)
export const MoreHorizontalIcon = adaptLucide(MoreHorizontal)
export const MoreVerticalIcon = adaptLucide(MoreVertical)
export const MusicIcon = adaptLucide(Music)
diff --git a/packages/core/package.json b/packages/core/package.json
index 9f89deb..16962f6 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
{
"name": "@altersend/core",
- "version": "1.4.0",
+ "version": "1.5.0",
"type": "module",
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
diff --git a/packages/core/src/worklet/peers/discovery.test.ts b/packages/core/src/worklet/peers/discovery.test.ts
index f68b5cb..20190a5 100644
--- a/packages/core/src/worklet/peers/discovery.test.ts
+++ b/packages/core/src/worklet/peers/discovery.test.ts
@@ -144,14 +144,20 @@ describe('DiscoveryCoordinator', () => {
await coordinator.start()
const topic = hex(crypto.randomBytes(32))
- const invitePromise = coordinator.invite(peer.remoteDevicePubkey, topic, 3, 1024)
+ const invitePromise = coordinator.invite(peer.remoteDevicePubkey, topic, 3, 2, 1024)
await flush()
connect(peer.remoteDevicePubkey)
expect(await invitePromise).toEqual({ delivered: true })
expect(channels).toHaveLength(1)
expect(channels[0].send).toHaveBeenCalledWith(
- expect.objectContaining({ type: 'invite', topic, fileCount: 3, totalSize: 1024 })
+ expect.objectContaining({
+ type: 'invite',
+ topic,
+ fileCount: 3,
+ textCount: 2,
+ totalSize: 1024
+ })
)
})
diff --git a/packages/core/src/worklet/peers/discovery.ts b/packages/core/src/worklet/peers/discovery.ts
index ec79b00..62f2f51 100644
--- a/packages/core/src/worklet/peers/discovery.ts
+++ b/packages/core/src/worklet/peers/discovery.ts
@@ -105,6 +105,7 @@ export class DiscoveryCoordinator {
remoteDevicePubkey: string,
topic: string,
fileCount?: number,
+ textCount?: number,
totalSize?: number
): Promise<InviteDeviceReply> {
if (typeof remoteDevicePubkey !== 'string' || remoteDevicePubkey.length === 0) {
@@ -130,6 +131,7 @@ export class DiscoveryCoordinator {
deviceType: identity.deviceType,
topic,
...(fileCount !== undefined ? { fileCount } : {}),
+ ...(textCount !== undefined ? { textCount } : {}),
...(totalSize !== undefined ? { totalSize } : {})
}
session.control.send(message)
@@ -250,6 +252,7 @@ export class DiscoveryCoordinator {
deviceType: message.deviceType,
topic: message.topic,
...(message.fileCount !== undefined ? { fileCount: message.fileCount } : {}),
+ ...(message.textCount !== undefined ? { textCount: message.textCount } : {}),
...(message.totalSize !== undefined ? { totalSize: message.totalSize } : {})
})
)
diff --git a/packages/core/src/worklet/rpc/events.ts b/packages/core/src/worklet/rpc/events.ts
index 9665b34..6120e7d 100644
--- a/packages/core/src/worklet/rpc/events.ts
+++ b/packages/core/src/worklet/rpc/events.ts
@@ -92,6 +92,7 @@ export interface InviteReceivedEvent {
deviceType: DeviceType
topic: string
fileCount?: number
+ textCount?: number
totalSize?: number
}
diff --git a/packages/core/src/worklet/rpc/protocol.ts b/packages/core/src/worklet/rpc/protocol.ts
index a12321d..906f448 100644
--- a/packages/core/src/worklet/rpc/protocol.ts
+++ b/packages/core/src/worklet/rpc/protocol.ts
@@ -85,6 +85,7 @@ export interface InviteDeviceInput {
remoteDevicePubkey: string
topic: string
fileCount?: number
+ textCount?: number
totalSize?: number
}
diff --git a/packages/core/src/worklet/transfer/control-channel.ts b/packages/core/src/worklet/transfer/control-channel.ts
index 25267fb..115bb82 100644
--- a/packages/core/src/worklet/transfer/control-channel.ts
+++ b/packages/core/src/worklet/transfer/control-channel.ts
@@ -99,6 +99,7 @@ export interface DeviceInvite {
deviceType: DeviceType
topic: string
fileCount?: number
+ textCount?: number
totalSize?: number
}
diff --git a/packages/core/src/worklet/transfer/control-validation.ts b/packages/core/src/worklet/transfer/control-validation.ts
index 5f7c78e..edbb3ba 100644
--- a/packages/core/src/worklet/transfer/control-validation.ts
+++ b/packages/core/src/worklet/transfer/control-validation.ts
@@ -169,6 +169,7 @@ export function isValidControlMessage(x: unknown): x is PeerControlMessage {
isDeviceType(v.deviceType) &&
isBoundedString(v.topic, MAX_ID_LEN) &&
(v.fileCount === undefined || isNonNegativeInteger(v.fileCount, MAX_FILES_PER_TRANSFER)) &&
+ (v.textCount === undefined || isNonNegativeInteger(v.textCount, MAX_FILES_PER_TRANSFER)) &&
(v.totalSize === undefined || isNonNegativeInteger(v.totalSize))
)
}
diff --git a/packages/core/src/worklet/transfer/orchestrator.ts b/packages/core/src/worklet/transfer/orchestrator.ts
index 6941727..3a3a7de 100644
--- a/packages/core/src/worklet/transfer/orchestrator.ts
+++ b/packages/core/src/worklet/transfer/orchestrator.ts
@@ -221,6 +221,7 @@ export class TransferOrchestrator implements TransferRPC {
input.remoteDevicePubkey,
input.topic,
input.fileCount,
+ input.textCount,
input.totalSize
)
}
@@ -420,6 +421,7 @@ export class TransferOrchestrator implements TransferRPC {
}
this.activeTransferReady = null
this.swarm.broadcast(this.activeTransfer)
+ this.sendStatus('sharing', { transferId })
const controller = new AbortController()
this.inflightAbort = controller
diff --git a/packages/domain/package.json b/packages/domain/package.json
index 621861f..2b1b19b 100644
--- a/packages/domain/package.json
+++ b/packages/domain/package.json
@@ -1,6 +1,6 @@
{
"name": "@altersend/domain",
- "version": "1.4.0",
+ "version": "1.5.0",
"type": "module",
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
@@ -25,7 +25,7 @@
"test:watch": "vitest"
},
"dependencies": {
- "@altersend/core": "1.4.0"
+ "@altersend/core": "1.5.0"
},
"peerDependencies": {
"react": "^19.0.0",
diff --git a/packages/domain/src/flags.ts b/packages/domain/src/flags.ts
deleted file mode 100644
index db70f11..0000000
--- a/packages/domain/src/flags.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const ENABLE_TEXT_SHARING = false
diff --git a/packages/domain/src/format.ts b/packages/domain/src/format.ts
index b7eb6fb..21143c3 100644
--- a/packages/domain/src/format.ts
+++ b/packages/domain/src/format.ts
@@ -1,5 +1,21 @@
+import type { Translate } from './i18n'
+
export type InviteStatus = 'inviting' | 'sent' | 'offline'
+export function formatItemsCount(fileCount: number, textCount: number, t: Translate): string {
+ if (fileCount > 0 && textCount > 0)
+ return t('common:files.items', { count: fileCount + textCount })
+ if (textCount > 0) return t('common:files.texts', { count: textCount })
+ return t('common:files.count', { count: fileCount })
+}
+
+export function formatSendButtonLabel(fileCount: number, textCount: number, t: Translate): string {
+ if (fileCount > 0 && textCount > 0)
+ return t('send:actions.sendItems', { count: fileCount + textCount })
+ if (textCount > 0) return t('send:actions.sendTexts', { count: textCount })
+ return t('send:actions.sendFiles', { count: fileCount })
+}
+
export function formatFileSize(bytes: number): string {
if (bytes < 1024) return `${bytes} B`
if (bytes < 1024 ** 2) return `${(bytes / 1024).toFixed(1)} KB`
diff --git a/packages/domain/src/index.ts b/packages/domain/src/index.ts
index 5210976..7ffc4e0 100644
--- a/packages/domain/src/index.ts
+++ b/packages/domain/src/index.ts
@@ -13,6 +13,7 @@ export type {
ConnectedDeviceRow,
OfflineDeviceRow,
FileRow,
+ TextRow,
SubtitleTone
} from './send/useShareViewModel'
export * from './send/pageUi'
@@ -21,9 +22,9 @@ export * from './receive/pageUi'
export * from './receive/joinCode'
export * from './receive/downloadModel'
export * from './transfer'
-export * from './flags'
export * from './onboarding'
export * from './useSimulatedLoading'
+export * from './useCopiedFlag'
export * from './pairing'
export * from './feedback'
diff --git a/packages/domain/src/receive/downloadModel.test.ts b/packages/domain/src/receive/downloadModel.test.ts
index 4fa9908..0342890 100644
--- a/packages/domain/src/receive/downloadModel.test.ts
+++ b/packages/domain/src/receive/downloadModel.test.ts
@@ -1,6 +1,11 @@
import { describe, it, expect } from 'vitest'
import type { IncomingFileOffer } from '@altersend/core'
-import { groupReceiveRows, getFolderRowDisplay, type DownloadItemState } from './downloadModel'
+import {
+ groupReceiveRows,
+ getFolderRowDisplay,
+ linkifyText,
+ type DownloadItemState
+} from './downloadModel'
type FileOffer = Extract<IncomingFileOffer, { kind: 'file' }>
@@ -96,3 +101,47 @@ describe('getFolderRowDisplay', () => {
expect(display.status.kind).toBe('ready')
})
})
+
+describe('linkifyText', () => {
+ it('splits a url from surrounding text', () => {
+ const segments = linkifyText('see https://example.com now')
+ expect(segments).toEqual([
+ { text: 'see ' },
+ { text: 'https://example.com', url: 'https://example.com' },
+ { text: ' now' }
+ ])
+ })
+
+ it('strips trailing punctuation from the link but keeps it as text', () => {
+ const segments = linkifyText('go to https://example.com.')
+ expect(segments).toEqual([
+ { text: 'go to ' },
+ { text: 'https://example.com', url: 'https://example.com' },
+ { text: '.' }
+ ])
+ })
+
+ it('handles two adjacent urls without losing the separator', () => {
+ const segments = linkifyText('https://a.com https://b.com')
+ expect(segments).toEqual([
+ { text: 'https://a.com', url: 'https://a.com' },
+ { text: ' ' },
+ { text: 'https://b.com', url: 'https://b.com' }
+ ])
+ })
+
+ it('returns plain text unchanged when there is no url', () => {
+ expect(linkifyText('just a note')).toEqual([{ text: 'just a note' }])
+ })
+
+ it('processes adversarial punctuation runs in linear time (no ReDoS)', () => {
+ // A url match containing a long run of '!' that is not at the end is the
+ // classic quadratic-backtracking trigger for a `[punct]+$` regex.
+ const hostile = `https://x/${'!'.repeat(200_000)}a`
+ const start = Date.now()
+ const segments = linkifyText(hostile)
+ expect(Date.now() - start).toBeLessThan(1000)
+ // Nothing is stripped because the match does not end in punctuation.
+ expect(segments).toEqual([{ text: hostile, url: hostile }])
+ })
+})
diff --git a/packages/domain/src/receive/downloadModel.ts b/packages/domain/src/receive/downloadModel.ts
index c306e6a..331f94c 100644
--- a/packages/domain/src/receive/downloadModel.ts
+++ b/packages/domain/src/receive/downloadModel.ts
@@ -44,6 +44,36 @@ export function getOfferKey(file: IncomingFileOffer) {
return file.id
}
+export interface TextSegment {
+ text: string
+ url?: string
+}
+
+const TRAILING_URL_PUNCT = new Set(['.', ',', ';', ':', '!', '?', ')', ']', '}', "'", '"'])
+
+function stripTrailingPunctuation(url: string): string {
+ let end = url.length
+ while (end > 0 && TRAILING_URL_PUNCT.has(url[end - 1])) end--
+ return url.slice(0, end)
+}
+
+export function linkifyText(text: string): TextSegment[] {
+ const pattern = /https?:\/\/[^\s]+/g
+ const segments: TextSegment[] = []
+ let lastIndex = 0
+ let match: RegExpExecArray | null
+
+ while ((match = pattern.exec(text)) !== null) {
+ const raw = stripTrailingPunctuation(match[0])
+ if (match.index > lastIndex) segments.push({ text: text.slice(lastIndex, match.index) })
+ segments.push({ text: raw, url: raw })
+ lastIndex = match.index + raw.length
+ }
+
+ if (lastIndex < text.length) segments.push({ text: text.slice(lastIndex) })
+ return segments
+}
+
function getProgressPercent(bytesTransferred: number, totalBytes: number) {
if (totalBytes <= 0) return 0
return Math.max(0, Math.min(100, Math.round((bytesTransferred / totalBytes) * 100)))
diff --git a/packages/domain/src/receive/pageUi.ts b/packages/domain/src/receive/pageUi.ts
index fe73c98..a3e904e 100644
--- a/packages/domain/src/receive/pageUi.ts
+++ b/packages/domain/src/receive/pageUi.ts
@@ -1,5 +1,5 @@
import type { TransferRole } from '@altersend/core'
-import { formatFileSize } from '../format'
+import { formatFileSize, formatItemsCount } from '../format'
import type { Translate } from '../i18n'
export type ReceiveStep =
@@ -56,9 +56,11 @@ export function getReceiveStep({
export function getReceivePageCopy(
t: Translate,
step: ReceiveStep,
- incomingCount: number,
+ fileCount: number,
+ textCount: number,
totalBytes: number
): ReceivePageCopy {
+ const incomingCount = fileCount + textCount
switch (step) {
case 'join':
return {
@@ -70,7 +72,14 @@ export function getReceivePageCopy(
title: t('receive:page.connecting.title'),
description: t('receive:page.connecting.description')
}
- case 'incoming_transfer':
+ case 'incoming_transfer': {
+ if (textCount > 0) {
+ const label = formatItemsCount(fileCount, textCount, t)
+ return {
+ title: t('receive:page.incomingTransfer.title'),
+ description: totalBytes > 0 ? `${label} · ${formatFileSize(totalBytes)}` : label
+ }
+ }
return {
title: t('receive:page.incomingTransfer.title'),
description: t('receive:page.incomingTransfer.description', {
@@ -78,6 +87,7 @@ export function getReceivePageCopy(
size: formatFileSize(totalBytes)
})
}
+ }
case 'completed':
return {
title: t('receive:page.completed.title', { count: incomingCount }),
diff --git a/packages/domain/src/send/draftModel.ts b/packages/domain/src/send/draftModel.ts
index 38868df..d2be502 100644
--- a/packages/domain/src/send/draftModel.ts
+++ b/packages/domain/src/send/draftModel.ts
@@ -95,6 +95,24 @@ export function groupSelectedFiles(files: SelectedFile[]): SelectedRow[] {
return rows
}
+export function createTextSnippet(content: string): SelectedFile {
+ const text = content.trim()
+ const id = `text-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`
+ return {
+ name: formatTextSnippetPreview(text, 40),
+ path: id,
+ kind: 'text',
+ content: text,
+ isTemporary: true,
+ size: text.length
+ }
+}
+
+export function formatTextSnippetPreview(content: string, maxLength = 72): string {
+ const collapsed = content.replace(/\s+/g, ' ').trim()
+ return collapsed.length > maxLength ? `${collapsed.slice(0, maxLength).trimEnd()}…` : collapsed
+}
+
export function createInitialUploadItems(selectedFiles: SelectedFile[]): SenderUploadItem[] {
return selectedFiles.map((file) => ({
...file,
diff --git a/packages/domain/src/send/draftTypes.ts b/packages/domain/src/send/draftTypes.ts
index d23a512..f973052 100644
--- a/packages/domain/src/send/draftTypes.ts
+++ b/packages/domain/src/send/draftTypes.ts
@@ -8,6 +8,8 @@ export interface SelectedFile {
relativePath?: string
}
+export type SendComposeMode = 'files' | 'text'
+
export type SenderUploadStatus = 'waiting' | 'uploading' | 'completed'
export interface SenderUploadItem extends SelectedFile {
diff --git a/packages/domain/src/send/peerListUi.ts b/packages/domain/src/send/peerListUi.ts
index aeb5492..8ba4c5b 100644
--- a/packages/domain/src/send/peerListUi.ts
+++ b/packages/domain/src/send/peerListUi.ts
@@ -12,6 +12,7 @@ export interface PeerListEntry {
peerKey: string
shortKey: string
status: PeerListStatus
+ isConnected: boolean
detail: PeerListEntryDetail | null
progressPercent?: number
sortKey: number
@@ -31,7 +32,7 @@ export function applyPairState(
): PeerListEntryWithPair[] {
return entries.map((entry) => {
let pairState: PairState | undefined
- if (entry.status !== 'disconnected') {
+ if (entry.isConnected) {
pairState = pairStatus[entry.peerKey] ?? 'pairable'
}
const displayName = pairState === 'paired' ? peerDisplayNames[entry.peerKey] : undefined
@@ -89,6 +90,7 @@ export function getPeerListEntries(
peerKey,
shortKey: peerKey.slice(0, 6),
status: data.status,
+ isConnected,
detail: getStatusDetail(data),
progressPercent: data.progressPercent,
sortKey: data.sortKey || tracked?.connectedAt || 0
diff --git a/packages/domain/src/send/useShareViewModel.ts b/packages/domain/src/send/useShareViewModel.ts
index 0ab4798..cfd6b54 100644
--- a/packages/domain/src/send/useShareViewModel.ts
+++ b/packages/domain/src/send/useShareViewModel.ts
@@ -48,11 +48,17 @@ export interface FileRow {
relativePath?: string
}
+export interface TextRow {
+ path: string
+ content: string
+}
+
export interface ShareViewModel {
phase: 'waiting' | 'connected'
topic: string
files: FileRow[]
+ texts: TextRow[]
totalSize: number
devices: DeviceRow[]
@@ -147,6 +153,8 @@ export function useShareViewModel(
callbacks: ShareViewModelCallbacks = {}
): ShareViewModel {
const selectedFiles = useTransferStore((s) => s.selectedFiles)
+ const fileOffers = useMemo(() => selectedFiles.filter((f) => f.kind !== 'text'), [selectedFiles])
+ const textOffers = useMemo(() => selectedFiles.filter((f) => f.kind === 'text'), [selectedFiles])
const connectionState = useTransferStore((s) => s.connectionState)
const topic = useTransferStore((s) => s.topic) ?? ''
const peerDownloads = useTransferStore((s) => s.peerDownloads)
@@ -199,8 +207,8 @@ export function useShareViewModel(
)
const peerEntries = useMemo(
- () => getPeerListEntries(connectedPeers, peerDownloads, selectedFiles),
- [connectedPeers, peerDownloads, selectedFiles]
+ () => getPeerListEntries(connectedPeers, peerDownloads, fileOffers),
+ [connectedPeers, peerDownloads, fileOffers]
)
const peerEntriesWithPair = useMemo(
() => applyPairState(peerEntries, pairStatus, peerDisplayNames),
@@ -219,7 +227,7 @@ export function useShareViewModel(
)
const connectedRows: ConnectedDeviceRow[] = peerEntriesWithPair.map((entry) => {
- const { subtitle, subtitleTone } = connectedDeviceSubtitle(entry, selectedFiles.length, t)
+ const { subtitle, subtitleTone } = connectedDeviceSubtitle(entry, fileOffers.length, t)
const rememberedForPeer = rememberedPeers.find(
(r: RememberedPeer) =>
r.remoteDevicePubkey === entry.peerKey ||
@@ -234,7 +242,7 @@ export function useShareViewModel(
subtitle,
subtitleTone,
progressPercent: entry.status === 'downloading' ? entry.progressPercent : undefined,
- action: entry.status === 'disconnected' ? 'pair-done' : toPairAction(entry.pairState)
+ action: !entry.isConnected ? 'pair-done' : toPairAction(entry.pairState)
}
})
@@ -300,8 +308,9 @@ export function useShareViewModel(
try {
const sessionTopic = await startSendSession()
const delivered = await inviteDevice(peerKey, sessionTopic, {
- fileCount: selectedFiles.length,
- totalSize: selectedFiles.reduce((sum, file) => sum + (file.size ?? 0), 0)
+ fileCount: fileOffers.length,
+ textCount: textOffers.length,
+ totalSize: fileOffers.reduce((sum, file) => sum + (file.size ?? 0), 0)
})
setInviteStatuses((s) => ({
...s,
@@ -317,13 +326,14 @@ export function useShareViewModel(
return {
phase: connectionState === 'peer-connected' ? 'connected' : 'waiting',
topic,
- files: selectedFiles.map((f) => ({
+ files: fileOffers.map((f) => ({
path: f.path,
name: f.name,
size: f.size,
relativePath: f.relativePath
})),
- totalSize: selectedFiles.reduce((sum, f) => sum + (f.size ?? 0), 0),
+ texts: textOffers.map((f) => ({ path: f.path, content: f.content ?? f.name })),
+ totalSize: fileOffers.reduce((sum, f) => sum + (f.size ?? 0), 0),
devices,
connectedCount: connectedRows.length,
hasDevices: devices.length > 0,
diff --git a/packages/domain/src/transfer/binding.ts b/packages/domain/src/transfer/binding.ts
index 796e77c..f3df64e 100644
--- a/packages/domain/src/transfer/binding.ts
+++ b/packages/domain/src/transfer/binding.ts
@@ -82,6 +82,7 @@ function dispatchRendererEvent(event: RendererTransferEvent): void {
deviceType: event.deviceType,
topic: event.topic,
...(event.fileCount !== undefined ? { fileCount: event.fileCount } : {}),
+ ...(event.textCount !== undefined ? { textCount: event.textCount } : {}),
...(event.totalSize !== undefined ? { totalSize: event.totalSize } : {})
}
})
diff --git a/packages/domain/src/transfer/commands.ts b/packages/domain/src/transfer/commands.ts
index c9c4878..174ed37 100644
--- a/packages/domain/src/transfer/commands.ts
+++ b/packages/domain/src/transfer/commands.ts
@@ -162,7 +162,7 @@ export const requestPair = (transferId: string, peerKey: string): void => {
export const inviteDevice = async (
remoteDevicePubkey: string,
topic: string,
- fileInfo?: { fileCount: number; totalSize: number }
+ fileInfo?: { fileCount: number; textCount: number; totalSize: number }
): Promise<boolean> => {
try {
const { delivered } = await getTransferApi().worker.inviteDevice({
diff --git a/packages/domain/src/transfer/types.ts b/packages/domain/src/transfer/types.ts
index e974071..e96887a 100644
--- a/packages/domain/src/transfer/types.ts
+++ b/packages/domain/src/transfer/types.ts
@@ -37,6 +37,7 @@ export interface IncomingInvite {
deviceType: string
topic: string
fileCount?: number
+ textCount?: number
totalSize?: number
}
diff --git a/packages/domain/src/useCopiedFlag.ts b/packages/domain/src/useCopiedFlag.ts
new file mode 100644
index 0000000..b79193a
--- /dev/null
+++ b/packages/domain/src/useCopiedFlag.ts
@@ -0,0 +1,22 @@
+import { useCallback, useRef, useState } from 'react'
+
+interface CopiedFlag {
+ copiedId: string | null
+ flashCopied: (id: string) => void
+}
+
+export function useCopiedFlag(resetMs = 1500): CopiedFlag {
+ const [copiedId, setCopiedId] = useState<string | null>(null)
+ const timer = useRef<ReturnType<typeof setTimeout> | null>(null)
+
+ const flashCopied = useCallback(
+ (id: string) => {
+ if (timer.current) clearTimeout(timer.current)
+ setCopiedId(id)
+ timer.current = setTimeout(() => setCopiedId((cur) => (cur === id ? null : cur)), resetMs)
+ },
+ [resetMs]
+ )
+
+ return { copiedId, flashCopied }
+}
diff --git a/packages/locales/package.json b/packages/locales/package.json
index 60355c2..3b86f48 100644
--- a/packages/locales/package.json
+++ b/packages/locales/package.json
@@ -1,6 +1,6 @@
{
"name": "@altersend/locales",
- "version": "1.4.0",
+ "version": "1.5.0",
"type": "module",
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
diff --git a/packages/locales/src/locales/de-DE/common.json b/packages/locales/src/locales/de-DE/common.json
index 61c2e2f..830387e 100644
--- a/packages/locales/src/locales/de-DE/common.json
+++ b/packages/locales/src/locales/de-DE/common.json
@@ -27,7 +27,10 @@
"skip": "Überspringen",
"paste": "Einfügen",
"openLink": "Link öffnen",
- "copyText": "Text kopieren"
+ "copyText": "Text kopieren",
+ "add": "Hinzufügen",
+ "showMore": "Mehr anzeigen",
+ "showLess": "Weniger anzeigen"
},
"labels": {
"settings": "Einstellungen",
@@ -53,7 +56,13 @@
"files": "Dateien",
"downloads": "Dateien › Downloads",
"photosAndAlterSend": "Ordner „Fotos + AlterSend“.",
- "alterSendFolder": "Ordner AlterSend"
+ "alterSendFolder": "Ordner AlterSend",
+ "text": "Text",
+ "items_one": "{{count}} Element",
+ "items_other": "{{count}} Elemente",
+ "texts_one": "{{count}} Text",
+ "texts_other": "{{count}} Texte",
+ "filesGeneric": "Dateien"
},
"update": {
"ready": "Update bereit",
@@ -66,10 +75,15 @@
"notNow": "Später"
},
"status": {
- "connected": "Verbunden"
+ "connected": "Verbunden",
+ "wantsToSend": "möchte dir {{label}}{{size}} senden"
},
"confirm": {
"leaveShareSession": "Durch das Verlassen wird Ihre aktive Freigabesitzung beendet. Weitermachen?",
"leaveReceiveSession": "Durch das Verlassen wird Ihre aktive Empfangssitzung beendet. Weitermachen?"
+ },
+ "units": {
+ "chars_one": "{{count}} Zeichen",
+ "chars_other": "{{count}} Zeichen"
}
}
diff --git a/packages/locales/src/locales/de-DE/send.json b/packages/locales/src/locales/de-DE/send.json
index db32960..65633fe 100644
--- a/packages/locales/src/locales/de-DE/send.json
+++ b/packages/locales/src/locales/de-DE/send.json
@@ -27,7 +27,12 @@
"endSession": "Sitzung beenden",
"pickFilesTitle": "Dateien hinzufügen",
"pickPhotos": "Fotos",
- "pickFiles": "Dateien"
+ "pickFiles": "Dateien",
+ "typeSnippet": "Textausschnitt eingeben oder einfügen…",
+ "sendTexts_one": "{{count}} Text senden",
+ "sendTexts_other": "{{count}} Texte senden",
+ "sendItems_one": "{{count}} Element senden",
+ "sendItems_other": "{{count}} Elemente senden"
},
"status": {
"waitingForPeer": "Warten auf Empfänger",
@@ -94,6 +99,7 @@
},
"files": {
"addedFiles": "Hinzugefügte Dateien",
- "removeLabel": "Entfernen Sie {{name}}"
+ "removeLabel": "Entfernen Sie {{name}}",
+ "addedText": "Hinzugefügter Text"
}
}
diff --git a/packages/locales/src/locales/en-GB/common.json b/packages/locales/src/locales/en-GB/common.json
index 9b1aeb6..d0fd515 100644
--- a/packages/locales/src/locales/en-GB/common.json
+++ b/packages/locales/src/locales/en-GB/common.json
@@ -27,7 +27,10 @@
"skip": "Skip",
"paste": "Paste",
"openLink": "Open Link",
- "copyText": "Copy Text"
+ "copyText": "Copy Text",
+ "add": "Add",
+ "showMore": "Show more",
+ "showLess": "Show less"
},
"labels": {
"settings": "Settings",
@@ -53,7 +56,13 @@
"files": "Files",
"downloads": "Files › Downloads",
"photosAndAlterSend": "Photos + AlterSend folder",
- "alterSendFolder": "AlterSend folder"
+ "alterSendFolder": "AlterSend folder",
+ "text": "Text",
+ "items_one": "{{count}} item",
+ "items_other": "{{count}} items",
+ "texts_one": "{{count}} text",
+ "texts_other": "{{count}} texts",
+ "filesGeneric": "files"
},
"update": {
"ready": "Update ready",
@@ -66,10 +75,15 @@
"notNow": "Not now"
},
"status": {
- "connected": "Connected"
+ "connected": "Connected",
+ "wantsToSend": "wants to send you {{label}}{{size}}"
},
"confirm": {
"leaveShareSession": "Leaving will end your active share session. Continue?",
"leaveReceiveSession": "Leaving will end your active receive session. Continue?"
+ },
+ "units": {
+ "chars_one": "{{count}} char",
+ "chars_other": "{{count}} chars"
}
}
diff --git a/packages/locales/src/locales/en-GB/send.json b/packages/locales/src/locales/en-GB/send.json
index d04906e..6c25cce 100644
--- a/packages/locales/src/locales/en-GB/send.json
+++ b/packages/locales/src/locales/en-GB/send.json
@@ -27,7 +27,12 @@
"endSession": "End session",
"pickFilesTitle": "Add files",
"pickPhotos": "Photos",
- "pickFiles": "Files"
+ "pickFiles": "Files",
+ "typeSnippet": "Type or paste a snippet…",
+ "sendTexts_one": "Send {{count}} text",
+ "sendTexts_other": "Send {{count}} texts",
+ "sendItems_one": "Send {{count}} item",
+ "sendItems_other": "Send {{count}} items"
},
"status": {
"waitingForPeer": "Waiting for peer",
@@ -94,6 +99,7 @@
},
"files": {
"addedFiles": "Added files",
- "removeLabel": "Remove {{name}}"
+ "removeLabel": "Remove {{name}}",
+ "addedText": "Added text"
}
}
diff --git a/packages/locales/src/locales/en-US/common.json b/packages/locales/src/locales/en-US/common.json
index 9b1aeb6..d0fd515 100644
--- a/packages/locales/src/locales/en-US/common.json
+++ b/packages/locales/src/locales/en-US/common.json
@@ -27,7 +27,10 @@
"skip": "Skip",
"paste": "Paste",
"openLink": "Open Link",
- "copyText": "Copy Text"
+ "copyText": "Copy Text",
+ "add": "Add",
+ "showMore": "Show more",
+ "showLess": "Show less"
},
"labels": {
"settings": "Settings",
@@ -53,7 +56,13 @@
"files": "Files",
"downloads": "Files › Downloads",
"photosAndAlterSend": "Photos + AlterSend folder",
- "alterSendFolder": "AlterSend folder"
+ "alterSendFolder": "AlterSend folder",
+ "text": "Text",
+ "items_one": "{{count}} item",
+ "items_other": "{{count}} items",
+ "texts_one": "{{count}} text",
+ "texts_other": "{{count}} texts",
+ "filesGeneric": "files"
},
"update": {
"ready": "Update ready",
@@ -66,10 +75,15 @@
"notNow": "Not now"
},
"status": {
- "connected": "Connected"
+ "connected": "Connected",
+ "wantsToSend": "wants to send you {{label}}{{size}}"
},
"confirm": {
"leaveShareSession": "Leaving will end your active share session. Continue?",
"leaveReceiveSession": "Leaving will end your active receive session. Continue?"
+ },
+ "units": {
+ "chars_one": "{{count}} char",
+ "chars_other": "{{count}} chars"
}
}
diff --git a/packages/locales/src/locales/en-US/send.json b/packages/locales/src/locales/en-US/send.json
index d04906e..6c25cce 100644
--- a/packages/locales/src/locales/en-US/send.json
+++ b/packages/locales/src/locales/en-US/send.json
@@ -27,7 +27,12 @@
"endSession": "End session",
"pickFilesTitle": "Add files",
"pickPhotos": "Photos",
- "pickFiles": "Files"
+ "pickFiles": "Files",
+ "typeSnippet": "Type or paste a snippet…",
+ "sendTexts_one": "Send {{count}} text",
+ "sendTexts_other": "Send {{count}} texts",
+ "sendItems_one": "Send {{count}} item",
+ "sendItems_other": "Send {{count}} items"
},
"status": {
"waitingForPeer": "Waiting for peer",
@@ -94,6 +99,7 @@
},
"files": {
"addedFiles": "Added files",
- "removeLabel": "Remove {{name}}"
+ "removeLabel": "Remove {{name}}",
+ "addedText": "Added text"
}
}
diff --git a/packages/locales/src/locales/es-419/common.json b/packages/locales/src/locales/es-419/common.json
index 65c8978..892e198 100644
--- a/packages/locales/src/locales/es-419/common.json
+++ b/packages/locales/src/locales/es-419/common.json
@@ -27,7 +27,10 @@
"skip": "Omitir",
"paste": "Pegar",
"openLink": "Abrir enlace",
- "copyText": "Copiar texto"
+ "copyText": "Copiar texto",
+ "add": "Agregar",
+ "showMore": "Mostrar más",
+ "showLess": "Mostrar menos"
},
"labels": {
"settings": "Configuración",
@@ -53,7 +56,13 @@
"files": "Archivos",
"downloads": "Archivos › Descargas",
"photosAndAlterSend": "Fotos + carpeta AlterSend",
- "alterSendFolder": "Carpeta AlterSend"
+ "alterSendFolder": "Carpeta AlterSend",
+ "text": "Texto",
+ "items_one": "{{count}} elemento",
+ "items_other": "{{count}} elementos",
+ "texts_one": "{{count}} texto",
+ "texts_other": "{{count}} textos",
+ "filesGeneric": "archivos"
},
"update": {
"ready": "Actualización lista",
@@ -66,10 +75,15 @@
"notNow": "Ahora no"
},
"status": {
- "connected": "Conectado"
+ "connected": "Conectado",
+ "wantsToSend": "quiere enviarte {{label}}{{size}}"
},
"confirm": {
"leaveShareSession": "Al salir, finalizará su sesión activa para compartir. ¿Continuar?",
"leaveReceiveSession": "Al salir, finalizará su sesión de recepción activa. ¿Continuar?"
+ },
+ "units": {
+ "chars_one": "{{count}} carácter",
+ "chars_other": "{{count}} caracteres"
}
}
diff --git a/packages/locales/src/locales/es-419/send.json b/packages/locales/src/locales/es-419/send.json
index 859bb4b..7faafe4 100644
--- a/packages/locales/src/locales/es-419/send.json
+++ b/packages/locales/src/locales/es-419/send.json
@@ -27,7 +27,12 @@
"endSession": "Finalizar sesión",
"pickFilesTitle": "Agregar archivos",
"pickPhotos": "Fotos",
- "pickFiles": "Archivos"
+ "pickFiles": "Archivos",
+ "typeSnippet": "Escribe o pega un fragmento…",
+ "sendTexts_one": "Enviar {{count}} texto",
+ "sendTexts_other": "Enviar {{count}} textos",
+ "sendItems_one": "Enviar {{count}} elemento",
+ "sendItems_other": "Enviar {{count}} elementos"
},
"status": {
"waitingForPeer": "Esperando al destinatario",
@@ -94,6 +99,7 @@
},
"files": {
"addedFiles": "Archivos agregados",
- "removeLabel": "Eliminar {{name}}"
+ "removeLabel": "Eliminar {{name}}",
+ "addedText": "Texto agregado"
}
}
diff --git a/packages/locales/src/locales/es-ES/common.json b/packages/locales/src/locales/es-ES/common.json
index c48aaba..b24618a 100644
--- a/packages/locales/src/locales/es-ES/common.json
+++ b/packages/locales/src/locales/es-ES/common.json
@@ -27,7 +27,10 @@
"skip": "Omitir",
"paste": "Pegar",
"openLink": "Abrir enlace",
- "copyText": "Copiar texto"
+ "copyText": "Copiar texto",
+ "add": "Añadir",
+ "showMore": "Mostrar más",
+ "showLess": "Mostrar menos"
},
"labels": {
"settings": "Ajustes",
@@ -53,7 +56,13 @@
"files": "Archivos",
"downloads": "Archivos › Descargas",
"photosAndAlterSend": "Fotos + carpeta AlterSend",
- "alterSendFolder": "Carpeta AlterSend"
+ "alterSendFolder": "Carpeta AlterSend",
+ "text": "Texto",
+ "items_one": "{{count}} elemento",
+ "items_other": "{{count}} elementos",
+ "texts_one": "{{count}} texto",
+ "texts_other": "{{count}} textos",
+ "filesGeneric": "archivos"
},
"update": {
"ready": "Actualización lista",
@@ -66,10 +75,15 @@
"notNow": "Ahora no"
},
"status": {
- "connected": "Conectado"
+ "connected": "Conectado",
+ "wantsToSend": "quiere enviarte {{label}}{{size}}"
},
"confirm": {
"leaveShareSession": "Al salir, finalizará su sesión activa para compartir. ¿Continuar?",
"leaveReceiveSession": "Al salir, finalizará su sesión de recepción activa. ¿Continuar?"
+ },
+ "units": {
+ "chars_one": "{{count}} carácter",
+ "chars_other": "{{count}} caracteres"
}
}
diff --git a/packages/locales/src/locales/es-ES/send.json b/packages/locales/src/locales/es-ES/send.json
index a723bd0..d75d6cb 100644
--- a/packages/locales/src/locales/es-ES/send.json
+++ b/packages/locales/src/locales/es-ES/send.json
@@ -27,7 +27,12 @@
"endSession": "Finalizar sesión",
"pickFilesTitle": "Agregar archivos",
"pickPhotos": "Fotos",
- "pickFiles": "Archivos"
+ "pickFiles": "Archivos",
+ "typeSnippet": "Escribe o pega un fragmento…",
+ "sendTexts_one": "Enviar {{count}} texto",
+ "sendTexts_other": "Enviar {{count}} textos",
+ "sendItems_one": "Enviar {{count}} elemento",
+ "sendItems_other": "Enviar {{count}} elementos"
},
"status": {
"waitingForPeer": "Esperando al destinatario",
@@ -94,6 +99,7 @@
},
"files": {
"addedFiles": "Archivos añadidos",
- "removeLabel": "Eliminar {{name}}"
+ "removeLabel": "Eliminar {{name}}",
+ "addedText": "Texto añadido"
}
}
diff --git a/packages/locales/src/locales/fr-FR/common.json b/packages/locales/src/locales/fr-FR/common.json
index de03846..cf8ae3c 100644
--- a/packages/locales/src/locales/fr-FR/common.json
+++ b/packages/locales/src/locales/fr-FR/common.json
@@ -27,7 +27,10 @@
"skip": "Ignorer",
"paste": "Coller",
"openLink": "Ouvrir le lien",
- "copyText": "Copier le texte"
+ "copyText": "Copier le texte",
+ "add": "Ajouter",
+ "showMore": "Afficher plus",
+ "showLess": "Afficher moins"
},
"labels": {
"settings": "Paramètres",
@@ -53,7 +56,13 @@
"files": "Fichiers",
"downloads": "Fichiers › Téléchargements",
"photosAndAlterSend": "Photos + dossier AlterSend",
- "alterSendFolder": "Dossier AlterSend"
+ "alterSendFolder": "Dossier AlterSend",
+ "text": "Texte",
+ "items_one": "{{count}} élément",
+ "items_other": "{{count}} éléments",
+ "texts_one": "{{count}} texte",
+ "texts_other": "{{count}} textes",
+ "filesGeneric": "des fichiers"
},
"update": {
"ready": "Mise à jour prête",
@@ -66,10 +75,15 @@
"notNow": "Plus tard"
},
"status": {
- "connected": "Connecté"
+ "connected": "Connecté",
+ "wantsToSend": "veut vous envoyer {{label}}{{size}}"
},
"confirm": {
"leaveShareSession": "Quitter mettra fin à votre session de partage active. Continuer?",
"leaveReceiveSession": "Quitter mettra fin à votre session de réception active. Continuer?"
+ },
+ "units": {
+ "chars_one": "{{count}} caractère",
+ "chars_other": "{{count}} caractères"
}
}
diff --git a/packages/locales/src/locales/fr-FR/send.json b/packages/locales/src/locales/fr-FR/send.json
index 2c15ecf..f204773 100644
--- a/packages/locales/src/locales/fr-FR/send.json
+++ b/packages/locales/src/locales/fr-FR/send.json
@@ -27,7 +27,12 @@
"endSession": "Fin de séance",
"pickFilesTitle": "Ajouter des fichiers",
"pickPhotos": "Photothèque",
- "pickFiles": "Fichiers"
+ "pickFiles": "Fichiers",
+ "typeSnippet": "Saisissez ou collez un extrait…",
+ "sendTexts_one": "Envoyer {{count}} texte",
+ "sendTexts_other": "Envoyer {{count}} textes",
+ "sendItems_one": "Envoyer {{count}} élément",
+ "sendItems_other": "Envoyer {{count}} éléments"
},
"status": {
"waitingForPeer": "En attente du destinataire",
@@ -94,6 +99,7 @@
},
"files": {
"addedFiles": "Fichiers ajoutés",
- "removeLabel": "Supprimer {{name}}"
+ "removeLabel": "Supprimer {{name}}",
+ "addedText": "Texte ajouté"
}
}
diff --git a/packages/locales/src/locales/it-IT/common.json b/packages/locales/src/locales/it-IT/common.json
index 10a7c7f..16c35b2 100644
--- a/packages/locales/src/locales/it-IT/common.json
+++ b/packages/locales/src/locales/it-IT/common.json
@@ -27,7 +27,10 @@
"skip": "Salta",
"paste": "Incolla",
"openLink": "Apri link",
- "copyText": "Copia testo"
+ "copyText": "Copia testo",
+ "add": "Aggiungi",
+ "showMore": "Mostra altro",
+ "showLess": "Mostra meno"
},
"labels": {
"settings": "Impostazioni",
@@ -53,7 +56,13 @@
"files": "File",
"downloads": "File › Download",
"photosAndAlterSend": "Foto + cartella AlterSend",
- "alterSendFolder": "Cartella AlterSend"
+ "alterSendFolder": "Cartella AlterSend",
+ "text": "Testo",
+ "items_one": "{{count}} elemento",
+ "items_other": "{{count}} elementi",
+ "texts_one": "{{count}} testo",
+ "texts_other": "{{count}} testi",
+ "filesGeneric": "file"
},
"update": {
"ready": "Aggiornamento pronto",
@@ -66,10 +75,15 @@
"notNow": "Non ora"
},
"status": {
- "connected": "Connesso"
+ "connected": "Connesso",
+ "wantsToSend": "vuole inviarti {{label}}{{size}}"
},
"confirm": {
"leaveShareSession": "L'abbandono terminerà la sessione di condivisione attiva. Continuare?",
"leaveReceiveSession": "L'abbandono terminerà la sessione di ricezione attiva. Continuare?"
+ },
+ "units": {
+ "chars_one": "{{count}} carattere",
+ "chars_other": "{{count}} caratteri"
}
}
diff --git a/packages/locales/src/locales/it-IT/send.json b/packages/locales/src/locales/it-IT/send.json
index 4e4da33..45631e0 100644
--- a/packages/locales/src/locales/it-IT/send.json
+++ b/packages/locales/src/locales/it-IT/send.json
@@ -27,7 +27,12 @@
"endSession": "Fine sessione",
"pickFilesTitle": "Aggiungi file",
"pickPhotos": "Foto",
- "pickFiles": "File"
+ "pickFiles": "File",
+ "typeSnippet": "Digita o incolla uno snippet…",
+ "sendTexts_one": "Invia {{count}} testo",
+ "sendTexts_other": "Invia {{count}} testi",
+ "sendItems_one": "Invia {{count}} elemento",
+ "sendItems_other": "Invia {{count}} elementi"
},
"status": {
"waitingForPeer": "In attesa del destinatario",
@@ -94,6 +99,7 @@
},
"files": {
"addedFiles": "File aggiunti",
- "removeLabel": "Rimuovi {{name}}"
+ "removeLabel": "Rimuovi {{name}}",
+ "addedText": "Testo aggiunto"
}
}
diff --git a/packages/locales/src/locales/ja-JP/common.json b/packages/locales/src/locales/ja-JP/common.json
index 0badaf8..04f03d0 100644
--- a/packages/locales/src/locales/ja-JP/common.json
+++ b/packages/locales/src/locales/ja-JP/common.json
@@ -27,7 +27,10 @@
"skip": "スキップ",
"paste": "貼り付け",
"openLink": "リンクを開く",
- "copyText": "テキストをコピー"
+ "copyText": "テキストをコピー",
+ "add": "追加",
+ "showMore": "もっと見る",
+ "showLess": "折りたたむ"
},
"labels": {
"settings": "設定",
@@ -53,7 +56,13 @@
"files": "ファイル",
"downloads": "ファイル › ダウンロード",
"photosAndAlterSend": "写真 + AlterSend フォルダ",
- "alterSendFolder": "AlterSend フォルダ"
+ "alterSendFolder": "AlterSend フォルダ",
+ "text": "テキスト",
+ "items_one": "{{count}} 個",
+ "items_other": "{{count}} 個",
+ "texts_one": "テキスト {{count}} 件",
+ "texts_other": "テキスト {{count}} 件",
+ "filesGeneric": "ファイル"
},
"update": {
"ready": "更新の準備ができました",
@@ -66,10 +75,15 @@
"notNow": "後で"
},
"status": {
- "connected": "接続済み"
+ "connected": "接続済み",
+ "wantsToSend": "が{{label}}{{size}}を送信しようとしています"
},
"confirm": {
"leaveShareSession": "退出すると、アクティブな共有セッションが終了します。続く?",
"leaveReceiveSession": "終了すると、アクティブな受信セッションが終了します。続く?"
+ },
+ "units": {
+ "chars_one": "{{count}} 文字",
+ "chars_other": "{{count}} 文字"
}
}
diff --git a/packages/locales/src/locales/ja-JP/send.json b/packages/locales/src/locales/ja-JP/send.json
index 26ff492..30039b9 100644
--- a/packages/locales/src/locales/ja-JP/send.json
+++ b/packages/locales/src/locales/ja-JP/send.json
@@ -27,7 +27,12 @@
"endSession": "セッション終了",
"pickFilesTitle": "ファイルを追加",
"pickPhotos": "写真",
- "pickFiles": "ファイル"
+ "pickFiles": "ファイル",
+ "typeSnippet": "スニペットを入力または貼り付け…",
+ "sendTexts_one": "{{count}} 件のテキストを送信",
+ "sendTexts_other": "{{count}} 件のテキストを送信",
+ "sendItems_one": "{{count}} 個のアイテムを送信",
+ "sendItems_other": "{{count}} 個のアイテムを送信"
},
"status": {
"waitingForPeer": "受信者を待機中",
@@ -94,6 +99,7 @@
},
"files": {
"addedFiles": "追加したファイル",
- "removeLabel": "{{name}} を削除"
+ "removeLabel": "{{name}} を削除",
+ "addedText": "追加したテキスト"
}
}
diff --git a/packages/locales/src/locales/ko-KR/common.json b/packages/locales/src/locales/ko-KR/common.json
index db992ea..a300014 100644
--- a/packages/locales/src/locales/ko-KR/common.json
+++ b/packages/locales/src/locales/ko-KR/common.json
@@ -27,7 +27,10 @@
"skip": "건너뛰기",
"paste": "붙여넣기",
"openLink": "링크 열기",
- "copyText": "텍스트 복사"
+ "copyText": "텍스트 복사",
+ "add": "추가",
+ "showMore": "더 보기",
+ "showLess": "접기"
},
"labels": {
"settings": "설정",
@@ -53,7 +56,13 @@
"files": "파일",
"downloads": "파일 › 다운로드",
"photosAndAlterSend": "사진 + AlterSend 폴더",
- "alterSendFolder": "AlterSend 폴더"
+ "alterSendFolder": "AlterSend 폴더",
+ "text": "텍스트",
+ "items_one": "{{count}}개",
+ "items_other": "{{count}}개",
+ "texts_one": "텍스트 {{count}}개",
+ "texts_other": "텍스트 {{count}}개",
+ "filesGeneric": "파일"
},
"update": {
"ready": "업데이트 준비됨",
@@ -66,10 +75,15 @@
"notNow": "나중에"
},
"status": {
- "connected": "연결됨"
+ "connected": "연결됨",
+ "wantsToSend": "님이 {{label}}{{size}}을 보내려고 합니다"
},
"confirm": {
"leaveShareSession": "나가면 활성 공유 세션이 종료됩니다. 계속하다?",
"leaveReceiveSession": "나가면 활성 수신 세션이 종료됩니다. 계속하다?"
+ },
+ "units": {
+ "chars_one": "{{count}}자",
+ "chars_other": "{{count}}자"
}
}
diff --git a/packages/locales/src/locales/ko-KR/send.json b/packages/locales/src/locales/ko-KR/send.json
index 107f420..925281a 100644
--- a/packages/locales/src/locales/ko-KR/send.json
+++ b/packages/locales/src/locales/ko-KR/send.json
@@ -27,7 +27,12 @@
"endSession": "세션 종료",
"pickFilesTitle": "파일 추가",
"pickPhotos": "사진",
- "pickFiles": "파일"
+ "pickFiles": "파일",
+ "typeSnippet": "스니펫을 입력하거나 붙여넣기…",
+ "sendTexts_one": "{{count}}개 텍스트 보내기",
+ "sendTexts_other": "{{count}}개 텍스트 보내기",
+ "sendItems_one": "{{count}}개 항목 보내기",
+ "sendItems_other": "{{count}}개 항목 보내기"
},
"status": {
"waitingForPeer": "수신자를 기다리는 중",
@@ -94,6 +99,7 @@
},
"files": {
"addedFiles": "추가된 파일",
- "removeLabel": "{{name}} 삭제"
+ "removeLabel": "{{name}} 삭제",
+ "addedText": "추가된 텍스트"
}
}
diff --git a/packages/locales/src/locales/pt-BR/common.json b/packages/locales/src/locales/pt-BR/common.json
index fab2822..825a13d 100644
--- a/packages/locales/src/locales/pt-BR/common.json
+++ b/packages/locales/src/locales/pt-BR/common.json
@@ -27,7 +27,10 @@
"skip": "Pular",
"paste": "Colar",
"openLink": "Abrir link",
- "copyText": "Copiar texto"
+ "copyText": "Copiar texto",
+ "add": "Adicionar",
+ "showMore": "Mostrar mais",
+ "showLess": "Mostrar menos"
},
"labels": {
"settings": "Configurações",
@@ -53,7 +56,13 @@
"files": "Arquivos",
"downloads": "Arquivos › Downloads",
"photosAndAlterSend": "Fotos + pasta AlterSend",
- "alterSendFolder": "Pasta AlterSend"
+ "alterSendFolder": "Pasta AlterSend",
+ "text": "Texto",
+ "items_one": "{{count}} item",
+ "items_other": "{{count}} itens",
+ "texts_one": "{{count}} texto",
+ "texts_other": "{{count}} textos",
+ "filesGeneric": "arquivos"
},
"update": {
"ready": "Atualização pronta",
@@ -66,10 +75,15 @@
"notNow": "Agora não"
},
"status": {
- "connected": "Conectado"
+ "connected": "Conectado",
+ "wantsToSend": "quer enviar {{label}}{{size}} para você"
},
"confirm": {
"leaveShareSession": "Sair encerrará sua sessão de compartilhamento ativa. Continuar?",
"leaveReceiveSession": "Sair encerrará sua sessão de recebimento ativa. Continuar?"
+ },
+ "units": {
+ "chars_one": "{{count}} caractere",
+ "chars_other": "{{count}} caracteres"
}
}
diff --git a/packages/locales/src/locales/pt-BR/send.json b/packages/locales/src/locales/pt-BR/send.json
index f0887df..3f0d99e 100644
--- a/packages/locales/src/locales/pt-BR/send.json
+++ b/packages/locales/src/locales/pt-BR/send.json
@@ -27,7 +27,12 @@
"endSession": "Encerrar sessão",
"pickFilesTitle": "Adicionar arquivos",
"pickPhotos": "Fotos",
- "pickFiles": "Arquivos"
+ "pickFiles": "Arquivos",
+ "typeSnippet": "Digite ou cole um trecho…",
+ "sendTexts_one": "Enviar {{count}} texto",
+ "sendTexts_other": "Enviar {{count}} textos",
+ "sendItems_one": "Enviar {{count}} item",
+ "sendItems_other": "Enviar {{count}} itens"
},
"status": {
"waitingForPeer": "Aguardando destinatário",
@@ -94,6 +99,7 @@
},
"files": {
"addedFiles": "Arquivos adicionados",
- "removeLabel": "Remover {{name}}"
+ "removeLabel": "Remover {{name}}",
+ "addedText": "Texto adicionado"
}
}
diff --git a/packages/locales/src/locales/zh-CN/common.json b/packages/locales/src/locales/zh-CN/common.json
index 3bf0e7e..d88b900 100644
--- a/packages/locales/src/locales/zh-CN/common.json
+++ b/packages/locales/src/locales/zh-CN/common.json
@@ -27,7 +27,10 @@
"skip": "跳过",
"paste": "粘贴",
"openLink": "打开链接",
- "copyText": "复制文本"
+ "copyText": "复制文本",
+ "add": "添加",
+ "showMore": "显示更多",
+ "showLess": "收起"
},
"labels": {
"settings": "设置",
@@ -53,7 +56,13 @@
"files": "文件",
"downloads": "文件 › 下载",
"photosAndAlterSend": "照片 + AlterSend 文件夹",
- "alterSendFolder": "AlterSend 文件夹"
+ "alterSendFolder": "AlterSend 文件夹",
+ "text": "文本",
+ "items_one": "{{count}} 项",
+ "items_other": "{{count}} 项",
+ "texts_one": "{{count}} 条文本",
+ "texts_other": "{{count}} 条文本",
+ "filesGeneric": "文件"
},
"update": {
"ready": "更新准备就绪",
@@ -66,10 +75,15 @@
"notNow": "以后再说"
},
"status": {
- "connected": "已连接"
+ "connected": "已连接",
+ "wantsToSend": "想要发送 {{label}}{{size}} 给你"
},
"confirm": {
"leaveShareSession": "离开将结束您的活跃共享会话。继续?",
"leaveReceiveSession": "离开将结束您的活动接收会话。继续?"
+ },
+ "units": {
+ "chars_one": "{{count}} 个字符",
+ "chars_other": "{{count}} 个字符"
}
}
diff --git a/packages/locales/src/locales/zh-CN/send.json b/packages/locales/src/locales/zh-CN/send.json
index d5dc602..c7a8b55 100644
--- a/packages/locales/src/locales/zh-CN/send.json
+++ b/packages/locales/src/locales/zh-CN/send.json
@@ -27,7 +27,12 @@
"endSession": "结束会话",
"pickFilesTitle": "添加文件",
"pickPhotos": "照片",
- "pickFiles": "文件"
+ "pickFiles": "文件",
+ "typeSnippet": "输入或粘贴片段…",
+ "sendTexts_one": "发送 {{count}} 条文本",
+ "sendTexts_other": "发送 {{count}} 条文本",
+ "sendItems_one": "发送 {{count}} 项",
+ "sendItems_other": "发送 {{count}} 项"
},
"status": {
"waitingForPeer": "等待接收方",
@@ -94,6 +99,7 @@
},
"files": {
"addedFiles": "已添加的文件",
- "removeLabel": "删除{{name}}"
+ "removeLabel": "删除{{name}}",
+ "addedText": "已添加文本"
}
}
diff --git a/packages/locales/src/locales/zh-TW/common.json b/packages/locales/src/locales/zh-TW/common.json
index 405e79b..8f282d7 100644
--- a/packages/locales/src/locales/zh-TW/common.json
+++ b/packages/locales/src/locales/zh-TW/common.json
@@ -27,7 +27,10 @@
"skip": "略過",
"paste": "貼上",
"openLink": "開啟連結",
- "copyText": "複製文字"
+ "copyText": "複製文字",
+ "add": "新增",
+ "showMore": "顯示更多",
+ "showLess": "收起"
},
"labels": {
"settings": "設定",
@@ -53,7 +56,13 @@
"files": "檔案",
"downloads": "檔案 › 下載",
"photosAndAlterSend": "照片 + AlterSend 資料夾",
- "alterSendFolder": "AlterSend 資料夾"
+ "alterSendFolder": "AlterSend 資料夾",
+ "text": "文字",
+ "items_one": "{{count}} 項",
+ "items_other": "{{count}} 項",
+ "texts_one": "{{count}} 則文字",
+ "texts_other": "{{count}} 則文字",
+ "filesGeneric": "檔案"
},
"update": {
"ready": "更新準備就緒",
@@ -66,10 +75,15 @@
"notNow": "稍後再說"
},
"status": {
- "connected": "已連線"
+ "connected": "已連線",
+ "wantsToSend": "想要傳送 {{label}}{{size}} 給你"
},
"confirm": {
"leaveShareSession": "離開將結束您的活躍共享會話。繼續?",
"leaveReceiveSession": "離開將結束您的活動接收會話。繼續?"
+ },
+ "units": {
+ "chars_one": "{{count}} 個字元",
+ "chars_other": "{{count}} 個字元"
}
}
diff --git a/packages/locales/src/locales/zh-TW/send.json b/packages/locales/src/locales/zh-TW/send.json
index 619e746..5e9dd50 100644
--- a/packages/locales/src/locales/zh-TW/send.json
+++ b/packages/locales/src/locales/zh-TW/send.json
@@ -27,7 +27,12 @@
"endSession": "結束會話",
"pickFilesTitle": "新增文件",
"pickPhotos": "照片",
- "pickFiles": "文件"
+ "pickFiles": "文件",
+ "typeSnippet": "輸入或貼上片段…",
+ "sendTexts_one": "傳送 {{count}} 則文字",
+ "sendTexts_other": "傳送 {{count}} 則文字",
+ "sendItems_one": "傳送 {{count}} 項",
+ "sendItems_other": "傳送 {{count}} 項"
},
"status": {
"waitingForPeer": "等待接收方",
@@ -94,6 +99,7 @@
},
"files": {
"addedFiles": "已新增的檔案",
- "removeLabel": "删除{{name}}"
+ "removeLabel": "删除{{name}}",
+ "addedText": "已新增文字"
}
}
diff --git a/packages/locales/src/resources.test.ts b/packages/locales/src/resources.test.ts
index cd4aa47..69e50d0 100644
--- a/packages/locales/src/resources.test.ts
+++ b/packages/locales/src/resources.test.ts
@@ -46,6 +46,8 @@ const identicalValueAllowList = new Set([
const identicalKeyAllowList = new Set([
'common.files.count_one',
+ 'common.files.text',
+ 'common.files.items_one',
'common.labels.desktop',
'settings.rows.feedback',
'feedback.title'