mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-08-10 05:10:58 +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.
280 lines
9.0 KiB
TypeScript
280 lines
9.0 KiB
TypeScript
import { useEffect } from 'react';
|
|
import { useTranslation } from 'react-i18next';
|
|
import { Button, Divider, Form, Input, InputNumber, Modal, Select, Space, Switch } from 'antd';
|
|
import { MinusOutlined, PlusOutlined } from '@ant-design/icons';
|
|
|
|
import { InputAddon } from '@/components/ui';
|
|
import {
|
|
DnsQueryStrategySchema,
|
|
DnsServerObjectInnerSchema,
|
|
DnsServerObjectSchema,
|
|
type DnsServerObject,
|
|
} from '@/schemas/dns';
|
|
import { antdRule } from '@/utils/zodForm';
|
|
|
|
export type DnsServerValue =
|
|
| string
|
|
| (DnsServerObject & {
|
|
expectIPs?: string[];
|
|
[key: string]: unknown;
|
|
});
|
|
|
|
interface DnsServerModalProps {
|
|
open: boolean;
|
|
server: DnsServerValue | null;
|
|
isEdit: boolean;
|
|
onClose: () => void;
|
|
onConfirm: (value: DnsServerValue) => void;
|
|
}
|
|
|
|
const STRATEGIES = DnsQueryStrategySchema.options;
|
|
|
|
type DnsServerForm = {
|
|
address: string;
|
|
port: number;
|
|
domains: string[];
|
|
expectedIPs: string[];
|
|
unexpectedIPs: string[];
|
|
queryStrategy: string;
|
|
skipFallback: boolean;
|
|
disableCache: boolean;
|
|
finalQuery: boolean;
|
|
tag: string;
|
|
clientIP: string;
|
|
serveStale: boolean;
|
|
serveExpiredTTL: number;
|
|
timeoutMs: number;
|
|
};
|
|
|
|
function defaultFormValues(): DnsServerForm {
|
|
return {
|
|
address: 'localhost',
|
|
port: 53,
|
|
domains: [],
|
|
expectedIPs: [],
|
|
unexpectedIPs: [],
|
|
queryStrategy: 'UseIP',
|
|
skipFallback: false,
|
|
disableCache: false,
|
|
finalQuery: false,
|
|
tag: '',
|
|
clientIP: '',
|
|
serveStale: false,
|
|
serveExpiredTTL: 0,
|
|
timeoutMs: 4000,
|
|
};
|
|
}
|
|
|
|
function valuesFromServer(server: DnsServerValue | null): DnsServerForm {
|
|
if (server == null) return defaultFormValues();
|
|
if (typeof server === 'string') return { ...defaultFormValues(), address: server };
|
|
const parsed = DnsServerObjectSchema.safeParse(server);
|
|
const data = parsed.success ? parsed.data : null;
|
|
return {
|
|
...defaultFormValues(),
|
|
...(data ?? {}),
|
|
address: (data?.address ?? server.address) || 'localhost',
|
|
domains: data?.domains ?? server.domains ?? [],
|
|
expectedIPs: data?.expectedIPs ?? server.expectedIPs ?? server.expectIPs ?? [],
|
|
unexpectedIPs: data?.unexpectedIPs ?? server.unexpectedIPs ?? [],
|
|
queryStrategy: data?.queryStrategy ?? server.queryStrategy ?? 'UseIP',
|
|
skipFallback: data?.skipFallback ?? server.skipFallback ?? false,
|
|
disableCache: data?.disableCache ?? server.disableCache ?? false,
|
|
finalQuery: data?.finalQuery ?? server.finalQuery ?? false,
|
|
tag: data?.tag ?? server.tag ?? '',
|
|
clientIP: data?.clientIP ?? server.clientIP ?? '',
|
|
serveStale: data?.serveStale ?? server.serveStale ?? false,
|
|
serveExpiredTTL: data?.serveExpiredTTL ?? server.serveExpiredTTL ?? 0,
|
|
timeoutMs: data?.timeoutMs ?? server.timeoutMs ?? 4000,
|
|
};
|
|
}
|
|
|
|
function valuesToWire(values: DnsServerForm): DnsServerValue {
|
|
const isPlain
|
|
= values.domains.length === 0
|
|
&& values.expectedIPs.length === 0
|
|
&& values.unexpectedIPs.length === 0
|
|
&& values.port === 53
|
|
&& values.queryStrategy === 'UseIP'
|
|
&& values.skipFallback === false
|
|
&& values.disableCache === false
|
|
&& values.finalQuery === false
|
|
&& !values.tag
|
|
&& !values.clientIP
|
|
&& values.serveStale === false
|
|
&& values.serveExpiredTTL === 0
|
|
&& values.timeoutMs === 4000;
|
|
if (isPlain) return values.address;
|
|
|
|
const out: Record<string, unknown> = {
|
|
address: values.address,
|
|
port: values.port,
|
|
domains: values.domains.filter(Boolean),
|
|
expectedIPs: values.expectedIPs.filter(Boolean),
|
|
unexpectedIPs: values.unexpectedIPs.filter(Boolean),
|
|
queryStrategy: values.queryStrategy,
|
|
skipFallback: values.skipFallback,
|
|
disableCache: values.disableCache,
|
|
finalQuery: values.finalQuery,
|
|
serveStale: values.serveStale,
|
|
serveExpiredTTL: values.serveExpiredTTL,
|
|
timeoutMs: values.timeoutMs,
|
|
};
|
|
if (values.tag) out.tag = values.tag;
|
|
if (values.clientIP) out.clientIP = values.clientIP;
|
|
return out as DnsServerValue;
|
|
}
|
|
|
|
const shape = DnsServerObjectInnerSchema.shape;
|
|
|
|
export default function DnsServerModal({
|
|
open,
|
|
server,
|
|
isEdit,
|
|
onClose,
|
|
onConfirm,
|
|
}: DnsServerModalProps) {
|
|
const { t } = useTranslation();
|
|
const [form] = Form.useForm<DnsServerForm>();
|
|
|
|
useEffect(() => {
|
|
if (!open) return;
|
|
form.setFieldsValue(valuesFromServer(server));
|
|
}, [open, server, form]);
|
|
|
|
async function submit() {
|
|
const values = await form.validateFields();
|
|
onConfirm(valuesToWire(values));
|
|
}
|
|
|
|
const title = isEdit ? t('pages.xray.dns.edit') : t('pages.xray.dns.add');
|
|
|
|
return (
|
|
<Modal
|
|
open={open}
|
|
title={title}
|
|
okText={t('confirm')}
|
|
cancelText={t('close')}
|
|
mask={{ closable: false }}
|
|
onOk={submit}
|
|
onCancel={onClose}
|
|
>
|
|
<Form
|
|
form={form}
|
|
colon={false}
|
|
labelCol={{ md: { span: 8 } }}
|
|
wrapperCol={{ md: { span: 14 } }}
|
|
initialValues={defaultFormValues()}
|
|
>
|
|
<Form.Item
|
|
label={t('pages.inbounds.address')}
|
|
name="address"
|
|
rules={[antdRule(shape.address, t)]}
|
|
>
|
|
<Input />
|
|
</Form.Item>
|
|
<Form.Item
|
|
label={t('pages.inbounds.port')}
|
|
name="port"
|
|
rules={[antdRule(shape.port, t)]}
|
|
>
|
|
<InputNumber min={1} max={65535} />
|
|
</Form.Item>
|
|
<Form.Item label={t('pages.xray.dns.tag')} name="tag">
|
|
<Input />
|
|
</Form.Item>
|
|
<Form.Item label={t('pages.xray.dns.clientIp')} name="clientIP">
|
|
<Input />
|
|
</Form.Item>
|
|
<Form.Item label={t('pages.xray.dns.strategy')} name="queryStrategy">
|
|
<Select
|
|
style={{ width: '100%' }}
|
|
options={STRATEGIES.map((s) => ({ value: s, label: s }))}
|
|
/>
|
|
</Form.Item>
|
|
<Form.Item
|
|
label={t('pages.xray.dns.timeoutMs')}
|
|
name="timeoutMs"
|
|
rules={[antdRule(shape.timeoutMs, t)]}
|
|
>
|
|
<InputNumber min={0} step={500} />
|
|
</Form.Item>
|
|
|
|
<Divider style={{ margin: '5px 0' }} />
|
|
|
|
<Form.List name="domains">
|
|
{(fields, { add, remove }) => (
|
|
<Form.Item label={t('pages.xray.dns.domains')}>
|
|
<Button size="small" type="primary" icon={<PlusOutlined />} aria-label={t('add')} onClick={() => add('')} />
|
|
{fields.map((field) => (
|
|
<Space.Compact key={field.key} block style={{ marginTop: 4 }}>
|
|
<Form.Item name={field.name} noStyle>
|
|
<Input />
|
|
</Form.Item>
|
|
<InputAddon ariaLabel={t('remove')} onClick={() => remove(field.name)}>
|
|
<MinusOutlined />
|
|
</InputAddon>
|
|
</Space.Compact>
|
|
))}
|
|
</Form.Item>
|
|
)}
|
|
</Form.List>
|
|
|
|
<Form.List name="expectedIPs">
|
|
{(fields, { add, remove }) => (
|
|
<Form.Item label={t('pages.xray.dns.expectIPs')}>
|
|
<Button size="small" type="primary" icon={<PlusOutlined />} aria-label={t('add')} onClick={() => add('')} />
|
|
{fields.map((field) => (
|
|
<Space.Compact key={field.key} block style={{ marginTop: 4 }}>
|
|
<Form.Item name={field.name} noStyle>
|
|
<Input />
|
|
</Form.Item>
|
|
<InputAddon ariaLabel={t('remove')} onClick={() => remove(field.name)}>
|
|
<MinusOutlined />
|
|
</InputAddon>
|
|
</Space.Compact>
|
|
))}
|
|
</Form.Item>
|
|
)}
|
|
</Form.List>
|
|
|
|
<Form.List name="unexpectedIPs">
|
|
{(fields, { add, remove }) => (
|
|
<Form.Item label={t('pages.xray.dns.unexpectIPs')}>
|
|
<Button size="small" type="primary" icon={<PlusOutlined />} aria-label={t('add')} onClick={() => add('')} />
|
|
{fields.map((field) => (
|
|
<Space.Compact key={field.key} block style={{ marginTop: 4 }}>
|
|
<Form.Item name={field.name} noStyle>
|
|
<Input />
|
|
</Form.Item>
|
|
<InputAddon ariaLabel={t('remove')} onClick={() => remove(field.name)}>
|
|
<MinusOutlined />
|
|
</InputAddon>
|
|
</Space.Compact>
|
|
))}
|
|
</Form.Item>
|
|
)}
|
|
</Form.List>
|
|
|
|
<Divider style={{ margin: '5px 0' }} />
|
|
|
|
<Form.Item label={t('pages.xray.dns.skipFallback')} name="skipFallback" valuePropName="checked">
|
|
<Switch />
|
|
</Form.Item>
|
|
<Form.Item label={t('pages.xray.dns.finalQuery')} name="finalQuery" valuePropName="checked">
|
|
<Switch />
|
|
</Form.Item>
|
|
<Form.Item label={t('pages.xray.dns.disableCache')} name="disableCache" valuePropName="checked">
|
|
<Switch />
|
|
</Form.Item>
|
|
<Form.Item label={t('pages.xray.dns.serveStale')} name="serveStale" valuePropName="checked">
|
|
<Switch />
|
|
</Form.Item>
|
|
<Form.Item label={t('pages.xray.dns.serveExpiredTTL')} name="serveExpiredTTL">
|
|
<InputNumber min={0} step={60} />
|
|
</Form.Item>
|
|
</Form>
|
|
</Modal>
|
|
);
|
|
}
|