From 90641a21511c4932f8a56a6ce0c4bd7f399885a0 Mon Sep 17 00:00:00 2001 From: Tunglies <77394545+Tunglies@users.noreply.github.com> Date: Fri, 20 Nov 2026 23:51:08 +0800 Subject: [PATCH] fix(setting): clear the copy toast state when the dialog closes Closing and reopening the controller dialog inside the two-second window replayed the previous session's toast for the residual time; every close path now clears the timer and the flag. --- .../setting/mods/controller-viewer.tsx | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/components/setting/mods/controller-viewer.tsx b/src/components/setting/mods/controller-viewer.tsx index 9ebece9f3..2c0401ea9 100644 --- a/src/components/setting/mods/controller-viewer.tsx +++ b/src/components/setting/mods/controller-viewer.tsx @@ -40,6 +40,14 @@ export function ControllerViewer({ ref }: { ref?: Ref }) { verge?.enable_external_controller ?? false, ) + // A reopen within the window must not replay the previous session's toast. + const closeDialog = () => { + clearTimeout(copySuccessTimerRef.current) + copySuccessTimerRef.current = undefined + setCopySuccess(null) + setOpen(false) + } + // 对话框打开时初始化配置 useSettingDialog(ref, 'controller-viewer', open, () => ({ open: async () => { @@ -48,7 +56,7 @@ export function ControllerViewer({ ref }: { ref?: Ref }) { setSecret(clashInfo?.secret || '') setEnableController(verge?.enable_external_controller ?? false) }, - close: () => setOpen(false), + close: closeDialog, })) // 保存配置 @@ -82,7 +90,7 @@ export function ControllerViewer({ ref }: { ref?: Ref }) { } showNotice.success('shared.feedback.notifications.common.saveSuccess') - setOpen(false) + closeDialog() } catch (err) { showNotice.error( 'shared.feedback.notifications.common.saveFailed', @@ -130,8 +138,8 @@ export function ControllerViewer({ ref }: { ref?: Ref }) { ) } cancelBtn={t('shared.actions.cancel')} - onClose={() => setOpen(false)} - onCancel={() => setOpen(false)} + onClose={closeDialog} + onCancel={closeDialog} onOk={onSave} >