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.
196 lines
6.7 KiB
TypeScript
196 lines
6.7 KiB
TypeScript
import { useMemo } from 'react';
|
|
import { useTranslation } from 'react-i18next';
|
|
import { Button, Card, Space, Switch, Table, Tag, Tooltip } from 'antd';
|
|
import type { ColumnsType } from 'antd/es/table';
|
|
import {
|
|
ArrowDownOutlined,
|
|
ArrowUpOutlined,
|
|
DeleteOutlined,
|
|
EditOutlined,
|
|
GlobalOutlined,
|
|
PlusOutlined,
|
|
} from '@ant-design/icons';
|
|
|
|
import type { HostRecord } from '@/api/queries/useHostsQuery';
|
|
import type { InboundOption } from '@/schemas/client';
|
|
import './HostList.css';
|
|
|
|
interface HostListProps {
|
|
hosts: HostRecord[];
|
|
inboundOptions: InboundOption[];
|
|
loading?: boolean;
|
|
isMobile?: boolean;
|
|
selectedIds: number[];
|
|
onSelectionChange: (ids: number[]) => void;
|
|
onAdd: () => void;
|
|
onEdit: (host: HostRecord) => void;
|
|
onDelete: (host: HostRecord) => void;
|
|
onToggleEnable: (host: HostRecord, next: boolean) => void;
|
|
onMove: (host: HostRecord, dir: 'up' | 'down') => void;
|
|
onBulkEnable: (enable: boolean) => void;
|
|
onBulkDelete: () => void;
|
|
}
|
|
|
|
// Sorted by inbound then sort_order then id — the same order the subscription
|
|
// renderer uses, so the list mirrors the emitted link order.
|
|
function sortHosts(hosts: HostRecord[]): HostRecord[] {
|
|
return [...hosts].sort((a, b) => {
|
|
if (a.inboundId !== b.inboundId) return a.inboundId - b.inboundId;
|
|
const sa = a.sortOrder ?? 0;
|
|
const sb = b.sortOrder ?? 0;
|
|
if (sa !== sb) return sa - sb;
|
|
return a.id - b.id;
|
|
});
|
|
}
|
|
|
|
export default function HostList(props: HostListProps) {
|
|
const { t } = useTranslation();
|
|
const {
|
|
hosts, inboundOptions, loading, isMobile, selectedIds, onSelectionChange,
|
|
onAdd, onEdit, onDelete, onToggleEnable, onMove, onBulkEnable, onBulkDelete,
|
|
} = props;
|
|
|
|
const inboundLabel = useMemo(() => {
|
|
const map = new Map<number, string>();
|
|
for (const ib of inboundOptions) map.set(ib.id, ib.remark || ib.tag || `#${ib.id}`);
|
|
return map;
|
|
}, [inboundOptions]);
|
|
|
|
const sorted = useMemo(() => sortHosts(hosts), [hosts]);
|
|
|
|
// Move is bounded to neighbours within the same inbound (sort_order is per-inbound).
|
|
const movable = useMemo(() => {
|
|
const byInbound = new Map<number, number>();
|
|
const idxInGroup = new Map<number, number>();
|
|
const counters = new Map<number, number>();
|
|
for (const h of sorted) byInbound.set(h.inboundId, (byInbound.get(h.inboundId) ?? 0) + 1);
|
|
for (const h of sorted) {
|
|
const c = counters.get(h.inboundId) ?? 0;
|
|
idxInGroup.set(h.id, c);
|
|
counters.set(h.inboundId, c + 1);
|
|
}
|
|
return { byInbound, idxInGroup };
|
|
}, [sorted]);
|
|
|
|
// Column order requested: Actions, Enable, then the rest.
|
|
const columns: ColumnsType<HostRecord> = [
|
|
{
|
|
title: t('pages.hosts.fields.actions'),
|
|
key: 'actions',
|
|
width: 168,
|
|
render: (_, h) => {
|
|
const idx = movable.idxInGroup.get(h.id) ?? 0;
|
|
const count = movable.byInbound.get(h.inboundId) ?? 1;
|
|
return (
|
|
<Space size={2}>
|
|
<Tooltip title={t('pages.hosts.moveUp')}>
|
|
<Button size="small" type="text" icon={<ArrowUpOutlined />} aria-label={t('pages.hosts.moveUp')} disabled={idx === 0} onClick={() => onMove(h, 'up')} />
|
|
</Tooltip>
|
|
<Tooltip title={t('pages.hosts.moveDown')}>
|
|
<Button size="small" type="text" icon={<ArrowDownOutlined />} aria-label={t('pages.hosts.moveDown')} disabled={idx >= count - 1} onClick={() => onMove(h, 'down')} />
|
|
</Tooltip>
|
|
<Tooltip title={t('edit')}>
|
|
<Button size="small" type="text" icon={<EditOutlined />} aria-label={t('edit')} onClick={() => onEdit(h)} />
|
|
</Tooltip>
|
|
<Tooltip title={t('delete')}>
|
|
<Button size="small" type="text" danger icon={<DeleteOutlined />} aria-label={t('delete')} onClick={() => onDelete(h)} />
|
|
</Tooltip>
|
|
</Space>
|
|
);
|
|
},
|
|
},
|
|
{
|
|
title: t('pages.hosts.fields.enable'),
|
|
key: 'enable',
|
|
width: 90,
|
|
render: (_, h) => (
|
|
<Switch size="small" checked={!h.isDisabled} onChange={(next) => onToggleEnable(h, next)} />
|
|
),
|
|
},
|
|
{
|
|
title: t('pages.hosts.fields.remark'),
|
|
dataIndex: 'remark',
|
|
key: 'remark',
|
|
render: (_, h) => (
|
|
<div className="host-remark-cell">
|
|
<span className="host-remark">{h.remark}</span>
|
|
{h.serverDescription ? <span className="host-desc">{h.serverDescription}</span> : null}
|
|
</div>
|
|
),
|
|
},
|
|
{
|
|
title: t('pages.hosts.fields.endpoint'),
|
|
key: 'endpoint',
|
|
render: (_, h) => <span className="host-endpoint">{`${h.address || '—'}${h.port ? `:${h.port}` : ''}`}</span>,
|
|
},
|
|
{
|
|
title: t('pages.hosts.fields.inbound'),
|
|
key: 'inbound',
|
|
render: (_, h) => inboundLabel.get(h.inboundId) ?? `#${h.inboundId}`,
|
|
},
|
|
{
|
|
title: t('pages.hosts.fields.security'),
|
|
dataIndex: 'security',
|
|
key: 'security',
|
|
render: (security: string) => <Tag>{security || 'same'}</Tag>,
|
|
},
|
|
{
|
|
title: t('pages.hosts.fields.tags'),
|
|
key: 'tags',
|
|
render: (_, h) => (h.tags && h.tags.length > 0
|
|
? <Space size={[0, 4]} wrap>{h.tags.map((tag) => <Tag key={tag} color="blue">{tag}</Tag>)}</Space>
|
|
: <span className="host-muted">—</span>),
|
|
},
|
|
];
|
|
|
|
const toolbar = (
|
|
<div className="card-toolbar">
|
|
{selectedIds.length === 0 ? (
|
|
<Button type="primary" icon={<PlusOutlined />} onClick={onAdd}>
|
|
{!isMobile && t('pages.hosts.addHost')}
|
|
</Button>
|
|
) : (
|
|
<>
|
|
<Tag
|
|
color="blue"
|
|
closable
|
|
onClose={() => onSelectionChange([])}
|
|
style={{ marginInlineEnd: 0, padding: '4px 8px', fontSize: 13 }}
|
|
>
|
|
{t('pages.hosts.selectedCount', { count: selectedIds.length })}
|
|
</Tag>
|
|
<Button onClick={() => onBulkEnable(true)}>{t('pages.hosts.bulkEnable')}</Button>
|
|
<Button onClick={() => onBulkEnable(false)}>{t('pages.hosts.bulkDisable')}</Button>
|
|
<Button danger icon={<DeleteOutlined />} onClick={onBulkDelete}>{t('pages.hosts.bulkDelete')}</Button>
|
|
</>
|
|
)}
|
|
</div>
|
|
);
|
|
|
|
return (
|
|
<Card size="small" hoverable title={toolbar} className="hosts-card">
|
|
<Table<HostRecord>
|
|
rowKey="id"
|
|
size="small"
|
|
loading={loading}
|
|
columns={columns}
|
|
dataSource={sorted}
|
|
pagination={false}
|
|
scroll={{ x: 'max-content' }}
|
|
rowSelection={{
|
|
selectedRowKeys: selectedIds,
|
|
onChange: (keys) => onSelectionChange(keys as number[]),
|
|
}}
|
|
locale={{
|
|
emptyText: (
|
|
<div className="card-empty">
|
|
<GlobalOutlined style={{ fontSize: 32, marginBottom: 8 }} />
|
|
<div>{t('noData')}</div>
|
|
</div>
|
|
),
|
|
}}
|
|
/>
|
|
</Card>
|
|
);
|
|
}
|