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(model-selector): 模态对话框内统一模型面板放行滚轮滚动

Zhao Dengfengf2a56a2480d1
diff --git a/apps/desktop/src/renderer/__tests__/unifiedModelPanelRendering.test.tsx b/apps/desktop/src/renderer/__tests__/unifiedModelPanelRendering.test.tsx
index 240d309500..c7783a0658 100644
--- a/apps/desktop/src/renderer/__tests__/unifiedModelPanelRendering.test.tsx
+++ b/apps/desktop/src/renderer/__tests__/unifiedModelPanelRendering.test.tsx
@@ -4337,3 +4337,27 @@ describe('harness configuration keeps the model menu open', () => {
.querySelector('[data-engine-capsule="codex"]')?.getAttribute('aria-pressed')).toBe('true');
});
});
+
+describe('模态对话框滚动锁下的面板滚轮放行', () => {
+ // 回归(2026-10-22 用户报告:添加伙伴对话框里服务商一多,左侧 rail 任何方式都滚不到,
+ // 右侧列表只能拖滚动条)。根因:Radix 模态 Dialog 用 react-remove-scroll 锁背景滚动,
+ // 其 document 冒泡段 wheel 监听把落在对话框内容(shard)之外的事件一律 preventDefault;
+ // 面板 portal 到 body,不在 shard 内,滚轮全灭。修复 = 面板各滚动面上 stopPropagation,
+ // 事件到不了 document 就不会被拦,原生滚动照常。这里挂 document 级 wheel 监听模拟
+ // react-remove-scroll 的挂载点:修复前这些 wheel 全部到达 document(断言失败),
+ // 修复后一个都不该到达。
+ it('列表、rail 与配置浮层的 wheel 事件不泄露到 document', async () => {
+ renderPanel();
+ const reachedDocument = vi.fn();
+ document.addEventListener('wheel', reachedDocument);
+ try {
+ fireEvent.wheel(screen.getByRole('listbox'), { deltaY: 240 });
+ fireEvent.wheel(document.querySelector('[data-rail-item="all"]')!, { deltaY: 240 });
+ const flyout = await openRowFlyout('Opus 5');
+ fireEvent.wheel(flyout, { deltaY: 120 });
+ expect(reachedDocument).not.toHaveBeenCalled();
+ } finally {
+ document.removeEventListener('wheel', reachedDocument);
+ }
+ });
+});
diff --git a/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx b/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx
index ddd0333c36..e4f4a897a1 100644
--- a/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx
+++ b/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx
@@ -72,6 +72,7 @@ import {
type UnifiedModelPanelProps,
type UnifiedSelectedRow,
} from './UnifiedModelPanel';
+import { stopWheelPropagation } from '@/lib/stopWheelPropagation';
import type { ProviderGroupUsageOf, ProviderUsageScope } from './useProviderWeeklyQuota';
import { ThinkingToggle } from './ThinkingToggle';
import { useModelDiscoveryPending } from './useModelDiscoveryPending';
@@ -345,6 +346,9 @@ function ModelOptionsFloatingPanel({
data-state="open"
data-side={placedSide}
data-testid="model-options-floating-panel"
+ // 与统一面板同因:portal 在 body,模态对话框里滚轮会被 react-remove-scroll
+ // 拦掉;stopPropagation 放行原生滚动(见 stopWheelPropagation 注释)。
+ onWheel={stopWheelPropagation}
onPointerEnter={onCancelClose}
onPointerLeave={onScheduleClose}
onFocusCapture={onCancelClose}
diff --git a/apps/desktop/src/renderer/components/new-chat/UnifiedFlyoutHost.tsx b/apps/desktop/src/renderer/components/new-chat/UnifiedFlyoutHost.tsx
index c5216945a6..540053bd4c 100644
--- a/apps/desktop/src/renderer/components/new-chat/UnifiedFlyoutHost.tsx
+++ b/apps/desktop/src/renderer/components/new-chat/UnifiedFlyoutHost.tsx
@@ -6,6 +6,7 @@ import type { ProviderView } from '@cindy/model-providers';
import { WINDOW_NO_DRAG_STYLE } from '@/components/layout/windowDrag';
import { cn } from '@/lib/utils';
+import { stopWheelPropagation } from '@/lib/stopWheelPropagation';
import { ProviderMark } from './ModelSelector';
import { computeFlyoutPlacement, UNIFIED_FLYOUT_GAP } from './unifiedModelSelection';
@@ -187,6 +188,9 @@ export function UnifiedFlyoutHost({
ref={flyoutRef}
role="dialog"
data-testid="unified-model-config-flyout"
+ // 浮层 portal 在 body,模态对话框里滚轮会被 react-remove-scroll 拦掉,
+ // 里面的账号列表(max-h-72 overflow-y-auto)就滚不动;放行原生滚动。
+ onWheel={stopWheelPropagation}
className={cn(
// 设计稿 .flyout:padding 14px 14px 12px。
// 12px 容器档 + 登记浮层阴影 + 共享菜单面板材质(DESIGN §4 / §5 / §15.12)。
diff --git a/apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsx b/apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsx
index eda6019a28..2412b37cee 100644
--- a/apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsx
+++ b/apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsx
@@ -38,6 +38,7 @@ import { useProviderModelMemoryVersion } from '@/state/providerModelMemory';
import { useAgentDeviceModelMemoryVersion } from '@/state/agentDeviceModelMemory';
import { flashScrollbar } from '@/lib/scrollbarAutoHide';
+import { stopWheelPropagation } from '@/lib/stopWheelPropagation';
import { MORPH_CONTENT_RESIZE_EVENT } from '@/components/ui/morph-popover';
import { isProviderShareAgentDeviceId } from '../../../shared/providerShare';
@@ -1330,6 +1331,9 @@ export function UnifiedModelPanel({
)}
// Body height is independent of filtered results; min-h-0 still permits
// the popover's viewport constraint to shrink this scroll area.
+ // onWheel:模态对话框(添加伙伴 / 伙伴设置等)里 react-remove-scroll 在
+ // document 拦浮层滚轮,不放行的话列表只能靠拖滚动条(原理见 helper 注释)。
+ onWheel={stopWheelPropagation}
onScroll={() => {
// 点击打开的配置保持展开;浮层宿主在滚动时重新定位。
// 程序化对齐不取消在途的选中行定位。
diff --git a/apps/desktop/src/renderer/components/new-chat/UnifiedModelRail.tsx b/apps/desktop/src/renderer/components/new-chat/UnifiedModelRail.tsx
index 3c4649eff8..0e1634c913 100644
--- a/apps/desktop/src/renderer/components/new-chat/UnifiedModelRail.tsx
+++ b/apps/desktop/src/renderer/components/new-chat/UnifiedModelRail.tsx
@@ -6,6 +6,7 @@ import type { ProviderView } from '@cindy/model-providers';
import { cn } from '@/lib/utils';
import { providerAccountLabel } from '@/lib/providerDisplayName';
+import { stopWheelPropagation } from '@/lib/stopWheelPropagation';
import { Tip } from '@/components/ui/tooltip';
import {
@@ -74,7 +75,12 @@ export function UnifiedModelRail({
return (
// 设计稿 .rail:宽 48(含 6px 侧距 + 1px 右分隔线)、纵向 8px、格间 2px。
// 与侧栏窄图标栏一致:滚动条不占宽度,避免挤压按钮并触发横向溢出。
- <div className="flex min-h-0 w-12 shrink-0 flex-col items-center gap-0.5 overflow-x-hidden overflow-y-auto scrollbar-hide border-r border-[var(--model-dropdown-border)] px-1.5 py-2">
+ // onWheel:模态对话框里 react-remove-scroll 会拦下浮层的滚轮,rail 又藏着
+ // 滚动条,不放行的话供应商一多就完全滚不到(stopWheelPropagation 注释有全景)。
+ <div
+ className="flex min-h-0 w-12 shrink-0 flex-col items-center gap-0.5 overflow-x-hidden overflow-y-auto scrollbar-hide border-r border-[var(--model-dropdown-border)] px-1.5 py-2"
+ onWheel={stopWheelPropagation}
+ >
{items.map((item, index) => {
const key = railItemKey(item);
const isActive = activeKey === key;
diff --git a/apps/desktop/src/renderer/lib/stopWheelPropagation.ts b/apps/desktop/src/renderer/lib/stopWheelPropagation.ts
new file mode 100644
index 0000000000..0d0a663f86
--- /dev/null
+++ b/apps/desktop/src/renderer/lib/stopWheelPropagation.ts
@@ -0,0 +1,20 @@
+import type { WheelEvent } from 'react';
+
+/**
+ * 浮层滚轮放行
+ * ---------------------------------------------------------------------------
+ * Radix 模态 Dialog 用 react-remove-scroll 锁背景滚动:它在 document 冒泡段
+ * 挂 wheel / touchmove 监听,把落在对话框内容(shard)之外的事件一律
+ * preventDefault。portal 到 body 的浮层(Radix Popover、统一模型面板及其
+ * 配置浮层)因此整体滚轮失效——带滚动条的列表只剩拖动滑条一条路,
+ * scrollbar-hide 的窄栏则完全滚不动(2026-10-22 实测:添加伙伴对话框里
+ * 服务商一多,左侧 rail 溢出的部分任何方式都滚不到)。
+ *
+ * 事件在到达 document 之前先经过浮层自身;在这里 stopPropagation,
+ * react-remove-scroll 的 document 监听收不到事件,自然不会拦默认行为,
+ * 浏览器原生滚动(含触控板惯性)照常发生。对话框之外没有滚动锁时,
+ * 这只是一个无害的 no-op。同款手法早已用在 ScheduleChips 的 stopWheel。
+ */
+export function stopWheelPropagation(event: WheelEvent<HTMLElement>): void {
+ event.stopPropagation();
+}