mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-08-09 21:00: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.
286 lines
9.8 KiB
TypeScript
286 lines
9.8 KiB
TypeScript
import { useMemo, useState } from 'react';
|
|
import { useTranslation } from 'react-i18next';
|
|
import { Button, Form, Input, InputNumber, Modal, Select, Space, Switch } from 'antd';
|
|
import { MinusOutlined, PlusOutlined } from '@ant-design/icons';
|
|
|
|
import { InputAddon } from '@/components/ui';
|
|
import {
|
|
BalancerFormSchema,
|
|
type BalancerFormValues,
|
|
} from '@/schemas/xray';
|
|
import {
|
|
BalancerStrategyTypeSchema,
|
|
type BalancerStrategySettings,
|
|
type BalancerStrategyType,
|
|
} from '@/schemas/routing';
|
|
|
|
export type BalancerFormValue = BalancerFormValues;
|
|
|
|
interface BalancerFormModalProps {
|
|
open: boolean;
|
|
balancer: BalancerFormValue | null;
|
|
outboundTags: string[];
|
|
otherTags: string[];
|
|
onClose: () => void;
|
|
onConfirm: (value: BalancerFormValue) => void;
|
|
}
|
|
|
|
const STRATEGY_LABELS: Record<string, string> = {
|
|
random: 'Random',
|
|
roundRobin: 'Round robin',
|
|
leastLoad: 'Least load',
|
|
leastPing: 'Least ping',
|
|
};
|
|
|
|
const STRATEGIES = BalancerStrategyTypeSchema.options.map((value) => ({
|
|
value,
|
|
label: STRATEGY_LABELS[value] ?? value,
|
|
}));
|
|
|
|
interface FormState {
|
|
tag: string;
|
|
strategy: BalancerStrategyType;
|
|
selector: string[];
|
|
fallbackTag: string;
|
|
settings?: BalancerStrategySettings;
|
|
}
|
|
|
|
function initialState(balancer: BalancerFormValue | null): FormState {
|
|
if (!balancer) {
|
|
return { tag: '', strategy: 'random', selector: [], fallbackTag: '' };
|
|
}
|
|
return {
|
|
tag: balancer.tag ?? '',
|
|
strategy: (balancer.strategy ?? 'random') as BalancerStrategyType,
|
|
selector: [...(balancer.selector ?? [])],
|
|
fallbackTag: balancer.fallbackTag ?? '',
|
|
settings: balancer.settings,
|
|
};
|
|
}
|
|
|
|
export default function BalancerFormModal({
|
|
open,
|
|
balancer,
|
|
outboundTags,
|
|
otherTags,
|
|
onClose,
|
|
onConfirm,
|
|
}: BalancerFormModalProps) {
|
|
const { t } = useTranslation();
|
|
const [state, setState] = useState<FormState>(() => initialState(balancer));
|
|
const [touched, setTouched] = useState<Partial<Record<keyof FormState, boolean>>>({});
|
|
const [submitAttempted, setSubmitAttempted] = useState(false);
|
|
const isEdit = balancer != null;
|
|
|
|
const update = <K extends keyof FormState>(key: K, value: FormState[K]) => {
|
|
setTouched((prev) => (prev[key] ? prev : { ...prev, [key]: true }));
|
|
setState((prev) => ({ ...prev, [key]: value }));
|
|
};
|
|
|
|
const parsed = useMemo(
|
|
() => BalancerFormSchema.safeParse(state),
|
|
[state],
|
|
);
|
|
const duplicateTag = !!state.tag.trim() && otherTags.includes(state.tag.trim());
|
|
const issues = useMemo(() => {
|
|
const map: Record<string, string> = {};
|
|
if (!parsed.success) {
|
|
for (const issue of parsed.error.issues) {
|
|
const key = String(issue.path[0] ?? '');
|
|
if (!map[key]) map[key] = t(issue.message, { defaultValue: issue.message });
|
|
}
|
|
}
|
|
return map;
|
|
}, [parsed, t]);
|
|
|
|
const showTagIssue = submitAttempted || !!touched.tag;
|
|
const showSelectorIssue = submitAttempted || !!touched.selector;
|
|
const tagError = showTagIssue ? issues.tag : '';
|
|
const selectorError = showSelectorIssue ? issues.selector : '';
|
|
const showDuplicate = showTagIssue && duplicateTag;
|
|
|
|
function submit() {
|
|
if (!parsed.success || duplicateTag) {
|
|
setSubmitAttempted(true);
|
|
return;
|
|
}
|
|
const values = { ...parsed.data };
|
|
if (values.strategy !== 'leastLoad') delete values.settings;
|
|
onConfirm(values);
|
|
}
|
|
|
|
const settings = state.settings;
|
|
const updateSetting = <K extends keyof BalancerStrategySettings>(
|
|
key: K,
|
|
value: BalancerStrategySettings[K],
|
|
) => {
|
|
setState((prev) => ({
|
|
...prev,
|
|
settings: { ...(prev.settings ?? {}), [key]: value },
|
|
}));
|
|
};
|
|
const updateBaselines = (next: string[]) => updateSetting('baselines', next);
|
|
const updateCosts = (next: NonNullable<BalancerStrategySettings['costs']>) => updateSetting('costs', next);
|
|
|
|
const baselines = settings?.baselines ?? [];
|
|
const costs = settings?.costs ?? [];
|
|
|
|
const fallbackOptions = useMemo(
|
|
() => ['', ...outboundTags].map((tg) => ({ value: tg, label: tg || `(${t('none')})` })),
|
|
[outboundTags, t],
|
|
);
|
|
|
|
const title = isEdit
|
|
? `${t('edit')} ${t('pages.xray.Balancers')}`
|
|
: `+ ${t('pages.xray.Balancers')}`;
|
|
const okText = isEdit ? t('pages.clients.submitEdit') : t('create');
|
|
|
|
return (
|
|
<Modal
|
|
open={open}
|
|
title={title}
|
|
okText={okText}
|
|
cancelText={t('close')}
|
|
mask={{ closable: false }}
|
|
onOk={submit}
|
|
onCancel={onClose}
|
|
>
|
|
<Form colon={false} labelCol={{ md: { span: 8 } }} wrapperCol={{ md: { span: 14 } }}>
|
|
<Form.Item
|
|
label={t('pages.xray.balancer.tag')}
|
|
required
|
|
validateStatus={tagError ? 'error' : showDuplicate ? 'warning' : ''}
|
|
help={tagError || (showDuplicate ? t('pages.xray.balancer.tagDuplicate') : '')}
|
|
hasFeedback
|
|
>
|
|
<Input
|
|
value={state.tag}
|
|
onChange={(e) => update('tag', e.target.value)}
|
|
placeholder={t('pages.xray.balancer.tagPlaceholder')}
|
|
/>
|
|
</Form.Item>
|
|
<Form.Item label={t('pages.xray.balancer.balancerStrategy')}>
|
|
<Select
|
|
value={state.strategy}
|
|
onChange={(v) => update('strategy', v)}
|
|
options={STRATEGIES}
|
|
/>
|
|
</Form.Item>
|
|
<Form.Item
|
|
label={t('pages.xray.balancer.selector')}
|
|
required
|
|
validateStatus={selectorError ? 'error' : ''}
|
|
help={selectorError || ''}
|
|
hasFeedback
|
|
>
|
|
<Select
|
|
mode="tags"
|
|
value={state.selector}
|
|
onChange={(v) => update('selector', v)}
|
|
tokenSeparators={[',']}
|
|
options={outboundTags.map((tg) => ({ value: tg, label: tg }))}
|
|
/>
|
|
</Form.Item>
|
|
<Form.Item label={t('pages.xray.balancer.fallback')}>
|
|
<Select
|
|
value={state.fallbackTag}
|
|
onChange={(v) => update('fallbackTag', v ?? '')}
|
|
allowClear
|
|
options={fallbackOptions}
|
|
/>
|
|
</Form.Item>
|
|
|
|
{state.strategy === 'leastLoad' && (
|
|
<>
|
|
<Form.Item label={t('pages.xray.balancer.expected')}>
|
|
<InputNumber
|
|
value={settings?.expected}
|
|
onChange={(v) => updateSetting('expected', typeof v === 'number' ? v : undefined)}
|
|
min={0}
|
|
placeholder={t('pages.xray.balancer.expectedPlaceholder')}
|
|
style={{ width: '100%' }}
|
|
/>
|
|
</Form.Item>
|
|
<Form.Item label={t('pages.xray.balancer.maxRtt')}>
|
|
<Input
|
|
value={settings?.maxRTT ?? ''}
|
|
onChange={(e) => updateSetting('maxRTT', e.target.value || undefined)}
|
|
placeholder="e.g. 1s"
|
|
/>
|
|
</Form.Item>
|
|
<Form.Item label={t('pages.xray.balancer.tolerance')}>
|
|
<InputNumber
|
|
value={settings?.tolerance}
|
|
onChange={(v) => updateSetting('tolerance', typeof v === 'number' ? v : undefined)}
|
|
min={0}
|
|
max={1}
|
|
step={0.01}
|
|
placeholder="0.01 = 1%"
|
|
style={{ width: '100%' }}
|
|
/>
|
|
</Form.Item>
|
|
<Form.Item label={t('pages.xray.balancer.baselines')}>
|
|
<Button
|
|
size="small"
|
|
type="primary"
|
|
icon={<PlusOutlined />}
|
|
aria-label={t('add')}
|
|
onClick={() => updateBaselines([...baselines, ''])}
|
|
/>
|
|
{baselines.map((b, idx) => (
|
|
<Space.Compact key={idx} block style={{ marginTop: 4 }}>
|
|
<Input
|
|
value={b}
|
|
aria-label={t('pages.xray.balancer.baselines')}
|
|
placeholder="e.g. 1s"
|
|
onChange={(e) => updateBaselines(baselines.map((x, i) => (i === idx ? e.target.value : x)))}
|
|
/>
|
|
<InputAddon ariaLabel={t('remove')} onClick={() => updateBaselines(baselines.filter((_, i) => i !== idx))}>
|
|
<MinusOutlined />
|
|
</InputAddon>
|
|
</Space.Compact>
|
|
))}
|
|
</Form.Item>
|
|
<Form.Item label={t('pages.xray.balancer.costs')}>
|
|
<Button
|
|
size="small"
|
|
type="primary"
|
|
icon={<PlusOutlined />}
|
|
aria-label={t('add')}
|
|
onClick={() => updateCosts([...costs, { regexp: false, match: '', value: 1 }])}
|
|
/>
|
|
{costs.map((c, idx) => (
|
|
<Space.Compact key={idx} block style={{ marginTop: 4 }}>
|
|
<Switch
|
|
checked={c.regexp}
|
|
aria-label={t('pages.xray.balancer.costRegexp')}
|
|
checkedChildren="re"
|
|
unCheckedChildren="lit"
|
|
onChange={(v) => updateCosts(costs.map((x, i) => (i === idx ? { ...x, regexp: v } : x)))}
|
|
/>
|
|
<Input
|
|
value={c.match}
|
|
aria-label={t('pages.xray.balancer.costMatch')}
|
|
placeholder="tag pattern"
|
|
onChange={(e) => updateCosts(costs.map((x, i) => (i === idx ? { ...x, match: e.target.value } : x)))}
|
|
/>
|
|
<InputNumber
|
|
value={c.value}
|
|
aria-label={t('pages.xray.balancer.costValue')}
|
|
placeholder="weight"
|
|
style={{ width: 100 }}
|
|
onChange={(v) => updateCosts(costs.map((x, i) => (i === idx ? { ...x, value: typeof v === 'number' ? v : 0 } : x)))}
|
|
/>
|
|
<InputAddon ariaLabel={t('remove')} onClick={() => updateCosts(costs.filter((_, i) => i !== idx))}>
|
|
<MinusOutlined />
|
|
</InputAddon>
|
|
</Space.Compact>
|
|
))}
|
|
</Form.Item>
|
|
</>
|
|
)}
|
|
</Form>
|
|
</Modal>
|
|
);
|
|
}
|