mirror of
https://hubproxy.babadafafafafa.cn/https://github.com/MHSanaei/3x-ui.git
synced 2026-09-20 08:04:05 +08:00
b9eda09da9
npm install was failing with ERESOLVE: the lockfile pinned storybook 10.5.7 and vitest 4.1.10 as peers while package.json asked for ^10.5.9 and ^4.1.11, and npm would not move either. Neither npm update, a targeted install, nor --package-lock-only broke the cycle, so node_modules and package-lock.json were regenerated from scratch (601 packages, 0 vulnerabilities). oxlint 1.79.0 then promoted five React Compiler rules into the correctness category, flagging 101 pre-existing sites. 1.78.0 exits 0 on the same tree, so nothing in our code changed - the rule set grew. They are fixed rather than suppressed: - refs (31): latest-value ref writes moved out of render into an effect. onlineClientsRef turned out to be write-only and is gone; expireDiffRef and trafficDiffRef were replaced by reading the values directly. - set-state-in-effect (55): reset-on-open modals now adjust state during render; where an effect mixed a synchronous reset with an async fetch, the reset moved to render and the effect kept only the request. useMediaQuery became useSyncExternalStore. - preserve-manual-memoization (11): optional-chained deps the compiler cannot match, hoisted to locals or dropped where the memo wrapped a string concat. - purity (3): Date.now() in render replaced by a state-backed clock, which also refreshes the expiry tag every 60s instead of freezing it until the next unrelated re-render. - immutability (1): applyClientStatsEvent merged websocket traffic into DBInbound rows in place; it now rebuilds only the rows it touches. Two things fell out of that. clientCount is derived with useMemo instead of an imperative rebuildClientCount() called from five sites, which also fixes a staleness bug where changing the expiry or traffic threshold left the counts alone until some later rebuild. statsVersion existed only to force a re-render after an in-place mutation, is meaningless now that rows are replaced, and nothing read it, so it is removed. Also adds a lint:fix script - oxlint --fix was previously only reachable through the lint-staged hook.
103 lines
2.7 KiB
TypeScript
103 lines
2.7 KiB
TypeScript
import { useEffect, useRef, useState } from 'react';
|
|
import { Input, Modal } from 'antd';
|
|
import type { InputRef } from 'antd';
|
|
import { useTranslation } from 'react-i18next';
|
|
|
|
import JsonEditor from '@/components/form/JsonEditor';
|
|
|
|
interface PromptModalProps {
|
|
open: boolean;
|
|
onClose: () => void;
|
|
title: string;
|
|
okText?: string;
|
|
type?: 'input' | 'textarea';
|
|
initialValue?: string;
|
|
loading?: boolean;
|
|
json?: boolean;
|
|
onConfirm: (value: string) => void;
|
|
}
|
|
|
|
export default function PromptModal({
|
|
open,
|
|
onClose,
|
|
title,
|
|
okText,
|
|
type = 'input',
|
|
initialValue = '',
|
|
loading = false,
|
|
json = false,
|
|
onConfirm,
|
|
}: PromptModalProps) {
|
|
const { t } = useTranslation();
|
|
const [value, setValue] = useState('');
|
|
const textareaRef = useRef<HTMLTextAreaElement | null>(null);
|
|
const inputRef = useRef<InputRef | null>(null);
|
|
|
|
const [openedWith, setOpenedWith] = useState<string | null>(null);
|
|
const openKey = open ? `${type}\u0000${initialValue}` : null;
|
|
if (openKey !== openedWith) {
|
|
setOpenedWith(openKey);
|
|
if (open) setValue(initialValue);
|
|
}
|
|
|
|
useEffect(() => {
|
|
if (!open) return;
|
|
const id = setTimeout(() => {
|
|
if (type === 'textarea') textareaRef.current?.focus();
|
|
else inputRef.current?.focus();
|
|
}, 50);
|
|
return () => clearTimeout(id);
|
|
}, [open, type]);
|
|
|
|
function onKeydown(e: React.KeyboardEvent<HTMLTextAreaElement | HTMLInputElement>) {
|
|
if (type !== 'textarea' && e.key === 'Enter') {
|
|
e.preventDefault();
|
|
onConfirm(value);
|
|
return;
|
|
}
|
|
if (type === 'textarea' && e.ctrlKey && e.key.toLowerCase() === 's') {
|
|
e.preventDefault();
|
|
onConfirm(value);
|
|
}
|
|
}
|
|
|
|
return (
|
|
<Modal
|
|
open={open}
|
|
title={title}
|
|
okText={okText ?? t('confirm')}
|
|
cancelText={t('cancel')}
|
|
mask={{ closable: false }}
|
|
confirmLoading={loading}
|
|
onOk={() => onConfirm(value)}
|
|
onCancel={onClose}
|
|
destroyOnHidden
|
|
>
|
|
{json ? (
|
|
<JsonEditor value={value} onChange={setValue} minHeight="240px" maxHeight="60vh" />
|
|
) : type === 'textarea' ? (
|
|
<Input.TextArea
|
|
ref={(el) => {
|
|
textareaRef.current =
|
|
(el as unknown as { resizableTextArea?: { textArea: HTMLTextAreaElement } })
|
|
?.resizableTextArea?.textArea ?? null;
|
|
}}
|
|
aria-label={title}
|
|
value={value}
|
|
onChange={(e) => setValue(e.target.value)}
|
|
autoSize={{ minRows: 10, maxRows: 20 }}
|
|
onKeyDown={onKeydown}
|
|
/>
|
|
) : (
|
|
<Input
|
|
ref={inputRef}
|
|
aria-label={title}
|
|
value={value}
|
|
onChange={(e) => setValue(e.target.value)}
|
|
onKeyDown={onKeydown}
|
|
/>
|
|
)}
|
|
</Modal>
|
|
);
|
|
}
|