Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(desktop): 阻止点击对话框遮罩误关闭 (#5104)

Dashc0ba10a1958a
diff --git a/apps/desktop/src/renderer/__tests__/addProviderWizardOpenAiAuth.test.tsx b/apps/desktop/src/renderer/__tests__/addProviderWizardOpenAiAuth.test.tsx
index 5a97972e70..f82b0ab598 100644
--- a/apps/desktop/src/renderer/__tests__/addProviderWizardOpenAiAuth.test.tsx
+++ b/apps/desktop/src/renderer/__tests__/addProviderWizardOpenAiAuth.test.tsx
@@ -522,7 +522,7 @@ describe('AddProviderWizard — OpenAI 授权边界', () => {
});
});
-describe('AddProviderWizard — 关闭途径(DESIGN.md §4:取消 / Esc / 遮罩)', () => {
+describe('AddProviderWizard — 关闭途径(取消 / Esc)', () => {
it('按 Esc 关闭向导', () => {
const onClose = vi.fn();
render(
@@ -555,7 +555,7 @@ describe('AddProviderWizard — 关闭途径(DESIGN.md §4:取消 / Esc / 遮罩
expect(onClose).toHaveBeenCalledTimes(1);
});
- it('点击遮罩关闭向导;点击弹窗内部不关闭', () => {
+ it('点击遮罩或弹窗内部不关闭;点击取消关闭', () => {
const onClose = vi.fn();
const { container } = render(
<AddProviderWizard
@@ -565,18 +565,16 @@ describe('AddProviderWizard — 关闭途径(DESIGN.md §4:取消 / Esc / 遮罩
onDone={vi.fn()}
/>,
);
- // 点弹窗内部(标题):target ≠ 遮罩本身,不得关闭。
fireEvent.click(screen.getByText('settings.providers.wizard.title'));
expect(onClose).not.toHaveBeenCalled();
const overlay = container.firstElementChild as HTMLElement;
- // 从弹窗内部按下、拖出到遮罩松开:合成 click 落在遮罩,但按下不始于遮罩,
- // 不得误关(防丢表单)。
fireEvent.mouseDown(screen.getByText('settings.providers.wizard.title'));
fireEvent.click(overlay);
expect(onClose).not.toHaveBeenCalled();
- // 按下与松开都在遮罩上:关闭。
fireEvent.mouseDown(overlay);
fireEvent.click(overlay);
+ expect(onClose).not.toHaveBeenCalled();
+ fireEvent.click(screen.getByText('settings.providers.wizard.cancel'));
expect(onClose).toHaveBeenCalledTimes(1);
});
});
diff --git a/apps/desktop/src/renderer/__tests__/customProviderDialogPresetLocale.test.tsx b/apps/desktop/src/renderer/__tests__/customProviderDialogPresetLocale.test.tsx
index 91de8b00c2..3619421c3c 100644
--- a/apps/desktop/src/renderer/__tests__/customProviderDialogPresetLocale.test.tsx
+++ b/apps/desktop/src/renderer/__tests__/customProviderDialogPresetLocale.test.tsx
@@ -1,6 +1,6 @@
// @vitest-environment jsdom
-import { cleanup, createEvent, fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { cleanup, createEvent, fireEvent, render, screen, waitFor, within } from '@testing-library/react';
import React from 'react';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
@@ -255,33 +255,22 @@ describe('ProviderConnectionDialog preset locale ownership', () => {
expect(onClose).toHaveBeenCalledTimes(1);
});
- it('dismisses only the topmost preset menu on a scrim gesture', async () => {
+ it('does not close the provider form on a scrim gesture', async () => {
i18nState.language = 'zh-TW';
const { container, onClose } = renderDialog();
const trigger = await findReadyPresetTrigger();
fireEvent.click(trigger);
- const option = await screen.findByRole('option', { name: '繁體供應商' });
- // 等 layout effect 把 childLayer 写进 childLayerRef。只等 option 出现不够:
- // Windows CI 上 rAF 也可能早于 useLayoutEffect, 第一个 pointerDown 会关整表。
- await waitFor(() => {
- expect(option.isConnected).toBe(true);
- });
- await new Promise<void>((resolve) => {
- requestAnimationFrame(() => resolve());
- });
- await new Promise<void>((resolve) => {
- requestAnimationFrame(() => resolve());
- });
+ expect(await screen.findByRole('option', { name: '繁體供應商' })).not.toBeNull();
const scrim = container.firstElementChild as Element;
fireEvent.pointerDown(scrim);
- await waitFor(() => {
- expect(screen.queryByRole('option', { name: '繁體供應商' })).toBeNull();
- });
+ expect(screen.getByRole('option', { name: '繁體供應商' })).not.toBeNull();
expect(onClose).not.toHaveBeenCalled();
fireEvent.pointerDown(scrim);
+ expect(onClose).not.toHaveBeenCalled();
+ fireEvent.click(screen.getByText('settings.providers.custom.cancel'));
expect(onClose).toHaveBeenCalledTimes(1);
});
@@ -461,7 +450,7 @@ describe('ProviderConnectionDialog preset locale ownership', () => {
}
});
- it('dismisses only the model picker on its scrim gesture', async () => {
+ it('keeps model picker selections on its scrim gesture until explicitly cancelled', async () => {
i18nState.language = 'zh-TW';
const { onClose } = renderDialog();
@@ -474,13 +463,21 @@ describe('ProviderConnectionDialog preset locale ownership', () => {
const pickerHeading = await screen.findByRole('heading', {
name: 'settings.providers.custom.fetch.pickerTitle',
});
- const pickerScrim = pickerHeading.closest('[role="dialog"]')?.parentElement;
+ const pickerDialog = pickerHeading.closest('[role="dialog"]') as HTMLElement;
+ const checkbox = within(pickerDialog).getByRole('checkbox', { name: /Local Model/ });
+ fireEvent.click(checkbox);
+ const selected = checkbox.getAttribute('aria-checked');
+ const pickerScrim = pickerDialog.parentElement;
expect(pickerScrim).not.toBeNull();
fireEvent.pointerDown(pickerScrim as Element);
expect(
- screen.queryByRole('heading', { name: 'settings.providers.custom.fetch.pickerTitle' }),
- ).toBeNull();
+ screen.getByRole('heading', { name: 'settings.providers.custom.fetch.pickerTitle' }),
+ ).not.toBeNull();
+ expect(checkbox.getAttribute('aria-checked')).toBe(selected);
+ expect(onClose).not.toHaveBeenCalled();
+ fireEvent.click(within(pickerDialog).getByRole('button', { name: 'settings.providers.custom.cancel' }));
+ expect(screen.queryByRole('heading', { name: 'settings.providers.custom.fetch.pickerTitle' })).toBeNull();
expect(onClose).not.toHaveBeenCalled();
});
});
diff --git a/apps/desktop/src/renderer/components/cindy-make/CindyMakeCreateDialog.tsx b/apps/desktop/src/renderer/components/cindy-make/CindyMakeCreateDialog.tsx
index b15ef8ce48..b6ea8aa4ba 100644
--- a/apps/desktop/src/renderer/components/cindy-make/CindyMakeCreateDialog.tsx
+++ b/apps/desktop/src/renderer/components/cindy-make/CindyMakeCreateDialog.tsx
@@ -84,6 +84,7 @@ export function CindyMakeCreateDialog({ onOpenChange }: { onOpenChange: (open: b
<Dialog.Portal>
<Dialog.Overlay className="fixed inset-0 z-[10000] bg-[var(--overlay-modal)]" />
<Dialog.Content
+ onPointerDownOutside={(event) => event.preventDefault()}
className="fixed left-1/2 top-1/2 z-[10001] flex max-h-[85vh] w-[min(460px,calc(100vw-32px))] -translate-x-1/2 -translate-y-1/2 flex-col overflow-y-auto rounded-xl bg-[var(--confirm-bg)] p-4 shadow-[var(--confirm-shadow)] outline-none"
onCloseAutoFocus={(event) => {
event.preventDefault();
diff --git a/apps/desktop/src/renderer/components/new-chat/AddRemoteProjectDialog.tsx b/apps/desktop/src/renderer/components/new-chat/AddRemoteProjectDialog.tsx
index 6d12ea67fb..7ec75ad57f 100644
--- a/apps/desktop/src/renderer/components/new-chat/AddRemoteProjectDialog.tsx
+++ b/apps/desktop/src/renderer/components/new-chat/AddRemoteProjectDialog.tsx
@@ -354,6 +354,7 @@ export function AddRemoteProjectDialog({
style={{ backgroundColor: 'var(--overlay-modal, rgba(0,0,0,0.4))' }}
/>
<Dialog.Content
+ onPointerDownOutside={(event) => event.preventDefault()}
className="fixed left-1/2 top-1/2 z-50 flex w-[560px] max-w-[92vw] -translate-x-1/2 -translate-y-1/2 flex-col rounded-xl shadow-[var(--confirm-shadow)]"
style={{
backgroundColor: 'var(--surface-elevated, #ffffff)',
diff --git a/apps/desktop/src/renderer/components/settings/AddProviderWizard.tsx b/apps/desktop/src/renderer/components/settings/AddProviderWizard.tsx
index ab99901588..891cbaf61b 100644
--- a/apps/desktop/src/renderer/components/settings/AddProviderWizard.tsx
+++ b/apps/desktop/src/renderer/components/settings/AddProviderWizard.tsx
@@ -914,13 +914,7 @@ export function AddProviderWizard({
onClose();
}, [loggingIn, cancelAuthorize, onClose]);
- // 遮罩关闭的防误触:从输入框按下、拖到弹窗外松开时,浏览器把合成 click 派发到
- // 按下点与松开点的最近公共祖先(= 遮罩),target === currentTarget 成立但用户
- // 并无关闭意图。记录按下是否始于遮罩,按下与松开都在遮罩上才关闭
- // (PR #1102 review 第七轮)。
- const overlayMouseDownOnSelfRef = useRef(false);
-
- // Esc 关闭(DESIGN.md §4:弹窗关闭 = 取消按钮 / Esc / 点遮罩;本弹窗未用 Radix,需自行监听)。
+ // Esc 关闭(本弹窗未用 Radix,需自行监听)。
// CJK 输入法组合期间的 Esc 是「取消候选词」,不是关闭命令(isComposing / 遗留
// keyCode 229),与仓库其他 CJK 输入场景同口径(PR #1102 review 第六轮)。
useEffect(() => {
@@ -1432,16 +1426,8 @@ export function AddProviderWizard({
(!presetNeedsApiKey || apiKey.trim().length > 0);
return (
- // DESIGN.md §4 Dialog:关闭 = 底部「取消」/ Esc / 点遮罩,不设右上角 ×(与 ConfirmDialog 同构)。
<div
className="fixed inset-0 z-[10000] flex items-center justify-center bg-[var(--overlay-modal)]"
- onMouseDown={(e) => {
- overlayMouseDownOnSelfRef.current = e.target === e.currentTarget;
- }}
- onClick={(e) => {
- if (e.target === e.currentTarget && overlayMouseDownOnSelfRef.current) handleClose();
- overlayMouseDownOnSelfRef.current = false;
- }}
>
<div
className="flex max-h-[min(640px,85vh)] w-[min(600px,calc(100vw-32px))] flex-col overflow-hidden rounded-xl border"
diff --git a/apps/desktop/src/renderer/components/settings/CustomProviderRuntimeFillOverlay.tsx b/apps/desktop/src/renderer/components/settings/CustomProviderRuntimeFillOverlay.tsx
index aed8f71b71..ca7851c236 100644
--- a/apps/desktop/src/renderer/components/settings/CustomProviderRuntimeFillOverlay.tsx
+++ b/apps/desktop/src/renderer/components/settings/CustomProviderRuntimeFillOverlay.tsx
@@ -205,6 +205,7 @@ export function CustomProviderRuntimeFillOverlay({
/>
<Dialog.Content
aria-describedby="custom-provider-runtime-fill-description"
+ onPointerDownOutside={(event) => event.preventDefault()}
onOpenAutoFocus={(event) => {
event.preventDefault();
primaryButtonRef.current?.focus();
diff --git a/apps/desktop/src/renderer/components/settings/McpServerDialog.tsx b/apps/desktop/src/renderer/components/settings/McpServerDialog.tsx
index aadbf3b4da..edafe59261 100644
--- a/apps/desktop/src/renderer/components/settings/McpServerDialog.tsx
+++ b/apps/desktop/src/renderer/components/settings/McpServerDialog.tsx
@@ -219,9 +219,7 @@ export function McpServerDialog({ initial, existingIds, onSaved, onClose }: McpS
if (savingRef.current || event.isComposing || event.keyCode === 229)
event.preventDefault();
}}
- onPointerDownOutside={(event) => {
- if (savingRef.current) event.preventDefault();
- }}
+ onPointerDownOutside={(event) => event.preventDefault()}
>
<div className="flex shrink-0 items-center gap-2.5 p-4">
<Sparkles size={20} className="shrink-0 text-[var(--settings-section-title)]" />
diff --git a/apps/desktop/src/renderer/components/settings/ModelAdvancedDrawer.tsx b/apps/desktop/src/renderer/components/settings/ModelAdvancedDrawer.tsx
index 3d3e51a393..b4380a84f9 100644
--- a/apps/desktop/src/renderer/components/settings/ModelAdvancedDrawer.tsx
+++ b/apps/desktop/src/renderer/components/settings/ModelAdvancedDrawer.tsx
@@ -439,6 +439,7 @@ export function ModelAdvancedDrawer({
)}
/>
<Dialog.Content
+ onPointerDownOutside={(event) => event.preventDefault()}
className={cn(
'fixed inset-0 z-[10001] m-auto flex h-fit max-h-[calc(100dvh-48px)] w-[800px] max-w-[calc(100vw-32px)] flex-col overflow-hidden rounded-xl',
'border border-[var(--settings-theme-card-border)] bg-[var(--settings-theme-card-bg)]',
diff --git a/apps/desktop/src/renderer/components/settings/ModelPriceOverrideDialog.tsx b/apps/desktop/src/renderer/components/settings/ModelPriceOverrideDialog.tsx
index f0062324a2..a95e82167c 100644
--- a/apps/desktop/src/renderer/components/settings/ModelPriceOverrideDialog.tsx
+++ b/apps/desktop/src/renderer/components/settings/ModelPriceOverrideDialog.tsx
@@ -200,6 +200,7 @@ export function ModelPriceOverrideDialog({ provider, row, open, onOpenChange }:
<Dialog.Portal>
<Dialog.Overlay className="fixed inset-0 z-[10001] bg-[var(--overlay-modal)]" />
<Dialog.Content
+ onPointerDownOutside={(event) => event.preventDefault()}
className={cn(
'fixed left-1/2 top-1/2 z-[10001] w-[520px] max-w-[92vw]',
'-translate-x-1/2 -translate-y-1/2 overflow-hidden rounded-xl',
diff --git a/apps/desktop/src/renderer/components/settings/ProviderConnectionDialog.tsx b/apps/desktop/src/renderer/components/settings/ProviderConnectionDialog.tsx
index 9d57535a2c..6eb33d9ba6 100644
--- a/apps/desktop/src/renderer/components/settings/ProviderConnectionDialog.tsx
+++ b/apps/desktop/src/renderer/components/settings/ProviderConnectionDialog.tsx
@@ -527,7 +527,6 @@ export function ProviderConnectionDialog({
const imageGenerationHelpPointerSuppressionFrameRef = useRef<number | null>(null);
const imageGenerationHelpPointerSuppressionGenerationRef = useRef(0);
const modelFetchInFlightRef = useRef(false);
- const scrimRef = useRef<HTMLDivElement>(null);
const dialogPanelRef = useRef<HTMLDivElement>(null);
const saveButtonRef = useRef<HTMLButtonElement>(null);
// 原生 window listener 的生命周期不跟着每次 render 重绑;layout effect 只把
@@ -669,24 +668,6 @@ export function ProviderConnectionDialog({
return () => window.removeEventListener('keydown', onKeyDown, true);
}, [dismissImageGenerationHelp, dismissTopmostLayer, showImageGenerationHelp]);
- useEffect(() => {
- const onPointerDown = (event: PointerEvent) => {
- if (event.button !== 0) return;
- if (event.target !== scrimRef.current) return;
- if (!childLayerRef.current && !runtimeFillRef.current) return;
-
- // This must run before Radix's document-capture outside-dismiss. The
- // scrim gesture belongs to the dialog's current child layer; consuming
- // it here prevents Radix from committing a closed popover before the
- // form can settle that layer exactly once.
- event.preventDefault();
- event.stopPropagation();
- dismissTopmostLayer();
- };
- window.addEventListener('pointerdown', onPointerDown, { capture: true });
- return () => window.removeEventListener('pointerdown', onPointerDown, true);
- }, [dismissTopmostLayer]);
-
useEffect(() => {
const returnFocusElement =
document.activeElement instanceof HTMLElement && document.activeElement !== document.body
@@ -2011,18 +1992,8 @@ export function ProviderConnectionDialog({
return (
<div
- ref={scrimRef}
data-custom-provider-dialog-scrim="true"
className="fixed inset-0 z-[10000] flex items-center justify-center bg-[var(--overlay-modal)]"
- onPointerDown={(event) => {
- // pointerdown 时先按当前层级结算,避免 Popover 的 outside-dismiss 在随后
- // click 前把状态改成 closed,令同一次手势继续误关底层表单。
- if (event.button === 0 && event.target === event.currentTarget && !saving && !runtimeFill) {
- event.preventDefault();
- event.stopPropagation();
- dismissTopmostLayer();
- }
- }}
onKeyDown={(event) => {
if (childLayer || runtimeFill || imageGenerationReloadConfirmation) return;
if (event.key !== 'Tab') return;
@@ -2855,6 +2826,7 @@ export function ProviderConnectionDialog({
<Dialog.Overlay className="fixed inset-0 z-[10002] bg-[var(--overlay-modal)] data-[state=open]:animate-confirm-overlay-in data-[state=closed]:animate-confirm-overlay-out" />
<Dialog.Content
aria-describedby="custom-provider-image-generation-reload-description"
+ onPointerDownOutside={(event) => event.preventDefault()}
onOpenAutoFocus={(event) => {
event.preventDefault();
document.getElementById('custom-provider-image-generation-reload-primary')?.focus();
@@ -2953,19 +2925,6 @@ export function ModelPickerOverlay({
(m) => m.id.toLowerCase().includes(q) || m.name.toLowerCase().includes(q),
)
: picker.models;
- useEffect(() => {
- const onPointerDown = (event: PointerEvent) => {
- if (event.button !== 0) return;
- const target = event.target;
- if (target instanceof Node && contentRef.current?.contains(target)) return;
- // Close only the picker and consume the gesture before it can reach the form beneath it.
- event.preventDefault();
- event.stopPropagation();
- onClose();
- };
- window.addEventListener('pointerdown', onPointerDown, { capture: true });
- return () => window.removeEventListener('pointerdown', onPointerDown, true);
- }, [onClose]);
const toggle = (id: string) => {
const next = new Set(picker.selected);
if (next.has(id)) next.delete(id);
@@ -2993,6 +2952,7 @@ export function ModelPickerOverlay({
<Dialog.Content
ref={contentRef}
aria-describedby="custom-provider-model-picker-description"
+ onPointerDownOutside={(event) => event.preventDefault()}
onEscapeKeyDown={(event) => {
if (event.isComposing || event.keyCode === 229) event.preventDefault();
}}
diff --git a/apps/desktop/src/renderer/components/settings/SshKeySetupDialog.tsx b/apps/desktop/src/renderer/components/settings/SshKeySetupDialog.tsx
index bb46bc14fc..a58141feab 100644
--- a/apps/desktop/src/renderer/components/settings/SshKeySetupDialog.tsx
+++ b/apps/desktop/src/renderer/components/settings/SshKeySetupDialog.tsx
@@ -212,6 +212,7 @@ export function SshKeySetupDialog({ hostId, hostInline, open, onOpenChange, onKe
style={{ backgroundColor: 'var(--overlay-modal, rgba(0,0,0,0.4))' }}
/>
<Dialog.Content
+ onPointerDownOutside={(event) => event.preventDefault()}
className="fixed left-1/2 top-1/2 z-50 w-[640px] max-w-[92vw] max-h-[88vh] -translate-x-1/2 -translate-y-1/2 overflow-hidden rounded-xl flex flex-col"
style={{
backgroundColor: 'var(--surface-elevated, #ffffff)',
@@ -647,6 +648,7 @@ function UnlockDialog({ privateKeyPath, onClose, onSubmit }: UnlockDialogProps)
style={{ backgroundColor: 'var(--overlay-modal, rgba(0,0,0,0.5))' }}
/>
<Dialog.Content
+ onPointerDownOutside={(event) => event.preventDefault()}
className="fixed left-1/2 top-1/2 z-[60] w-[420px] max-w-[92vw] -translate-x-1/2 -translate-y-1/2 overflow-hidden rounded-xl"
style={{
backgroundColor: 'var(--surface-elevated, #ffffff)',
@@ -1007,6 +1009,7 @@ function AgentTroubleDialog({ state, onClose }: AgentTroubleDialogProps) {
style={{ backgroundColor: 'var(--overlay-modal, rgba(0,0,0,0.5))' }}
/>
<Dialog.Content
+ onPointerDownOutside={(event) => event.preventDefault()}
className="fixed left-1/2 top-1/2 z-[60] w-[520px] max-w-[92vw] max-h-[88vh] -translate-x-1/2 -translate-y-1/2 overflow-hidden rounded-xl flex flex-col"
style={{
backgroundColor: 'var(--surface-elevated, #ffffff)',
diff --git a/apps/desktop/src/renderer/components/settings/VoiceInputSection.tsx b/apps/desktop/src/renderer/components/settings/VoiceInputSection.tsx
index c23c578b4d..e310035ed0 100644
--- a/apps/desktop/src/renderer/components/settings/VoiceInputSection.tsx
+++ b/apps/desktop/src/renderer/components/settings/VoiceInputSection.tsx
@@ -2325,6 +2325,7 @@ export function VoiceInputSection() {
style={{ WebkitAppRegion: 'no-drag' } as CSSProperties}
/>
<Dialog.Content
+ onPointerDownOutside={(event) => event.preventDefault()}
className={cn(
'fixed left-1/2 top-1/2 z-50 w-[min(520px,calc(100vw-48px))] -translate-x-1/2 -translate-y-1/2',
'rounded-[18px] border border-[var(--settings-theme-card-border)] bg-[var(--settings-theme-card-bg)]',
diff --git a/apps/desktop/src/renderer/components/settings/WorkLouderCodexKeyboardLayout.tsx b/apps/desktop/src/renderer/components/settings/WorkLouderCodexKeyboardLayout.tsx
index d36b2a0c0e..d79001c164 100644
--- a/apps/desktop/src/renderer/components/settings/WorkLouderCodexKeyboardLayout.tsx
+++ b/apps/desktop/src/renderer/components/settings/WorkLouderCodexKeyboardLayout.tsx
@@ -502,7 +502,7 @@ export function WorkLouderCodexKeycapPicker({
<Dialog.Root open={open} onOpenChange={onOpenChange}>
<Dialog.Portal>
<Dialog.Overlay className="fixed inset-0 z-[10000] bg-[var(--overlay-modal)]" />
- <Dialog.Content className="fixed left-1/2 top-1/2 z-[10000] flex max-h-[min(760px,calc(100vh-48px))] w-[min(720px,calc(100vw-48px))] -translate-x-1/2 -translate-y-1/2 flex-col overflow-hidden rounded-2xl border border-[var(--border-default)] bg-[var(--surface-elevated)] text-[var(--text-primary)] shadow-[var(--shadow-menu)] focus:outline-none">
+ <Dialog.Content onPointerDownOutside={(event) => event.preventDefault()} className="fixed left-1/2 top-1/2 z-[10000] flex max-h-[min(760px,calc(100vh-48px))] w-[min(720px,calc(100vw-48px))] -translate-x-1/2 -translate-y-1/2 flex-col overflow-hidden rounded-2xl border border-[var(--border-default)] bg-[var(--surface-elevated)] text-[var(--text-primary)] shadow-[var(--shadow-menu)] focus:outline-none">
<div className="flex items-start justify-between gap-4 px-6 pb-4 pt-6">
<div className="min-w-0">
<Dialog.Title className="text-18 font-medium leading-[1.3]">
@@ -611,7 +611,7 @@ export function WorkLouderCodexPartEditor({
<Dialog.Root open={open} onOpenChange={onOpenChange}>
<Dialog.Portal>
<Dialog.Overlay className="fixed inset-0 z-[10000] bg-[var(--overlay-modal)]" />
- <Dialog.Content className="fixed left-1/2 top-1/2 z-[10000] flex max-h-[min(700px,calc(100vh-48px))] w-[min(520px,calc(100vw-48px))] -translate-x-1/2 -translate-y-1/2 flex-col overflow-hidden rounded-2xl border border-[var(--border-default)] bg-[var(--surface-elevated)] text-[var(--text-primary)] shadow-[var(--shadow-menu)] focus:outline-none">
+ <Dialog.Content onPointerDownOutside={(event) => event.preventDefault()} className="fixed left-1/2 top-1/2 z-[10000] flex max-h-[min(700px,calc(100vh-48px))] w-[min(520px,calc(100vw-48px))] -translate-x-1/2 -translate-y-1/2 flex-col overflow-hidden rounded-2xl border border-[var(--border-default)] bg-[var(--surface-elevated)] text-[var(--text-primary)] shadow-[var(--shadow-menu)] focus:outline-none">
<div className="px-6 pb-4 pt-6">
<Dialog.Title className="text-18 font-medium leading-[1.3]">{title}</Dialog.Title>
<Dialog.Description className="mt-1 text-13 leading-[1.4] text-[var(--text-secondary)]">
diff --git a/apps/desktop/src/renderer/components/settings/XboxGamepadSettings.tsx b/apps/desktop/src/renderer/components/settings/XboxGamepadSettings.tsx
index 5b752ad4be..49a72c98d9 100644
--- a/apps/desktop/src/renderer/components/settings/XboxGamepadSettings.tsx
+++ b/apps/desktop/src/renderer/components/settings/XboxGamepadSettings.tsx
@@ -550,7 +550,7 @@ function XboxGamepadPartEditor({
<Dialog.Root open={open} onOpenChange={onOpenChange}>
<Dialog.Portal>
<Dialog.Overlay className="fixed inset-0 z-[10000] bg-[var(--overlay-modal)]" />
- <Dialog.Content className="fixed left-1/2 top-1/2 z-[10000] flex max-h-[min(700px,calc(100vh-48px))] w-[min(520px,calc(100vw-48px))] -translate-x-1/2 -translate-y-1/2 flex-col overflow-hidden rounded-2xl border border-[var(--border-default)] bg-[var(--surface-elevated)] text-[var(--text-primary)] shadow-[var(--shadow-menu)] focus:outline-none">
+ <Dialog.Content onPointerDownOutside={(event) => event.preventDefault()} className="fixed left-1/2 top-1/2 z-[10000] flex max-h-[min(700px,calc(100vh-48px))] w-[min(520px,calc(100vw-48px))] -translate-x-1/2 -translate-y-1/2 flex-col overflow-hidden rounded-2xl border border-[var(--border-default)] bg-[var(--surface-elevated)] text-[var(--text-primary)] shadow-[var(--shadow-menu)] focus:outline-none">
<div className="px-6 pb-4 pt-6">
<Dialog.Title className="text-18 font-medium leading-[1.3]">{title}</Dialog.Title>
<Dialog.Description className="mt-1 text-13 leading-[1.4] text-[var(--text-secondary)]">
diff --git a/apps/desktop/src/renderer/components/settings/__tests__/CustomProviderDialogAccessibility.test.tsx b/apps/desktop/src/renderer/components/settings/__tests__/CustomProviderDialogAccessibility.test.tsx
index 5c0b3ee2e4..c0376b4335 100644
--- a/apps/desktop/src/renderer/components/settings/__tests__/CustomProviderDialogAccessibility.test.tsx
+++ b/apps/desktop/src/renderer/components/settings/__tests__/CustomProviderDialogAccessibility.test.tsx
@@ -501,7 +501,7 @@ describe('ProviderConnectionDialog accessibility', () => {
expect(onClose).not.toHaveBeenCalled();
});
- it('asks before manually creating an image Provider and X, Escape, or outside do not create it', async () => {
+ it('asks before manually creating an image Provider and ignores outside clicks', async () => {
const { confirmation, onClose, onSaved, user } =
await renderNewImageGenerationReloadConfirmation();
const pendingId = customProviderMocks.createCustomProvider.mock.calls[0]?.[0].id;
@@ -544,13 +544,12 @@ describe('ProviderConnectionDialog accessibility', () => {
expect(overlay).not.toBeNull();
fireEvent.pointerDown(overlay!);
fireEvent.click(overlay!);
- await waitFor(() =>
- expect(
- screen.queryByRole('dialog', {
- name: 'settings.providers.custom.imageGenerationReload.title',
- }),
- ).toBeNull(),
- );
+ expect(
+ screen.getByRole('dialog', {
+ name: 'settings.providers.custom.imageGenerationReload.title',
+ }),
+ ).toBeTruthy();
+ await user.click(within(outsideConfirmation).getByRole('button', { name: '取消' }));
expect(customProviderMocks.createCustomProvider).toHaveBeenCalledTimes(3);
expect(customProviderMocks.createCustomProvider.mock.calls.map((call) => call[0].id)).toEqual([
pendingId,
@@ -585,7 +584,7 @@ describe('ProviderConnectionDialog accessibility', () => {
);
});
- it('asks before a manual image-generation save and closes via X, Escape, or outside without saving', async () => {
+ it('asks before a manual image-generation save and ignores outside clicks', async () => {
const { confirmation, onClose, onSaved, user } =
await renderImageGenerationReloadConfirmation();
expect(customProviderMocks.updateCustomProvider).toHaveBeenCalledWith(
@@ -639,13 +638,12 @@ describe('ProviderConnectionDialog accessibility', () => {
expect(overlay).not.toBeNull();
fireEvent.pointerDown(overlay!);
fireEvent.click(overlay!);
- await waitFor(() =>
- expect(
- screen.queryByRole('dialog', {
- name: 'settings.providers.custom.imageGenerationReload.title',
- }),
- ).toBeNull(),
- );
+ expect(
+ screen.getByRole('dialog', {
+ name: 'settings.providers.custom.imageGenerationReload.title',
+ }),
+ ).toBeTruthy();
+ await user.click(within(outsideConfirmation).getByRole('button', { name: '取消' }));
expect(customProviderMocks.updateCustomProvider).toHaveBeenCalledTimes(3);
expect(onSaved).not.toHaveBeenCalled();
expect(onClose).not.toHaveBeenCalled();
diff --git a/apps/desktop/src/renderer/components/settings/__tests__/CustomProviderRuntimeFillOverlay.test.tsx b/apps/desktop/src/renderer/components/settings/__tests__/CustomProviderRuntimeFillOverlay.test.tsx
index bcb3aa8bac..df3a26c9e3 100644
--- a/apps/desktop/src/renderer/components/settings/__tests__/CustomProviderRuntimeFillOverlay.test.tsx
+++ b/apps/desktop/src/renderer/components/settings/__tests__/CustomProviderRuntimeFillOverlay.test.tsx
@@ -75,6 +75,16 @@ function renderOverlay(value: RuntimeFillDialogState, onClose = vi.fn()) {
}
describe('CustomProviderRuntimeFillOverlay', () => {
+ it('keeps the dialog open after an outside pointer press', () => {
+ const onClose = vi.fn();
+ renderOverlay(state(), onClose);
+
+ fireEvent.pointerDown(document.body);
+
+ expect(onClose).not.toHaveBeenCalled();
+ expect(screen.getByText('settings.providers.custom.runtimeFill.reviewTitle')).not.toBeNull();
+ });
+
it('never reflects request-path query credentials into text or title attributes', () => {
renderOverlay(
state({
diff --git a/apps/desktop/src/renderer/components/sidebar/AccountSwitcherDialog.tsx b/apps/desktop/src/renderer/components/sidebar/AccountSwitcherDialog.tsx
index 61e2b60a6f..553b48dd29 100644
--- a/apps/desktop/src/renderer/components/sidebar/AccountSwitcherDialog.tsx
+++ b/apps/desktop/src/renderer/components/sidebar/AccountSwitcherDialog.tsx
@@ -151,6 +151,7 @@ export function AccountSwitcherDialog({
style={{ WebkitAppRegion: 'no-drag' } as CSSProperties}
/>
<Dialog.Content
+ onPointerDownOutside={(event) => event.preventDefault()}
ref={contentRef}
tabIndex={-1}
className={cn(
diff --git a/apps/desktop/src/renderer/components/sidebar/MobileDownloadDialog.tsx b/apps/desktop/src/renderer/components/sidebar/MobileDownloadDialog.tsx
index 69f00738e1..231e18ff48 100644
--- a/apps/desktop/src/renderer/components/sidebar/MobileDownloadDialog.tsx
+++ b/apps/desktop/src/renderer/components/sidebar/MobileDownloadDialog.tsx
@@ -360,6 +360,7 @@ export function MobileDownloadDialog({
style={{ WebkitAppRegion: 'no-drag' } as React.CSSProperties}
/>
<Dialog.Content
+ onPointerDownOutside={(event) => event.preventDefault()}
className={cn(
'fixed left-1/2 top-1/2 z-[10000] -translate-x-1/2 -translate-y-1/2',
'max-h-[calc(100vh-32px)] w-[400px] max-w-[calc(100vw-32px)] overflow-y-auto overscroll-contain',
diff --git a/apps/desktop/src/renderer/features/bots/BotDeleteDialog.tsx b/apps/desktop/src/renderer/features/bots/BotDeleteDialog.tsx
index e42a49004b..fe647099fc 100644
--- a/apps/desktop/src/renderer/features/bots/BotDeleteDialog.tsx
+++ b/apps/desktop/src/renderer/features/bots/BotDeleteDialog.tsx
@@ -55,7 +55,7 @@ export function BotDeleteDialog({
<Dialog.Root open onOpenChange={(open) => !busy && onOpenChange(open)}>
<Dialog.Portal>
<Dialog.Overlay className="fixed inset-0 z-[70] bg-[var(--overlay-modal)]" />
- <Dialog.Content className="fixed left-1/2 top-1/2 z-[71] w-[min(480px,calc(100vw-32px))] -translate-x-1/2 -translate-y-1/2 rounded-xl border border-[var(--border-default)] bg-[var(--surface-elevated)] p-5 outline-none">
+ <Dialog.Content onPointerDownOutside={(event) => event.preventDefault()} className="fixed left-1/2 top-1/2 z-[71] w-[min(480px,calc(100vw-32px))] -translate-x-1/2 -translate-y-1/2 rounded-xl border border-[var(--border-default)] bg-[var(--surface-elevated)] p-5 outline-none">
<div className="flex items-start justify-between gap-4">
<div>
<Dialog.Title className="text-16 font-medium text-[var(--text-danger)]">
diff --git a/apps/desktop/src/renderer/features/bots/BotRosterView.tsx b/apps/desktop/src/renderer/features/bots/BotRosterView.tsx
index 5cf236c104..bd031a760d 100644
--- a/apps/desktop/src/renderer/features/bots/BotRosterView.tsx
+++ b/apps/desktop/src/renderer/features/bots/BotRosterView.tsx
@@ -115,7 +115,7 @@ export function BotRosterView({ onCreated, onClose, restoreFocus, inline = false
return (
<Dialog.Root open onOpenChange={open => { if (!open && !creating) close(); }}><Dialog.Portal>
<Dialog.Overlay className="fixed inset-0 z-50 bg-[var(--overlay-modal)]" />
- <Dialog.Content aria-describedby={undefined} onCloseAutoFocus={event => { if (restoreFocus) { event.preventDefault(); restoreFocus(); } }}
+ <Dialog.Content aria-describedby={undefined} onPointerDownOutside={(event) => event.preventDefault()} onCloseAutoFocus={event => { if (restoreFocus) { event.preventDefault(); restoreFocus(); } }}
className="fixed left-1/2 top-1/2 z-50 max-h-[90vh] w-[calc(100vw-32px)] max-w-[520px] -translate-x-1/2 -translate-y-1/2 overflow-y-auto rounded-xl border border-[var(--border-default)] bg-[var(--surface)] p-6 text-[var(--text-primary)] outline-none sm:p-8">
{content}
</Dialog.Content>
diff --git a/apps/desktop/src/renderer/features/bots/BotSettingsDrawer.tsx b/apps/desktop/src/renderer/features/bots/BotSettingsDrawer.tsx
index 1cda737122..96b4989921 100644
--- a/apps/desktop/src/renderer/features/bots/BotSettingsDrawer.tsx
+++ b/apps/desktop/src/renderer/features/bots/BotSettingsDrawer.tsx
@@ -98,6 +98,7 @@ export function BotSettingsDrawer() {
{/* Keep portaled controls inside the overlay’s React tree so its scroll lock allows them. */}
<Dialog.Overlay className="fixed inset-0 z-50 bg-[var(--overlay-modal)]">
<Dialog.Content
+ onPointerDownOutside={(event) => event.preventDefault()}
aria-describedby={undefined}
// CJK IME: Escape during composition only cancels the candidate.
onEscapeKeyDown={(event) => {
diff --git a/apps/desktop/src/renderer/features/cc-agent/CreateWorkerPopover.tsx b/apps/desktop/src/renderer/features/cc-agent/CreateWorkerPopover.tsx
index b39b41f815..2e748380df 100644
--- a/apps/desktop/src/renderer/features/cc-agent/CreateWorkerPopover.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/CreateWorkerPopover.tsx
@@ -644,7 +644,7 @@ export function CreateWorkerPopover({
return (
<div className={cn('fixed inset-0 z-50 flex items-center justify-center', className)}>
- <div className="absolute inset-0 bg-[var(--overlay-modal)]" onClick={onClose} />
+ <div className="absolute inset-0 bg-[var(--overlay-modal)]" />
<div
className="relative z-10 w-[500px] rounded-2xl border border-[var(--border-default)] bg-[var(--surface-elevated)] p-6"
style={{ boxShadow: 'var(--shadow-menu)' }}
diff --git a/apps/desktop/src/renderer/features/cc-agent/SessionBranchTreeDialog.tsx b/apps/desktop/src/renderer/features/cc-agent/SessionBranchTreeDialog.tsx
index 83be97c769..6755e0b843 100644
--- a/apps/desktop/src/renderer/features/cc-agent/SessionBranchTreeDialog.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/SessionBranchTreeDialog.tsx
@@ -240,6 +240,7 @@ export function SessionBranchTreeDialog({
<Dialog.Portal>
<Dialog.Overlay className="fixed inset-0 z-[10000] bg-[var(--overlay-modal)]" />
<Dialog.Content
+ onPointerDownOutside={(event) => event.preventDefault()}
className="fixed left-1/2 top-1/2 z-[10001] flex max-h-[min(760px,calc(100vh-48px))] w-[min(620px,calc(100vw-32px))] -translate-x-1/2 -translate-y-1/2 flex-col overflow-hidden rounded-xl border shadow-[var(--confirm-shadow)]"
style={{ backgroundColor: 'var(--confirm-bg)', borderColor: 'var(--border-default)', WebkitAppRegion: 'no-drag' } as React.CSSProperties}
>
diff --git a/apps/desktop/src/renderer/features/cc-agent/__tests__/CreateWorkerPopover.test.tsx b/apps/desktop/src/renderer/features/cc-agent/__tests__/CreateWorkerPopover.test.tsx
index 57843e33fb..0994786a14 100644
--- a/apps/desktop/src/renderer/features/cc-agent/__tests__/CreateWorkerPopover.test.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/__tests__/CreateWorkerPopover.test.tsx
@@ -273,6 +273,24 @@ describe('CreateWorkerPopover', () => {
expect(initialTask.className).toContain('h-[96px]');
});
+ it('keeps the draft when clicking the scrim and closes via the explicit button', () => {
+ const onClose = vi.fn();
+ render(<CreateWorkerPopover open onClose={onClose} onCreate={vi.fn()} />);
+
+ const initialTask = screen.getByPlaceholderText(
+ 'orca.createWorker.initialTaskPlaceholder',
+ ) as HTMLTextAreaElement;
+ fireEvent.change(initialTask, { target: { value: 'Draft a plan' } });
+ const panel = screen.getByText('orca.createWorker.title').closest('.relative.z-10');
+ fireEvent.click(panel!.previousElementSibling!);
+
+ expect(onClose).not.toHaveBeenCalled();
+ expect(initialTask.value).toBe('Draft a plan');
+
+ fireEvent.click(screen.getByRole('button', { name: 'orca.createWorker.closeAria' }));
+ expect(onClose).toHaveBeenCalledOnce();
+ });
+
it('labels the worker role as a name and exposes an explanation', () => {
render(<CreateWorkerPopover open onClose={vi.fn()} onCreate={vi.fn()} />);
diff --git a/apps/desktop/src/renderer/features/device-link/SharedTaskDialog.tsx b/apps/desktop/src/renderer/features/device-link/SharedTaskDialog.tsx
index f3857c0720..5b4a9a1faa 100644
--- a/apps/desktop/src/renderer/features/device-link/SharedTaskDialog.tsx
+++ b/apps/desktop/src/renderer/features/device-link/SharedTaskDialog.tsx
@@ -376,7 +376,7 @@ export function SharedTaskDialog({ open, onOpenChange, session, returnFocus }: {
onOpenAutoFocus={event => { if (!initialTarget) { event.preventDefault(); codeInput.current?.focus(); } }}
onCloseAutoFocus={returnFocus ? event => { event.preventDefault(); returnFocus(); } : undefined}
onEscapeKeyDown={event => { if (pending.current || confirm || target) { event.preventDefault(); if (confirm) cancel(); else if (target) back(); } }}
- onInteractOutside={event => { if (pending.current || confirm) event.preventDefault(); }}>
+ onInteractOutside={event => event.preventDefault()}>
<div className="mb-5 flex items-center justify-between gap-3"><div className="flex min-w-0 items-center gap-2">
{target && !confirm && <Button variant="secondary" tone="quiet" size="lg" className="w-9 shrink-0 p-0" aria-label={t('sharedTask.back')} disabled={busy} onClick={back}><ArrowLeft size={18} aria-hidden /></Button>}
<Dialog.Title className="text-18 font-medium">{confirm ? confirmTitle : t(target ? 'sharedTask.manageSharing' : success ? 'sharedTask.joined' : 'sharedTask.title')}</Dialog.Title></div>
diff --git a/apps/desktop/src/renderer/features/device-link/SharedTaskEndedNotice.tsx b/apps/desktop/src/renderer/features/device-link/SharedTaskEndedNotice.tsx
index 56001158f4..e017d2134a 100644
--- a/apps/desktop/src/renderer/features/device-link/SharedTaskEndedNotice.tsx
+++ b/apps/desktop/src/renderer/features/device-link/SharedTaskEndedNotice.tsx
@@ -33,7 +33,7 @@ export function SharedTaskEndedNotice({ onJoin }: { onJoin(): void }) {
return <Dialog.Root open={open} onOpenChange={(next) => { if (!next) setOwner(null); }}>
<Dialog.Portal>
<Dialog.Overlay className="fixed inset-0 z-[10000] bg-[var(--overlay-modal)]" />
- <Dialog.Content className="fixed left-1/2 top-1/2 z-[10001] max-h-[calc(100dvh-32px)] w-[min(440px,calc(100vw-32px))] -translate-x-1/2 -translate-y-1/2 overflow-y-auto rounded-xl border border-[var(--border-default)] bg-[var(--surface-elevated)] p-4 text-[var(--text-primary)]">
+ <Dialog.Content onPointerDownOutside={(event) => event.preventDefault()} className="fixed left-1/2 top-1/2 z-[10001] max-h-[calc(100dvh-32px)] w-[min(440px,calc(100vw-32px))] -translate-x-1/2 -translate-y-1/2 overflow-y-auto rounded-xl border border-[var(--border-default)] bg-[var(--surface-elevated)] p-4 text-[var(--text-primary)]">
<div className="mb-4 flex items-center justify-between gap-2">
<Dialog.Title className="text-18 font-medium">{t('sharedTask.ended')}</Dialog.Title>
<Dialog.Close asChild><Button variant="secondary" size="lg" className="w-9 border-transparent bg-transparent p-0" aria-label={t('sharedTask.dismiss')}><X size={18} aria-hidden /></Button></Dialog.Close>
diff --git a/apps/desktop/src/renderer/features/plugin/AddMarketplaceDialog.tsx b/apps/desktop/src/renderer/features/plugin/AddMarketplaceDialog.tsx
index 3c310c7316..34d49da83f 100644
--- a/apps/desktop/src/renderer/features/plugin/AddMarketplaceDialog.tsx
+++ b/apps/desktop/src/renderer/features/plugin/AddMarketplaceDialog.tsx
@@ -183,6 +183,7 @@ export function AddMarketplaceDialog({
style={{ WebkitAppRegion: 'no-drag' } as React.CSSProperties}
/>
<Dialog.Content
+ onPointerDownOutside={(event) => event.preventDefault()}
className={cn(
'fixed left-1/2 top-1/2 z-[10000] -translate-x-1/2 -translate-y-1/2',
'flex max-h-[85vh] w-full select-none flex-col rounded-xl p-4',
diff --git a/apps/desktop/src/renderer/features/plugin/GhostPluginDetailView.tsx b/apps/desktop/src/renderer/features/plugin/GhostPluginDetailView.tsx
index 9fdfa1a8b1..116575861b 100644
--- a/apps/desktop/src/renderer/features/plugin/GhostPluginDetailView.tsx
+++ b/apps/desktop/src/renderer/features/plugin/GhostPluginDetailView.tsx
@@ -974,6 +974,7 @@ function DialogFrame({ children }: { children: ReactNode }) {
style={WINDOW_NO_DRAG_STYLE}
/>
<Dialog.Content
+ onPointerDownOutside={(event) => event.preventDefault()}
className="fixed left-1/2 top-1/2 z-[10000] flex max-h-[70vh] w-[calc(100vw-48px)] max-w-[560px] -translate-x-1/2 -translate-y-1/2 flex-col overflow-hidden rounded-xl border border-[var(--border-default)] bg-[var(--surface-elevated)] text-[var(--text-primary)] shadow-[var(--shadow-menu)] focus:outline-none"
style={WINDOW_NO_DRAG_STYLE}
>
diff --git a/apps/desktop/src/renderer/features/plugin/MarketplaceGuideDialog.tsx b/apps/desktop/src/renderer/features/plugin/MarketplaceGuideDialog.tsx
index 878b036ebf..f5cfb64162 100644
--- a/apps/desktop/src/renderer/features/plugin/MarketplaceGuideDialog.tsx
+++ b/apps/desktop/src/renderer/features/plugin/MarketplaceGuideDialog.tsx
@@ -122,6 +122,7 @@ export function MarketplaceGuideDialog({ open, onOpenChange }: MarketplaceGuideD
style={{ WebkitAppRegion: 'no-drag' } as CSSProperties}
/>
<Dialog.Content
+ onPointerDownOutside={(event) => event.preventDefault()}
className={cn(
'fixed left-1/2 top-1/2 z-[10001] -translate-x-1/2 -translate-y-1/2',
'flex max-h-[85vh] w-full select-none flex-col rounded-xl p-4',
diff --git a/apps/desktop/src/renderer/features/plugin/MarketplaceSourcesDialog.tsx b/apps/desktop/src/renderer/features/plugin/MarketplaceSourcesDialog.tsx
index 28c0f26397..fd4cb84560 100644
--- a/apps/desktop/src/renderer/features/plugin/MarketplaceSourcesDialog.tsx
+++ b/apps/desktop/src/renderer/features/plugin/MarketplaceSourcesDialog.tsx
@@ -139,6 +139,7 @@ export function MarketplaceSourcesDialog({
style={{ WebkitAppRegion: 'no-drag' } as CSSProperties}
/>
<Dialog.Content
+ onPointerDownOutside={(event) => event.preventDefault()}
className={cn(
'fixed left-1/2 top-1/2 z-[10001] -translate-x-1/2 -translate-y-1/2',
'flex max-h-[85vh] w-full select-none flex-col rounded-xl p-4',
diff --git a/apps/desktop/src/renderer/features/plugin/UpdateAllDialog.tsx b/apps/desktop/src/renderer/features/plugin/UpdateAllDialog.tsx
index 315e9b4500..a23c9038ab 100644
--- a/apps/desktop/src/renderer/features/plugin/UpdateAllDialog.tsx
+++ b/apps/desktop/src/renderer/features/plugin/UpdateAllDialog.tsx
@@ -81,6 +81,7 @@ export function UpdateAllDialog({
style={WINDOW_NO_DRAG_STYLE}
/>
<Dialog.Content
+ onPointerDownOutside={(event) => event.preventDefault()}
className="fixed left-1/2 top-1/2 z-[10000] flex max-h-[70vh] w-[calc(100vw-48px)] max-w-[520px] -translate-x-1/2 -translate-y-1/2 flex-col overflow-hidden rounded-xl border border-[var(--border-default)] bg-[var(--surface-elevated)] text-[var(--text-primary)] shadow-[var(--shadow-menu)] focus:outline-none"
style={WINDOW_NO_DRAG_STYLE}
>
diff --git a/apps/desktop/src/renderer/features/skillhub/PublishDialog.tsx b/apps/desktop/src/renderer/features/skillhub/PublishDialog.tsx
index bc26d1637c..287ae4d183 100644
--- a/apps/desktop/src/renderer/features/skillhub/PublishDialog.tsx
+++ b/apps/desktop/src/renderer/features/skillhub/PublishDialog.tsx
@@ -988,10 +988,7 @@ export function PublishDialog({
style={{ WebkitAppRegion: 'no-drag' } as React.CSSProperties}
/>
<Dialog.Content
- // working 时禁止 outside-click / Escape 直接关——走 cancel confirm 流程
- onPointerDownOutside={(e) => {
- if (isWorking && pubState.phase !== 'scanning') e.preventDefault();
- }}
+ onPointerDownOutside={(event) => event.preventDefault()}
onEscapeKeyDown={(e) => {
if (isWorking && pubState.phase !== 'scanning') e.preventDefault();
}}
diff --git a/apps/desktop/src/renderer/features/skillhub/ScanResultDialog.tsx b/apps/desktop/src/renderer/features/skillhub/ScanResultDialog.tsx
index b4f05c7c0c..41fda4633e 100644
--- a/apps/desktop/src/renderer/features/skillhub/ScanResultDialog.tsx
+++ b/apps/desktop/src/renderer/features/skillhub/ScanResultDialog.tsx
@@ -227,6 +227,7 @@ export function ScanResultDialog({ open, onClose, result }: ScanResultDialogProp
style={{ WebkitAppRegion: 'no-drag' } as React.CSSProperties}
/>
<Dialog.Content
+ onPointerDownOutside={(event) => event.preventDefault()}
className={cn(
'fixed left-1/2 top-1/2 z-[10000] -translate-x-1/2 -translate-y-1/2',
'w-full max-w-[480px] rounded-xl',
diff --git a/apps/desktop/src/renderer/features/skillhub/SkillhubDetailView.tsx b/apps/desktop/src/renderer/features/skillhub/SkillhubDetailView.tsx
index 6ee339b0e2..2aea666926 100644
--- a/apps/desktop/src/renderer/features/skillhub/SkillhubDetailView.tsx
+++ b/apps/desktop/src/renderer/features/skillhub/SkillhubDetailView.tsx
@@ -769,6 +769,7 @@ function DiagnosisAgentPickerDialog({
style={{ WebkitAppRegion: 'no-drag' } as CSSProperties}
/>
<Dialog.Content
+ onPointerDownOutside={(event) => event.preventDefault()}
className={cn(
'fixed left-1/2 top-1/2 z-[10000] w-full max-w-[420px] -translate-x-1/2 -translate-y-1/2',
'rounded-xl border border-[var(--cmd-palette-border)] bg-[var(--cmd-palette-bg)] p-5',
diff --git a/apps/desktop/src/renderer/features/skillhub/components/InstallTargetPicker.tsx b/apps/desktop/src/renderer/features/skillhub/components/InstallTargetPicker.tsx
index aa214a2bc1..95947271c4 100644
--- a/apps/desktop/src/renderer/features/skillhub/components/InstallTargetPicker.tsx
+++ b/apps/desktop/src/renderer/features/skillhub/components/InstallTargetPicker.tsx
@@ -264,7 +264,7 @@ export function InstallTargetPicker({
event.stopPropagation();
if (installingRef.current || event.isComposing || event.keyCode === 229) event.preventDefault();
}}
- onPointerDownOutside={(event) => { if (installingRef.current) event.preventDefault(); }}
+ onPointerDownOutside={(event) => event.preventDefault()}
>
<div
className="flex items-start justify-between gap-3"
diff --git a/apps/desktop/src/renderer/features/skillhub/components/MarketInfoEditDialog.tsx b/apps/desktop/src/renderer/features/skillhub/components/MarketInfoEditDialog.tsx
index 06edc0bf2f..e4cfb9380c 100644
--- a/apps/desktop/src/renderer/features/skillhub/components/MarketInfoEditDialog.tsx
+++ b/apps/desktop/src/renderer/features/skillhub/components/MarketInfoEditDialog.tsx
@@ -153,6 +153,7 @@ export function MarketInfoEditDialog({
style={{ WebkitAppRegion: 'no-drag' } as React.CSSProperties}
/>
<Dialog.Content
+ onPointerDownOutside={(event) => event.preventDefault()}
className={cn(
'fixed left-1/2 top-1/2 z-[10000] -translate-x-1/2 -translate-y-1/2',
'w-full max-w-[480px] rounded-xl',
diff --git a/apps/desktop/src/renderer/features/skillhub/components/VisibilityEditorDialog.tsx b/apps/desktop/src/renderer/features/skillhub/components/VisibilityEditorDialog.tsx
index 041f9704d8..58c72acada 100644
--- a/apps/desktop/src/renderer/features/skillhub/components/VisibilityEditorDialog.tsx
+++ b/apps/desktop/src/renderer/features/skillhub/components/VisibilityEditorDialog.tsx
@@ -137,6 +137,7 @@ export function VisibilityEditorDialog({
style={{ WebkitAppRegion: 'no-drag' } as React.CSSProperties}
/>
<Dialog.Content
+ onPointerDownOutside={(event) => event.preventDefault()}
className={cn(
'fixed left-1/2 top-1/2 z-[10000] -translate-x-1/2 -translate-y-1/2',
'w-full max-w-[480px] rounded-xl',
diff --git a/apps/desktop/src/renderer/features/task-tags/TaskTags.tsx b/apps/desktop/src/renderer/features/task-tags/TaskTags.tsx
index 138fd12036..33213534dc 100644
--- a/apps/desktop/src/renderer/features/task-tags/TaskTags.tsx
+++ b/apps/desktop/src/renderer/features/task-tags/TaskTags.tsx
@@ -517,6 +517,7 @@ export function TaskTagEditor({ session, onClose }: { session: Session; onClose:
<Dialog.Portal>
<Dialog.Overlay className="fixed inset-0 z-[200] bg-[var(--overlay-modal)]" />
<Dialog.Content
+ onPointerDownOutside={(event) => event.preventDefault()}
onClick={(e) => e.stopPropagation()}
onPointerDown={(e) => e.stopPropagation()}
onDragStart={(e) => e.stopPropagation()}
diff --git a/docs/design-rules/DESIGN.md b/docs/design-rules/DESIGN.md
index cb8a2393b4..6504ccb034 100644
--- a/docs/design-rules/DESIGN.md
+++ b/docs/design-rules/DESIGN.md
@@ -357,7 +357,7 @@ Reference implementation: `apps/desktop/src/renderer/components/ui/confirm-dialo
- **Title / description**: `--confirm-title` / `--confirm-desc`, medium weight.
- **Buttons**: pill (9999px); primary = inverse neutral (`--confirm-btn-primary-*`, not an automatic CTA assignment), secondary/cancel = outlined (`--confirm-btn-secondary-*`, transparent fill + Board border); footer `justify-end`.
- **Focus on open**: dismissible forms focus their primary input. Ordinary AlertDialog confirmation retains Cancel by default; explicit `autoFocusConfirm` focuses the primary action, while a required typed confirmation takes precedence. Preserve primary → optional third → Cancel DOM order (DS-6 decision).
-- **Closing affordance** (made explicit 2026-07-30, scope clarified 2026-07-31): **dismissible** dialogs (wizards, catalogs, forms — anything a user may abandon freely) close via the footer Cancel button, Esc, and a scrim click, and carry **no top-right × close icon** — a × coexisting with Cancel is a spec violation, not a convenience. Confirm-tier dialogs built on AlertDialog (ConfirmDialog) intentionally do **not** close on scrim click (a deliberate mis-tap guard) — that behavior stays. The provider form has no ×. Its existing image-generation interruption confirmation is a separate business layer and retains its current dismissal contract.
+- **Closing affordance** (made explicit 2026-07-30, updated 2026-09-24): dialogs with a Cancel action (wizards, catalogs, forms) close via the footer Cancel button or Esc, **not by clicking the scrim** — a mis-tap must not discard an in-progress form. They carry **no top-right × close icon** — a × coexisting with Cancel is a spec violation. Confirm-tier dialogs built on AlertDialog (ConfirmDialog) also do **not** close on scrim click. The provider form has no ×; its image-generation interruption confirmation remains a separate business layer. Implementation and regressions: [AddProviderWizard](../../apps/desktop/src/renderer/components/settings/AddProviderWizard.tsx), [provider dialog tests](../../apps/desktop/src/renderer/components/settings/__tests__/CustomProviderDialogAccessibility.test.tsx).
- **Multi-step dialogs / wizards** (registered 2026-07-30, first consumer: Add-Provider wizard): the step indicator lives in the header row (round numbered chips — current step solid `--accent-cta-bg` with `--surface-on-card` text, completed steps ✓ on `--surface-chip`, upcoming outlined `--border-default`). Footer: **back navigation ("← 上一步") is a left-aligned bare text button** (`--text-secondary`, 13px/500, no background — the §5 bare-text-button exemption, no radius) — navigation is not a commit action and must not sit inside the right-aligned pill group; commit actions (取消 / 下一步 / 完成) remain right-aligned pills per the button rule above. Catalog/list steps put the scrollable region between **two full-width 1px `--border-default` hairlines**, with permanent entries (e.g. 自定义端点) pinned below the scroll region, always visible. Width matches the custom-provider form dialog (600px, `min(600px, 100vw-32px)`) so the two provider dialogs read as one family; height is capped at `min(640px, 85vh)` — on large displays a catalog dialog must not stretch toward full-screen height (2026-07-30 ruling).
### Tabs