mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-11-11 23:55:01 +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.
156 lines
5.3 KiB
TypeScript
156 lines
5.3 KiB
TypeScript
import { useMemo, useState } from 'react';
|
|
import { useTranslation } from 'react-i18next';
|
|
import { Alert, Button, Col, Input, InputNumber, Row, Select, Space, Tag } from 'antd';
|
|
import { AimOutlined } from '@ant-design/icons';
|
|
|
|
import { HttpUtil } from '@/utils';
|
|
import { useInboundOptions } from '@/api/queries/useInboundOptions';
|
|
import { buildRemarkByTag, formatInboundTag } from './helpers';
|
|
|
|
interface RouteTesterProps {
|
|
inboundTags: string[];
|
|
isMobile: boolean;
|
|
}
|
|
|
|
// Mirror of the /xray/routeTest response (RoutingService.TestRoute).
|
|
interface RouteTestResult {
|
|
matched: boolean;
|
|
outboundTag: string;
|
|
groupTags?: string[];
|
|
}
|
|
|
|
const PROTOCOL_OPTIONS = ['http', 'tls', 'quic', 'bittorrent'].map((p) => ({ label: p, value: p }));
|
|
|
|
export default function RouteTester({ inboundTags, isMobile }: RouteTesterProps) {
|
|
const { t } = useTranslation();
|
|
const { data: inboundOptions } = useInboundOptions();
|
|
const remarkByTag = useMemo(() => buildRemarkByTag(inboundOptions || []), [inboundOptions]);
|
|
const [dest, setDest] = useState('');
|
|
const [port, setPort] = useState<number | null>(443);
|
|
const [network, setNetwork] = useState('tcp');
|
|
const [inboundTag, setInboundTag] = useState<string | undefined>(undefined);
|
|
const [protocol, setProtocol] = useState<string | undefined>(undefined);
|
|
const [testing, setTesting] = useState(false);
|
|
const [result, setResult] = useState<RouteTestResult | null>(null);
|
|
|
|
async function run() {
|
|
const value = dest.trim();
|
|
if (!value) return;
|
|
// Domains never contain ':' and a pure dotted-quad is an IPv4 address;
|
|
// everything else is treated as a domain.
|
|
const isIp = /^(\d{1,3}\.){3}\d{1,3}$/.test(value) || value.includes(':');
|
|
setTesting(true);
|
|
setResult(null);
|
|
try {
|
|
const msg = await HttpUtil.post('/panel/api/xray/routeTest', {
|
|
domain: isIp ? '' : value,
|
|
ip: isIp ? value : '',
|
|
port: port ?? 0,
|
|
network,
|
|
inboundTag: inboundTag || '',
|
|
protocol: protocol || '',
|
|
});
|
|
if (msg?.success && msg.obj && typeof msg.obj === 'object') {
|
|
setResult(msg.obj as RouteTestResult);
|
|
}
|
|
} finally {
|
|
setTesting(false);
|
|
}
|
|
}
|
|
|
|
const fieldSpan = isMobile ? 24 : undefined;
|
|
|
|
return (
|
|
<Space orientation="vertical" size="middle" style={{ width: '100%' }}>
|
|
<Alert type="info" showIcon title={t('pages.xray.routeTesterDesc')} />
|
|
<Row gutter={[8, 8]} align="bottom">
|
|
<Col xs={fieldSpan} sm={7}>
|
|
<Input
|
|
aria-label={t('pages.xray.routeTesterDest')}
|
|
placeholder={t('pages.xray.routeTesterDest')}
|
|
value={dest}
|
|
onChange={(e) => setDest(e.target.value)}
|
|
onPressEnter={run}
|
|
allowClear
|
|
/>
|
|
</Col>
|
|
<Col xs={12} sm={3}>
|
|
<InputNumber
|
|
aria-label={t('pages.xray.routeTesterPort')}
|
|
style={{ width: '100%' }}
|
|
min={0}
|
|
max={65535}
|
|
placeholder={t('pages.xray.routeTesterPort')}
|
|
value={port}
|
|
onChange={(v) => setPort(v)}
|
|
/>
|
|
</Col>
|
|
<Col xs={12} sm={3}>
|
|
<Select
|
|
aria-label={t('pages.inbounds.network')}
|
|
style={{ width: '100%' }}
|
|
value={network}
|
|
onChange={setNetwork}
|
|
options={[
|
|
{ label: 'TCP', value: 'tcp' },
|
|
{ label: 'UDP', value: 'udp' },
|
|
]}
|
|
/>
|
|
</Col>
|
|
<Col xs={12} sm={4}>
|
|
<Select
|
|
aria-label={t('pages.xray.routeTesterInbound')}
|
|
style={{ width: '100%' }}
|
|
placeholder={t('pages.xray.routeTesterInbound')}
|
|
allowClear
|
|
value={inboundTag}
|
|
onChange={setInboundTag}
|
|
options={inboundTags.filter(Boolean).map((tag) => ({ label: formatInboundTag(tag, remarkByTag), value: tag }))}
|
|
/>
|
|
</Col>
|
|
<Col xs={12} sm={4}>
|
|
<Select
|
|
aria-label={t('pages.xray.routeTesterProtocol')}
|
|
style={{ width: '100%' }}
|
|
placeholder={t('pages.xray.routeTesterProtocol')}
|
|
allowClear
|
|
value={protocol}
|
|
onChange={setProtocol}
|
|
options={PROTOCOL_OPTIONS}
|
|
/>
|
|
</Col>
|
|
<Col xs={fieldSpan} sm={3}>
|
|
<Button type="primary" icon={<AimOutlined />} loading={testing} disabled={!dest.trim()} onClick={run} block>
|
|
{t('pages.xray.routeTesterTest')}
|
|
</Button>
|
|
</Col>
|
|
</Row>
|
|
|
|
{result && (
|
|
result.matched ? (
|
|
<Alert
|
|
type="success"
|
|
showIcon
|
|
title={
|
|
<Space wrap>
|
|
<span>{t('pages.xray.routeTesterMatchedOutbound')}:</span>
|
|
<Tag color="blue">{result.outboundTag || '—'}</Tag>
|
|
{(result.groupTags || []).length > 0 && (
|
|
<>
|
|
<span>{t('pages.xray.routeTesterViaBalancer')}:</span>
|
|
{(result.groupTags || []).map((tag) => (
|
|
<Tag key={tag} color="orange">{tag}</Tag>
|
|
))}
|
|
</>
|
|
)}
|
|
</Space>
|
|
}
|
|
/>
|
|
) : (
|
|
<Alert type="warning" showIcon title={t('pages.xray.routeTesterDefaultOutbound')} />
|
|
)
|
|
)}
|
|
</Space>
|
|
);
|
|
}
|