fix(frontend): make the panel usable with screen readers (#6907)

* fix(frontend): make the panel usable with screen readers

* fix(frontend): keep mobile tab names and the inbound expiry hint

Review of #6907 found two gaps in the screen-reader pass:

- On phone-width screens catTabLabel renders only the icon and names the
  tab by putting aria-label on it, but callers now pass that icon with
  aria-hidden for the desktop label, so every Settings, Xray and Host
  category tab lost its name under TalkBack. catTabLabel now clears
  aria-hidden on the icon it uses as the name.
- DateTimePicker forwarded id and aria-label but not aria-describedby,
  so the inbound expiry hint ("leave blank to never expire") was never
  attached. It now forwards it on both the Gregorian and Jalali input.
This commit is contained in:
Alireza Ahmadi
2026-10-23 18:29:47 +02:00
committed by GitHub
parent 775b2b0b26
commit e2184777a0
156 changed files with 2373 additions and 863 deletions
+87 -25
View File
@@ -1,4 +1,4 @@
import { useEffect, useMemo, useState } from 'react';
import { useEffect, useId, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
import {
AutoComplete,
@@ -256,6 +256,7 @@ export default function ClientFormModal({
onOpenChange,
}: ClientFormModalProps) {
const { t } = useTranslation();
const uid = useId();
const [messageApi, messageContextHolder] = message.useMessage();
const isEdit = mode === 'edit';
@@ -820,7 +821,7 @@ export default function ClientFormModal({
<Button
color="danger"
variant="filled"
icon={<RetweetOutlined />}
icon={<RetweetOutlined aria-hidden />}
loading={resetting}
>
{t('pages.inbounds.resetTraffic')}
@@ -848,9 +849,14 @@ export default function ClientFormModal({
<>
<Row gutter={16}>
<Col xs={24} md={12}>
<Form.Item label={t('pages.clients.email')} required>
<Form.Item
label={t('pages.clients.email')}
required
htmlFor={`${uid}-email`}
>
<Space.Compact style={{ display: 'flex' }}>
<Input
id={`${uid}-email`}
value={email}
placeholder={t('pages.clients.email')}
style={{ flex: 1 }}
@@ -859,7 +865,7 @@ export default function ClientFormModal({
{!isEdit && (
<Button
aria-label={t('regenerate')}
icon={<ReloadOutlined />}
icon={<ReloadOutlined aria-hidden />}
onClick={() =>
methods.setValue('email', RandomUtil.randomLowerAndNum(12))
}
@@ -880,6 +886,7 @@ export default function ClientFormModal({
</Col>
<Col xs={24} md={12}>
<Form.Item
htmlFor={`${uid}-limit-ip`}
label={t('pages.clients.limitIp')}
tooltip={t('pages.clients.limitIpDesc')}
>
@@ -887,6 +894,8 @@ export default function ClientFormModal({
<span style={{ display: 'flex', width: '100%' }}>
<Space.Compact style={{ display: 'flex', flex: 1 }}>
<InputNumber
id={`${uid}-limit-ip`}
aria-describedby={`${uid}-limit-ip-hint`}
value={limitIp}
min={0}
disabled={limitIpDisabled}
@@ -900,7 +909,7 @@ export default function ClientFormModal({
<Tooltip title={t('pages.clients.ipLog')}>
<Button
aria-label={t('pages.clients.ipLog')}
icon={<EyeOutlined />}
icon={<EyeOutlined aria-hidden />}
loading={ipsLoading}
onClick={openIpsModal}
>
@@ -911,15 +920,21 @@ export default function ClientFormModal({
</Space.Compact>
</span>
</Tooltip>
<span id={`${uid}-limit-ip-hint`} hidden>
{t('pages.clients.limitIpDesc')}
</span>
</Form.Item>
</Col>
<Col xs={24} md={12}>
<Form.Item
htmlFor={`${uid}-limit-hwid`}
label={t('pages.clients.limitHwid')}
tooltip={t('pages.clients.limitHwidDesc')}
>
<Space.Compact style={{ display: 'flex' }}>
<InputNumber
id={`${uid}-limit-hwid`}
aria-describedby={`${uid}-limit-hwid-hint`}
value={limitHwid}
min={0}
style={{ flex: 1 }}
@@ -929,7 +944,7 @@ export default function ClientFormModal({
<Tooltip title={t('pages.clients.hwidLog')}>
<Button
aria-label={t('pages.clients.hwidLog')}
icon={<EyeOutlined />}
icon={<EyeOutlined aria-hidden />}
loading={hwidsLoading}
onClick={openHwidsModal}
>
@@ -938,6 +953,9 @@ export default function ClientFormModal({
</Tooltip>
)}
</Space.Compact>
<span id={`${uid}-limit-hwid-hint`} hidden>
{t('pages.clients.limitHwidDesc')}
</span>
</Form.Item>
</Col>
</Row>
@@ -953,8 +971,12 @@ export default function ClientFormModal({
<InputNumber min={0} style={{ width: '100%' }} />
</FormField>
) : (
<Form.Item label={t('pages.clients.expiryTime')}>
<Form.Item
label={t('pages.clients.expiryTime')}
htmlFor={`${uid}-expiry`}
>
<DateTimePicker
id={`${uid}-expiry`}
value={expiryDayjs}
onChange={(d) =>
methods.setValue('expiryDate', d ? d.valueOf() : 0)
@@ -964,8 +986,12 @@ export default function ClientFormModal({
)}
</Col>
<Col xs={12} md={6}>
<Form.Item label={t('pages.clients.delayedStart')}>
<Form.Item
label={t('pages.clients.delayedStart')}
htmlFor={`${uid}-delayed-start`}
>
<Switch
id={`${uid}-delayed-start`}
checked={delayedStart}
onChange={(v) => {
methods.setValue('delayedStart', v);
@@ -1062,13 +1088,18 @@ export default function ClientFormModal({
</Row>
)}
<Form.Item label={t('pages.clients.attachedInbounds')} required={!isEdit}>
<Form.Item
label={t('pages.clients.attachedInbounds')}
required={!isEdit}
htmlFor={`${uid}-inbounds`}
>
<SelectAllClearButtons
options={inboundOptions}
value={inboundIds}
onChange={(v) => methods.setValue('inboundIds', v)}
/>
<Select
id={`${uid}-inbounds`}
mode="multiple"
value={inboundIds}
onChange={(v) => methods.setValue('inboundIds', v)}
@@ -1102,77 +1133,96 @@ export default function ClientFormModal({
label: t('pages.clients.tabCredentials'),
children: (
<>
<Form.Item label={t('pages.clients.uuid')}>
<Form.Item label={t('pages.clients.uuid')} htmlFor={`${uid}-uuid`}>
<Space.Compact style={{ display: 'flex' }}>
<Input
id={`${uid}-uuid`}
value={uuid}
style={{ flex: 1 }}
onChange={(e) => methods.setValue('uuid', e.target.value)}
/>
<Button
aria-label={t('regenerate')}
icon={<ReloadOutlined />}
icon={<ReloadOutlined aria-hidden />}
onClick={() => methods.setValue('uuid', RandomUtil.randomUUID())}
/>
</Space.Compact>
</Form.Item>
<Form.Item
htmlFor={`${uid}-password`}
label={t('pages.clients.password')}
tooltip={t('pages.clients.passwordDesc')}
>
<Space.Compact style={{ display: 'flex' }}>
<Input
id={`${uid}-password`}
aria-describedby={`${uid}-password-hint`}
value={password}
style={{ flex: 1 }}
onChange={(e) => methods.setValue('password', e.target.value)}
/>
<Button
aria-label={t('regenerate')}
icon={<ReloadOutlined />}
icon={<ReloadOutlined aria-hidden />}
onClick={regeneratePassword}
/>
</Space.Compact>
<span id={`${uid}-password-hint`} hidden>
{t('pages.clients.passwordDesc')}
</span>
</Form.Item>
<Form.Item
htmlFor={`${uid}-sub-id`}
label={t('pages.clients.subId')}
tooltip={t('pages.clients.subIdDesc')}
>
<Space.Compact style={{ display: 'flex' }}>
<Input
id={`${uid}-sub-id`}
aria-describedby={`${uid}-sub-id-hint`}
value={subId}
style={{ flex: 1 }}
onChange={(e) => methods.setValue('subId', e.target.value)}
/>
<Button
aria-label={t('regenerate')}
icon={<ReloadOutlined />}
icon={<ReloadOutlined aria-hidden />}
onClick={() =>
methods.setValue('subId', RandomUtil.randomLowerAndNum(16))
}
/>
</Space.Compact>
<span id={`${uid}-sub-id-hint`} hidden>
{t('pages.clients.subIdDesc')}
</span>
</Form.Item>
<Form.Item
htmlFor={`${uid}-auth`}
label={t('pages.clients.hysteriaAuth')}
tooltip={t('pages.clients.hysteriaAuthDesc')}
>
<Space.Compact style={{ display: 'flex' }}>
<Input
id={`${uid}-auth`}
aria-describedby={`${uid}-auth-hint`}
value={auth}
style={{ flex: 1 }}
onChange={(e) => methods.setValue('auth', e.target.value)}
/>
<Button
aria-label={t('regenerate')}
icon={<ReloadOutlined />}
icon={<ReloadOutlined aria-hidden />}
onClick={() =>
methods.setValue('auth', RandomUtil.randomLowerAndNum(16))
}
/>
</Space.Compact>
<span id={`${uid}-auth-hint`} hidden>
{t('pages.clients.hysteriaAuthDesc')}
</span>
</Form.Item>
{showFlow && (
@@ -1195,6 +1245,7 @@ export default function ClientFormModal({
{(showWireguard || showAmneziawg) && (
<>
<Form.Item
htmlFor={`${uid}-wg-private-key`}
label={t(
showAmneziawg
? 'pages.clients.amneziaWgPrivateKey'
@@ -1203,6 +1254,7 @@ export default function ClientFormModal({
>
<Space.Compact style={{ display: 'flex' }}>
<Input
id={`${uid}-wg-private-key`}
value={wgPrivateKey}
style={{ flex: 1 }}
onChange={(e) => {
@@ -1216,7 +1268,7 @@ export default function ClientFormModal({
/>
<Button
aria-label={t('regenerate')}
icon={<ReloadOutlined />}
icon={<ReloadOutlined aria-hidden />}
onClick={regenerateWireguardKeys}
/>
</Space.Compact>
@@ -1232,6 +1284,7 @@ export default function ClientFormModal({
<Input disabled />
</FormField>
<Form.Item
htmlFor={`${uid}-wg-psk`}
label={t(
showAmneziawg
? 'pages.clients.amneziaWgPreSharedKey'
@@ -1240,11 +1293,11 @@ export default function ClientFormModal({
>
<Space.Compact style={{ display: 'flex' }}>
<FormField name="wgPreSharedKey" noStyle>
<Input style={{ flex: 1 }} />
<Input id={`${uid}-wg-psk`} style={{ flex: 1 }} />
</FormField>
<Button
aria-label={t('regenerate')}
icon={<ReloadOutlined />}
icon={<ReloadOutlined aria-hidden />}
onClick={regenerateWireguardPresharedKey}
/>
</Space.Compact>
@@ -1305,18 +1358,20 @@ export default function ClientFormModal({
{showMtproto && (
<>
<Form.Item
htmlFor={`${uid}-mtproto-secret`}
label={t('pages.clients.mtprotoSecret')}
extra={t('pages.clients.mtprotoSecretHint')}
>
<Space.Compact style={{ display: 'flex' }}>
<Input
id={`${uid}-mtproto-secret`}
value={secret}
style={{ flex: 1 }}
onChange={(e) => methods.setValue('secret', e.target.value)}
/>
<Button
aria-label={t('regenerate')}
icon={<ReloadOutlined />}
icon={<ReloadOutlined aria-hidden />}
onClick={regenerateMtprotoSecret}
/>
</Space.Compact>
@@ -1344,7 +1399,7 @@ export default function ClientFormModal({
<Button
type="primary"
icon={<PlusOutlined />}
icon={<PlusOutlined aria-hidden />}
onClick={() => addExternalLinkRow('link')}
>
{t('pages.clients.addExternalLink')}
@@ -1364,7 +1419,7 @@ export default function ClientFormModal({
valueProp="checked"
noStyle
>
<Switch size="small" />
<Switch size="small" aria-label={t('enable')} />
</FormField>
<span>{t('enable')}</span>
</div>
@@ -1378,7 +1433,7 @@ export default function ClientFormModal({
<Button
aria-label={t('delete')}
danger
icon={<DeleteOutlined />}
icon={<DeleteOutlined aria-hidden />}
onClick={() => removeExternalLink(index)}
/>
</Tooltip>
@@ -1398,6 +1453,7 @@ export default function ClientFormModal({
const hasSpecificExpiry = Number(expiryField.value) > 0;
return (
<DateTimePicker
aria-label={t('pages.clients.expiryTime')}
value={displayedExpiry > 0 ? dayjs(displayedExpiry) : null}
onChange={(v) => expiryField.onChange(v ? v.valueOf() : 0)}
placeholder={t('pages.inbounds.leaveBlankToNeverExpire')}
@@ -1415,7 +1471,7 @@ export default function ClientFormModal({
<Button
type="primary"
icon={<PlusOutlined />}
icon={<PlusOutlined aria-hidden />}
onClick={() => addExternalLinkRow('subscription')}
>
{t('pages.clients.addExternalSubscription')}
@@ -1435,7 +1491,7 @@ export default function ClientFormModal({
valueProp="checked"
noStyle
>
<Switch size="small" />
<Switch size="small" aria-label={t('enable')} />
</FormField>
<span>{t('enable')}</span>
</div>
@@ -1449,7 +1505,7 @@ export default function ClientFormModal({
<Button
aria-label={t('delete')}
danger
icon={<DeleteOutlined />}
icon={<DeleteOutlined aria-hidden />}
onClick={() => removeExternalLink(index)}
/>
</Tooltip>
@@ -1475,6 +1531,7 @@ export default function ClientFormModal({
const hasSpecificExpiry = Number(expiryField.value) > 0;
return (
<DateTimePicker
aria-label={t('pages.clients.expiryTime')}
value={displayedExpiry > 0 ? dayjs(displayedExpiry) : null}
onChange={(v) => expiryField.onChange(v ? v.valueOf() : 0)}
placeholder={t('pages.inbounds.leaveBlankToNeverExpire')}
@@ -1515,7 +1572,12 @@ export default function ClientFormModal({
zIndex={CLIENT_IP_LOG_MODAL_Z_INDEX}
onCancel={() => setIpsModalOpen(false)}
footer={[
<Button key="refresh" icon={<ReloadOutlined />} loading={ipsLoading} onClick={loadIps}>
<Button
key="refresh"
icon={<ReloadOutlined aria-hidden />}
loading={ipsLoading}
onClick={loadIps}
>
{t('refresh')}
</Button>,
<Button