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): reset browser tooltips when host becomes inactive

shenjiacheng46e8a9c6fa1b
diff --git a/apps/desktop/src/renderer/features/right-sidebar/__tests__/RightSidebarShell.test.ts b/apps/desktop/src/renderer/features/right-sidebar/__tests__/RightSidebarShell.test.ts
index 26e75f4721..632f035926 100644
--- a/apps/desktop/src/renderer/features/right-sidebar/__tests__/RightSidebarShell.test.ts
+++ b/apps/desktop/src/renderer/features/right-sidebar/__tests__/RightSidebarShell.test.ts
@@ -445,7 +445,7 @@ describe('RightSidebarShell empty state', () => {
try {
await waitFor(() => expect(entry.wrapper.parentElement?.id).not.toBe('browser-webview-pool'));
const slot = entry.wrapper.parentElement;
- const trigger = screen.getByRole('button', { name: 'rightSidebar.browser.moreTools' });
+ let trigger = screen.getByRole('button', { name: 'rightSidebar.browser.moreTools' });
act(() => trigger.focus());
fireEvent.keyDown(trigger, { key: 'Enter' });
const firstMenu = await screen.findByRole('menu');
@@ -476,6 +476,7 @@ describe('RightSidebarShell empty state', () => {
expect(entry.wrapper.isConnected).toBe(true);
view.rerender(createElement(RightSidebarShell, props));
+ trigger = screen.getByRole('button', { name: 'rightSidebar.browser.moreTools' });
expect(screen.queryByRole('menu')).toBeNull();
expect(trigger.getAttribute('data-state')).toBe('closed');
expect(entry.wrapper.parentElement).toBe(slot);
diff --git a/apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/BrowserChrome.tsx b/apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/BrowserChrome.tsx
index 178369e6b6..ab84a35cd2 100644
--- a/apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/BrowserChrome.tsx
+++ b/apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/BrowserChrome.tsx
@@ -245,6 +245,7 @@ export const BrowserChrome = forwardRef<BrowserChromeHandle, BrowserChromeProps>
<div className="flex h-10 shrink-0 items-center gap-1 border-b border-[var(--border-default)] bg-content-area px-2">
{/* 左:导航按钮 */}
<ChromeIconButton
+ visible={visible}
icon={ArrowLeft}
disabled={!canGoBack}
onClick={onGoBack}
@@ -252,6 +253,7 @@ export const BrowserChrome = forwardRef<BrowserChromeHandle, BrowserChromeProps>
disabledTooltip={t('rightSidebar.browser.goBackUnavailable')}
/>
<ChromeIconButton
+ visible={visible}
icon={ArrowRight}
disabled={!canGoForward}
onClick={onGoForward}
@@ -259,6 +261,7 @@ export const BrowserChrome = forwardRef<BrowserChromeHandle, BrowserChromeProps>
disabledTooltip={t('rightSidebar.browser.goForwardUnavailable')}
/>
<ChromeIconButton
+ visible={visible}
icon={RotateCw}
reducedMotionIcon={isLoading ? XIcon : undefined}
spinning={isLoading}
@@ -313,6 +316,7 @@ export const BrowserChrome = forwardRef<BrowserChromeHandle, BrowserChromeProps>
message-square-plus = 页面评论(评论模式点选元素 → 评论进 composer,
已实现,active 态高亮);ellipsis = 更多菜单(系统浏览器打开 / 复制链接)。 */}
<ChromeIconButton
+ visible={visible}
icon={Camera}
onClick={onCaptureScreenshot}
tooltip={t('rightSidebar.browser.screenshot')}
@@ -320,6 +324,7 @@ export const BrowserChrome = forwardRef<BrowserChromeHandle, BrowserChromeProps>
{/* detached 子窗口无 composer,评论无处落点 —— 直接不渲染该按钮。 */}
{commentSupported && (
<ChromeIconButton
+ visible={visible}
icon={MessageSquarePlus}
active={commentActive}
onClick={onToggleComment}
@@ -334,7 +339,7 @@ export const BrowserChrome = forwardRef<BrowserChromeHandle, BrowserChromeProps>
走 data-[state=open])。菜单项在无有效链接(新标签空白态)时置灰。 */}
<DropdownMenu open={visible && moreMenuOpen} onOpenChange={handleMoreMenuOpenChange}>
<DropdownMenuTrigger asChild>
- <Tip text={t('rightSidebar.browser.moreTools')} side="bottom">
+ <Tip text={t('rightSidebar.browser.moreTools')} side="bottom" disabled={!visible}>
<button
type="button"
aria-label={t('rightSidebar.browser.moreTools')}
@@ -382,6 +387,7 @@ export const BrowserChrome = forwardRef<BrowserChromeHandle, BrowserChromeProps>
* star 用)。disabled 时半透明 + 不可点。
*/
function ChromeIconButton({
+ visible,
icon: Icon,
reducedMotionIcon: ReducedMotionIcon,
size = 14,
@@ -393,6 +399,7 @@ function ChromeIconButton({
tooltip,
disabledTooltip,
}: {
+ visible: boolean;
icon: React.ComponentType<{ size?: number; strokeWidth?: number; className?: string }>;
/** reduced-motion 下用静态动作图标表达 loading 状态,避免刷新/空闲态无法区分。 */
reducedMotionIcon?: React.ComponentType<{
@@ -451,8 +458,10 @@ function ChromeIconButton({
</button>
);
+ // Disabling Tip unmounts its Radix root, clearing open portals and pending
+ // hover timers even if this host returns before the delay expires.
return (
- <Tip text={accessibleLabel} side="bottom">
+ <Tip text={accessibleLabel} side="bottom" disabled={!visible}>
{disabled ? (
<span
role="button"
diff --git a/apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/__tests__/BrowserChrome.presence.test.ts b/apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/__tests__/BrowserChrome.presence.test.ts
index 77f7603e42..aa6906c5a7 100644
--- a/apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/__tests__/BrowserChrome.presence.test.ts
+++ b/apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/__tests__/BrowserChrome.presence.test.ts
@@ -46,7 +46,7 @@ it('keeps external focus when the browser returns before its More exit animation
const input = document.createElement('input');
document.body.append(input);
try {
- const trigger = screen.getByRole('button', { name: 'rightSidebar.browser.moreTools' });
+ let trigger = screen.getByRole('button', { name: 'rightSidebar.browser.moreTools' });
act(() => trigger.focus());
fireEvent.keyDown(trigger, { key: 'Enter' });
const menu = await screen.findByRole('menu');
@@ -57,6 +57,10 @@ it('keeps external focus when the browser returns before its More exit animation
expect(menu.getAttribute('data-state')).toBe('closed');
expect(menu.isConnected).toBe(true); // Presence is waiting for float-out.
view.rerender(createElement(BrowserChrome, props));
+ // The closing modal still aria-hides new triggers until Presence exits.
+ trigger = view.container.querySelector<HTMLButtonElement>(
+ 'button[aria-label="rightSidebar.browser.moreTools"]',
+ )!;
expect(menu.isConnected).toBe(true);
expect(trigger.getAttribute('data-state')).toBe('closed');
act(() => input.focus());
@@ -67,6 +71,7 @@ it('keeps external focus when the browser returns before its More exit animation
await act(async () => { await new Promise((resolve) => setTimeout(resolve, 0)); });
expect(document.activeElement).toBe(input);
expect(screen.queryByRole('menu')).toBeNull();
+ expect(screen.getByRole('button', { name: 'rightSidebar.browser.moreTools' })).toBe(trigger);
// A later ordinary dismissal must not inherit the earlier hidden close.
act(() => trigger.focus());
diff --git a/apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/__tests__/BrowserChrome.tooltip.test.ts b/apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/__tests__/BrowserChrome.tooltip.test.ts
new file mode 100644
index 0000000000..b9cb78974c
--- /dev/null
+++ b/apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/__tests__/BrowserChrome.tooltip.test.ts
@@ -0,0 +1,64 @@
+// @vitest-environment jsdom
+
+import { act, cleanup, fireEvent, render, screen } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { createElement } from 'react';
+import { BrowserChrome, type BrowserChromeProps } from '../BrowserChrome';
+
+vi.mock('react-i18next', () => ({ useTranslation: () => ({ t: (key: string) => key }) }));
+
+const noop = () => undefined;
+const base: BrowserChromeProps = {
+ url: 'https://example.test/', isLoading: false, canGoBack: true, canGoForward: true,
+ commentActive: false, canOpenInSystemBrowser: true,
+ onNavigate: noop, onReload: noop, onStop: noop, onGoBack: noop, onGoForward: noop,
+ onCaptureScreenshot: noop, onToggleComment: noop, onOpenInSystemBrowser: noop, onCopyLink: noop,
+};
+const actions: Array<[string, Partial<BrowserChromeProps>]> = [
+ ['goBack', {}], ['goBackUnavailable', { canGoBack: false }],
+ ['goForward', {}], ['goForwardUnavailable', { canGoForward: false }],
+ ['reload', {}], ['stop', { isLoading: true }], ['screenshot', {}],
+ ['comment', {}], ['exitCommentMode', { commentActive: true }], ['moreTools', {}],
+];
+const cases = actions.flatMap(([label, overrides]) =>
+ (['focus', 'hover', 'pending hover'] as const).map((interaction) => ({ label, overrides, interaction })),
+);
+
+async function tick(ms: number) {
+ await act(async () => { await vi.advanceTimersByTimeAsync(ms); });
+}
+
+describe('BrowserChrome tooltip lifecycle', () => {
+ beforeEach(() => vi.useFakeTimers());
+ afterEach(() => { cleanup(); vi.useRealTimers(); });
+
+ it.each(cases)('clears $label $interaction on inactivity and allows a new interaction', async ({ label, overrides, interaction }) => {
+ const props = { ...base, ...overrides };
+ const view = render(createElement(BrowserChrome, props));
+ const trigger = () => screen.getByRole('button', { name: `rightSidebar.browser.${label}` });
+ const hover = () => fireEvent.pointerMove(trigger(), { pointerType: 'mouse' });
+ if (interaction === 'focus') act(() => trigger().focus());
+ else hover();
+ await tick(interaction === 'hover' ? 550 : 0);
+ if (interaction === 'pending hover') expect(screen.queryByRole('tooltip')).toBeNull();
+ else {
+ const tip = screen.getByRole('tooltip');
+ expect(tip.textContent).toBe(`rightSidebar.browser.${label}`);
+ expect(view.container.contains(tip)).toBe(false); // Real Tip/Radix body portal.
+ }
+
+ // The actual retained-host boundary; no synthetic blur/pointerleave closes it.
+ view.rerender(createElement(BrowserChrome, { ...props, visible: false }));
+ expect(screen.queryByRole('tooltip')).toBeNull();
+ // Return before the original 500ms deadline, without new pointer/focus input.
+ view.rerender(createElement(BrowserChrome, props));
+ await tick(600);
+ expect(screen.queryByRole('tooltip')).toBeNull();
+
+ // Reacquire the visible control and intentionally request its normal tip.
+ if (interaction === 'focus') act(() => trigger().focus());
+ else hover();
+ await tick(550);
+ expect(screen.getByRole('tooltip').textContent).toBe(`rightSidebar.browser.${label}`);
+ });
+});