Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(desktop): 查找栏标 no-drag,新建页与插件页上可正常关闭 (#5202)
yuib7967db99cbe
diff --git a/apps/desktop/src/renderer/components/find-in-page/FindInPageBar.tsx b/apps/desktop/src/renderer/components/find-in-page/FindInPageBar.tsxindex d030759a19..20061284d2 100644--- a/apps/desktop/src/renderer/components/find-in-page/FindInPageBar.tsx+++ b/apps/desktop/src/renderer/components/find-in-page/FindInPageBar.tsx@@ -4,6 +4,7 @@ import { ChevronDown, ChevronUp, X } from 'lucide-react';import { cn } from '@/lib/utils';import { useAppShortcut } from '@/hooks/useAppShortcut';+import { WINDOW_NO_DRAG_STYLE } from '@/components/layout/windowDrag';import { isFindInPageClaimed } from './findInPageOwnership';const MATCH_HIGHLIGHT_NAME = 'cindy-find-in-page-match';@@ -663,6 +664,12 @@ export function FindInPageBar() {// 关闭走 unmount 直接消失(查找栏关闭要"立即让路",不做 exit)。'origin-top-right animate-float-in',)}+ // 页面顶行的窗口拖拽区(新建草稿页的 InvisibleWindowDragStrip、插件页+ // 页头等)与本栏几何重叠;拖拽区不看 z-index,会把关闭 / 翻页按钮上的+ // 点击当成拖窗吞掉(#3908)。自身标 no-drag 挖洞,同 GhostPanelBubbleLayer。+ // ⚠️ 挖洞成立依赖布局树顺序(规则见 windowDrag.tsx 头注):本栏在 App.tsx+ // 里必须排在承载页面路由的 LoginHandoffHost 之后,别把它挪到路由前面。+ style={WINDOW_NO_DRAG_STYLE}role="dialog"aria-label={t('findInPage.dialogAriaLabel')}>diff --git a/apps/desktop/src/renderer/components/find-in-page/__tests__/FindInPageBar.test.tsx b/apps/desktop/src/renderer/components/find-in-page/__tests__/FindInPageBar.test.tsxindex 92cade3d7d..eb64782b33 100644--- a/apps/desktop/src/renderer/components/find-in-page/__tests__/FindInPageBar.test.tsx+++ b/apps/desktop/src/renderer/components/find-in-page/__tests__/FindInPageBar.test.tsx@@ -440,6 +440,14 @@ describe('FindInPageBar', () => {await waitFor(() => expect(screen.getByText('0/0')).toBeTruthy());});+ it('opts out of window drag regions so page drag strips cannot swallow its buttons', async () => {+ await openFindBar();+ const dialog = screen.getByRole('dialog');+ expect(+ (dialog.style as CSSStyleDeclaration & { WebkitAppRegion?: string }).WebkitAppRegion,+ ).toBe('no-drag');+ });+it('clears highlights when the query is cleared or the bar closes', async () => {const page = document.createElement('main');page.textContent = 'foo';diff --git a/apps/desktop/src/renderer/components/layout/windowDrag.tsx b/apps/desktop/src/renderer/components/layout/windowDrag.tsxindex b0ab1a836b..08fd09b526 100644--- a/apps/desktop/src/renderer/components/layout/windowDrag.tsx+++ b/apps/desktop/src/renderer/components/layout/windowDrag.tsx@@ -10,10 +10,15 @@* - 页面顶部是空白(居中布局的 empty state / hero)→ 根部叠一条* <InvisibleWindowDragStrip />。*- * ⚠️ Electron 拖拽区域是纯几何计算:drag 矩形减 no-drag 矩形,与 z-index /- * paint 顺序无关;但 no-drag 挖洞只在 drag 元素自己的**后代**上可靠生效,- * 浮层/兄弟节点上的 no-drag 不被计入(实机结论,见 ContentHeader.tsx:155-157- * / FileTabsBar.tsx:421-425)。交互元素漏标 no-drag 会变成"点了就拖窗口";+ * ⚠️ Electron 拖拽区域是纯几何计算,与 z-index / paint 顺序无关:renderer 按+ * **布局树先序**上报 drag / no-drag 矩形,重叠处**列表中靠后者胜**(Electron+ * shell/browser/ui/drag_util.cc,mac / Windows 同一实现)。因此 no-drag 只能+ * 挖掉排在它**之前**的 drag 区:drag 元素的后代恒在其后,挖洞总是可靠;+ * DOM 里排在 drag 区之前的浮层/兄弟节点,其 no-drag 会被后来的 drag 盖回+ * (ContentHeader.tsx「浮层 no-drag 不被计入」、FileTabsBar.tsx 的实机结论+ * 即此情形)。排在 drag 区之后的浮层(如 App.tsx 路由之后的 FindInPageBar、+ * portal 到 body 的 GhostPanelBubbleLayer)自身标 no-drag 可以挖洞。+ * 交互元素漏标 no-drag 会变成"点了就拖窗口";* 反之 drag 条叠在交互元素上同样会吞掉点击 —— InvisibleWindowDragStrip* 只能用在顶部确实无交互元素的页面。*