mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-11-14 17:15:24 +03:00
71aca2018a
* feat(a11y): label list, toolbar & dashboard actions for screen readers Phase 1 of #5486 (Android TalkBack support). Icon-only controls across the management surfaces previously announced only their untranslated icon name (e.g. "edit", "ellipsis") or nothing at all. - Add aria-label to icon-only row-action and toolbar buttons across inbounds, clients, groups, hosts, nodes and xray (outbounds/routing/dns/balancers) lists, plus the dashboard cards. - Make clickable bare icons and AntD Card actions keyboard-operable via role/tabIndex + Enter/Space (new activateOnKey helper); convert mobile dropdown triggers to buttons so they open from the keyboard. - Fix the sidebar hamburger's mislabeled aria-label (was the dashboard label) and translate previously-hardcoded outbound menu labels. New i18n keys in all 13 locales: sort, menu.openMenu, pages.xray.outbound.moveToTop. * feat(a11y): label modal, QR and copy/download controls for screen readers Phase 2 of #5486. Modal and overlay controls relied on tooltips (not a reliable accessible name) or were bare clickable icons with no keyboard or screen-reader support. - Add aria-label to copy/QR/download/info icon buttons in the inbound and client info modals, sub-links modal, QR panel, backup/log modals, and to the bare search/select inputs of the attach/detach client modals. - Make click-to-copy QR codes and the IP-log refresh/clear, geofile reload and log refresh icons keyboard-operable (role/tabIndex + Enter/Space) with translated labels. - Label the 2FA code input; drop the QrPanel download-image string fallback now that the key exists. New i18n key in all 13 locales: downloadImage. * feat(a11y): label form fields and shared form components for screen readers Phase 3 of #5486. Form controls and shared form widgets were largely unlabelled, and several remove controls were not keyboard-operable. - SettingListItem now ties its title to the control via aria-labelledby, giving accessible names to the ~90 settings-tab inputs at once. - InputAddon gains button semantics (role/tabIndex/Enter+Space) and an ariaLabel prop when used as an interactive remove control. - Sparkline charts expose a role="img" summary of their latest values. - Add aria-label to add/remove/regenerate icon buttons and bare inputs/selects across inbound, client and xray (dns/routing/balancer/ outbound) forms; make clickable remove icons keyboard-operable; mark decorative help/target icons aria-hidden; label the JSON editor, date-time clear button, header-map remove, notification select-all and remark token chips. New i18n keys in all 13 locales: regenerate, jsonEditor, pages.xray.balancer.{costMatch,costValue,costRegexp}. * chore(a11y): add eslint-plugin-jsx-a11y harness and fix flagged interactions Phase 4 of #5486. Adds eslint-plugin-jsx-a11y (recommended ruleset, scoped to .tsx) so screen-reader/keyboard regressions fail lint. - Make the mobile node-card header a proper keyboard disclosure (role=button, aria-expanded, Enter/Space activation that ignores clicks on the nested action buttons) and drop the now-redundant stop-propagation click handlers the linter flagged on card-action wrappers in the node, client and inbound mobile cards. - Disable jsx-a11y/no-autofocus: the autofocus on the login field and modal primary inputs is intentional focus management that helps screen-reader and keyboard users land on the right control. make lint passes with the a11y ruleset enforced. * feat(a11y): cover remaining deferred spots (settings tabs, sockopt, API docs) Completes the panel sweep for #5486 by labelling the spots previously left out of phases 1-4: - NotifyTimeField (Telegram notifications): the mode, interval, unit and custom-cron inputs now carry aria-labels. - The Sockopt toggle in transport options. - Settings category tabs in icons-only (mobile) mode now expose the tab name as the icon's aria-label instead of the raw icon name. - The Swagger API-docs view is wrapped in a labelled region landmark. New i18n keys in all 13 locales: pages.settings.notifyTime.{interval,unit}. * feat(a11y): label shared xray form components and remark field Code review surfaced frontend/src/lib/xray/forms/ — shared form components used by the host and inbound JSON forms — which the initial audit missed. - FinalMaskForm (TCP/UDP final-mask editor): label the icon-only add and regenerate buttons and make all six remove icons keyboard-operable (role/tabIndex/Enter+Space); adds useTranslation to its sub-components. - CustomSockoptList: the remove icon is now keyboard-operable. - SniffingFields: aria-label on the otherwise label-less destOverride select. - RemarkTemplateField: aria-label on the remark-variable picker button. New i18n key in all 13 locales: pages.inbounds.sniffingDestOverride. * feat(a11y): label client info modal and WireGuard config block After rebasing onto the WireGuard client-config feature, re-apply the ClientInfoModal copy/QR/IP-log aria-labels (the modal was restructured upstream, so the original labels did not carry over) and label the new ConfigBlock component's copy/download/QR actions. ConfigBlock's action wrapper keeps its stop-propagation handler (a non-interactive guard for the Collapse header) under a scoped jsx-a11y exception. * fix(frontend): let npm install jsx-a11y under ESLint 10 eslint-plugin-jsx-a11y@6.10.2 declares a peer range that stops at ESLint 9, but the panel is on ESLint 10, so `npm ci` aborts with ERESOLVE even though the plugin runs fine on ESLint 10 with flat config. Add an npm override so jsx-a11y accepts the project's ESLint version. This keeps normal peer resolution (recharts' react-is peer still auto-installs) — no global legacy-peer-deps and no manual react-is pin needed. * fix(a11y): size mobile row triggers and move node expand role to chevron Address automated review on #5652: - add size="small" to the inbound/client/node mobile-card "more" dropdown triggers so they match the adjacent small Switch and the established desktop RowActions pattern. - move the node card-head disclosure semantics (role/tabIndex/aria-expanded/ keyboard) onto the chevron affordance so the expand control is no longer a role="button" wrapping the Switch, info button and dropdown. Mouse click-anywhere-to-expand is preserved on the header div.
194 lines
5.3 KiB
TypeScript
194 lines
5.3 KiB
TypeScript
import { useMemo } from 'react';
|
|
import { useTranslation } from 'react-i18next';
|
|
import { Alert, Button, Modal, Table, Tooltip, Typography, message } from 'antd';
|
|
import type { TableColumnType } from 'antd';
|
|
import { CopyOutlined, DownloadOutlined } from '@ant-design/icons';
|
|
|
|
import type { ClientRecord } from '@/hooks/useClients';
|
|
|
|
interface SubSettings {
|
|
enable: boolean;
|
|
subURI: string;
|
|
subJsonURI: string;
|
|
subJsonEnable: boolean;
|
|
}
|
|
|
|
interface SubLinksModalProps {
|
|
open: boolean;
|
|
emails: string[];
|
|
clients: ClientRecord[];
|
|
subSettings?: SubSettings;
|
|
onOpenChange: (open: boolean) => void;
|
|
}
|
|
|
|
interface Row {
|
|
key: string;
|
|
email: string;
|
|
subId: string;
|
|
link: string;
|
|
jsonLink: string;
|
|
}
|
|
|
|
export default function SubLinksModal({
|
|
open,
|
|
emails,
|
|
clients,
|
|
subSettings,
|
|
onOpenChange,
|
|
}: SubLinksModalProps) {
|
|
const { t } = useTranslation();
|
|
const [messageApi, messageContextHolder] = message.useMessage();
|
|
|
|
const enabled = !!subSettings?.enable && !!subSettings?.subURI;
|
|
const jsonEnabled = !!subSettings?.subJsonEnable && !!subSettings?.subJsonURI;
|
|
|
|
const rows = useMemo<Row[]>(() => {
|
|
if (!enabled) return [];
|
|
const byEmail = new Map(clients.map((c) => [c.email, c]));
|
|
const out: Row[] = [];
|
|
for (const email of emails) {
|
|
const c = byEmail.get(email);
|
|
if (!c?.subId) continue;
|
|
out.push({
|
|
key: email,
|
|
email,
|
|
subId: c.subId,
|
|
link: subSettings!.subURI + c.subId,
|
|
jsonLink: jsonEnabled ? subSettings!.subJsonURI + c.subId : '',
|
|
});
|
|
}
|
|
return out;
|
|
}, [emails, clients, enabled, jsonEnabled, subSettings]);
|
|
|
|
const allText = useMemo(
|
|
() => rows.map((r) => (jsonEnabled ? `${r.email}\t${r.link}\t${r.jsonLink}` : `${r.email}\t${r.link}`)).join('\n'),
|
|
[rows, jsonEnabled],
|
|
);
|
|
|
|
async function copy(text: string, label?: string) {
|
|
try {
|
|
await navigator.clipboard.writeText(text);
|
|
messageApi.success(label || t('copied'));
|
|
} catch {
|
|
messageApi.error(t('somethingWentWrong'));
|
|
}
|
|
}
|
|
|
|
function download() {
|
|
const blob = new Blob([allText], { type: 'text/plain;charset=utf-8' });
|
|
const url = URL.createObjectURL(blob);
|
|
const a = document.createElement('a');
|
|
const stamp = new Date().toISOString().replace(/[:.]/g, '-').slice(0, 19);
|
|
a.href = url;
|
|
a.download = `sub-links-${stamp}.txt`;
|
|
document.body.appendChild(a);
|
|
a.click();
|
|
a.remove();
|
|
URL.revokeObjectURL(url);
|
|
}
|
|
|
|
const columns: TableColumnType<Row>[] = [
|
|
{
|
|
title: t('pages.clients.client'),
|
|
dataIndex: 'email',
|
|
key: 'email',
|
|
width: 180,
|
|
ellipsis: true,
|
|
},
|
|
{
|
|
title: t('pages.clients.subLinkColumn'),
|
|
dataIndex: 'link',
|
|
key: 'link',
|
|
ellipsis: true,
|
|
render: (link: string) => (
|
|
<Tooltip title={link} placement="topLeft">
|
|
<Typography.Text copyable={false} ellipsis>{link}</Typography.Text>
|
|
</Tooltip>
|
|
),
|
|
},
|
|
{
|
|
title: '',
|
|
key: 'actions',
|
|
width: 64,
|
|
render: (_v, row) => (
|
|
<Button size="small" type="text" aria-label={t('copy')} icon={<CopyOutlined />} onClick={() => copy(row.link, t('copied'))} />
|
|
),
|
|
},
|
|
];
|
|
|
|
if (jsonEnabled) {
|
|
columns.splice(2, 0, {
|
|
title: t('pages.clients.subJsonLinkColumn'),
|
|
dataIndex: 'jsonLink',
|
|
key: 'jsonLink',
|
|
ellipsis: true,
|
|
render: (link: string) => (
|
|
<Tooltip title={link} placement="topLeft">
|
|
<Typography.Text copyable={false} ellipsis>{link}</Typography.Text>
|
|
</Tooltip>
|
|
),
|
|
});
|
|
}
|
|
|
|
return (
|
|
<>
|
|
{messageContextHolder}
|
|
<Modal
|
|
open={open}
|
|
title={t('pages.clients.subLinksTitle', { count: rows.length })}
|
|
width={780}
|
|
footer={
|
|
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
|
|
<Button onClick={() => onOpenChange(false)}>{t('close')}</Button>
|
|
<div style={{ display: 'flex', gap: 8 }}>
|
|
<Button
|
|
icon={<CopyOutlined />}
|
|
disabled={rows.length === 0}
|
|
onClick={() => copy(allText, t('pages.clients.subLinksCopiedAll', { count: rows.length }))}
|
|
>
|
|
{t('pages.clients.subLinksCopyAll')}
|
|
</Button>
|
|
<Button
|
|
type="primary"
|
|
icon={<DownloadOutlined />}
|
|
disabled={rows.length === 0}
|
|
onClick={download}
|
|
>
|
|
{t('download')}
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
}
|
|
onCancel={() => onOpenChange(false)}
|
|
>
|
|
{!enabled && (
|
|
<Alert
|
|
type="warning"
|
|
showIcon
|
|
title={t('pages.clients.subLinksDisabled')}
|
|
description={t('pages.clients.subLinksDisabledHint')}
|
|
style={{ marginBottom: 12 }}
|
|
/>
|
|
)}
|
|
{enabled && rows.length === 0 && (
|
|
<Alert
|
|
type="info"
|
|
showIcon
|
|
title={t('pages.clients.subLinksEmpty')}
|
|
style={{ marginBottom: 12 }}
|
|
/>
|
|
)}
|
|
{rows.length > 0 && (
|
|
<Table<Row>
|
|
dataSource={rows}
|
|
columns={columns}
|
|
size="small"
|
|
pagination={false}
|
|
scroll={{ y: 360 }}
|
|
/>
|
|
)}
|
|
</Modal>
|
|
</>
|
|
);
|
|
}
|