mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-07-24 13:36:24 +00: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.
124 lines
3.9 KiB
TypeScript
124 lines
3.9 KiB
TypeScript
import { useMemo } from 'react';
|
|
import { useTranslation } from 'react-i18next';
|
|
import { Badge, Card, Col, Popover, Row, Space, Tag } from 'antd';
|
|
import {
|
|
BarsOutlined,
|
|
PoweroffOutlined,
|
|
ReloadOutlined,
|
|
ToolOutlined,
|
|
} from '@ant-design/icons';
|
|
|
|
import type { Status } from '@/models/status';
|
|
import { activateOnKey } from '@/utils/a11y';
|
|
import './XrayStatusCard.css';
|
|
|
|
interface XrayStatusCardProps {
|
|
status: Status;
|
|
isMobile: boolean;
|
|
accessLogEnable: boolean;
|
|
onStopXray: () => void;
|
|
onRestartXray: () => void;
|
|
onOpenLogs: () => void;
|
|
onOpenXrayLogs: () => void;
|
|
onOpenVersionSwitch: () => void;
|
|
}
|
|
|
|
const XRAY_STATE_KEYS: Record<string, string> = {
|
|
running: 'pages.index.xrayStatusRunning',
|
|
stop: 'pages.index.xrayStatusStop',
|
|
error: 'pages.index.xrayStatusError',
|
|
};
|
|
|
|
export default function XrayStatusCard({
|
|
status,
|
|
isMobile,
|
|
accessLogEnable,
|
|
onStopXray,
|
|
onRestartXray,
|
|
onOpenLogs,
|
|
onOpenXrayLogs,
|
|
onOpenVersionSwitch,
|
|
}: XrayStatusCardProps) {
|
|
const { t } = useTranslation();
|
|
|
|
const stateText = t(XRAY_STATE_KEYS[status.xray.state] ?? 'pages.index.xrayStatusUnknown');
|
|
|
|
const title = (
|
|
<Space>
|
|
<span>{t('pages.index.xrayStatus')}</span>
|
|
{isMobile && status.xray.version && status.xray.version !== 'Unknown' && (
|
|
<Tag color="green">v{status.xray.version}</Tag>
|
|
)}
|
|
</Space>
|
|
);
|
|
|
|
const errorLines = useMemo(
|
|
() => (status.xray.errorMsg || '').split('\n'),
|
|
[status.xray.errorMsg],
|
|
);
|
|
|
|
const extra =
|
|
status.xray.state !== 'error' ? (
|
|
<Badge status="processing" text={stateText} color={status.xray.color} />
|
|
) : (
|
|
<Popover
|
|
title={
|
|
<Row align="middle" justify="space-between">
|
|
<Col>
|
|
<span>{t('pages.index.xrayStatusError')}</span>
|
|
</Col>
|
|
<Col>
|
|
<BarsOutlined className="cursor-pointer" role="button" tabIndex={0} aria-label={t('pages.index.logs')} onClick={onOpenLogs} onKeyDown={activateOnKey(onOpenLogs)} />
|
|
</Col>
|
|
</Row>
|
|
}
|
|
content={
|
|
<>
|
|
{errorLines.map((line, i) => (
|
|
<span key={i} className="error-line">
|
|
{line}
|
|
</span>
|
|
))}
|
|
</>
|
|
}
|
|
>
|
|
<Badge status="processing" text={stateText} color={status.xray.color} />
|
|
</Popover>
|
|
);
|
|
|
|
const actions = [
|
|
// the xray log viewer reads the access log file, so the button only makes
|
|
// sense when one is configured (unlike IP limit, which no longer needs it)
|
|
...(accessLogEnable
|
|
? [
|
|
<Space className="action" key="xraylogs" role="button" tabIndex={0} aria-label={t('pages.index.accessLogs')} onClick={onOpenXrayLogs} onKeyDown={activateOnKey(onOpenXrayLogs)}>
|
|
<BarsOutlined />
|
|
{!isMobile && <span>{t('pages.index.accessLogs')}</span>}
|
|
</Space>,
|
|
]
|
|
: []),
|
|
<Space className="action" key="stop" role="button" tabIndex={0} aria-label={t('pages.index.stopXray')} onClick={onStopXray} onKeyDown={activateOnKey(onStopXray)}>
|
|
<PoweroffOutlined />
|
|
{!isMobile && <span>{t('pages.index.stopXray')}</span>}
|
|
</Space>,
|
|
<Space className="action" key="restart" role="button" tabIndex={0} aria-label={t('pages.index.restartXray')} onClick={onRestartXray} onKeyDown={activateOnKey(onRestartXray)}>
|
|
<ReloadOutlined />
|
|
{!isMobile && <span>{t('pages.index.restartXray')}</span>}
|
|
</Space>,
|
|
<Space className="action" key="switch" role="button" tabIndex={0} aria-label={t('pages.index.xraySwitch')} onClick={onOpenVersionSwitch} onKeyDown={activateOnKey(onOpenVersionSwitch)}>
|
|
<ToolOutlined />
|
|
{!isMobile && (
|
|
<span>
|
|
{status.xray.version && status.xray.version !== 'Unknown'
|
|
? `v${status.xray.version}`
|
|
: t('pages.index.xraySwitch')}
|
|
</span>
|
|
)}
|
|
</Space>,
|
|
];
|
|
|
|
return (
|
|
<Card hoverable title={title} extra={extra} actions={actions} className="xray-status-card" />
|
|
);
|
|
}
|