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(browser): 失活时关闭常驻浏览器的 More 菜单

shenjiachengb8a2f3b9b69c
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 546c5e5ced..68a2fbbba0 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
@@ -378,6 +378,101 @@ describe('RightSidebarShell empty state', () => {
}
});
+ it.each(['task switch', 'sidebar hide'] as const)(
+ 'closes the retained browser More portal on %s without restoring hidden focus',
+ async (transition) => {
+ Object.assign(window.electronAPI, { onRsbBrowserFocusUrlBar: () => () => undefined });
+ registerTabKind({
+ kind: 'web-browser',
+ menu: { kind: 'web-browser', labelKey: 'browser', icon: Globe, order: 1, enabled: true },
+ TabPillTitle: () => createElement('span', null, 'browser'),
+ TabBody: (props: TabKindBodyProps) =>
+ createElement(BrowserTabBody, { ...props, state: props.state as WebBrowserState }),
+ defaultState: () => ({
+ url: 'https://example.test/',
+ title: '',
+ favicon: null,
+ isAudible: false,
+ }),
+ });
+ const entry = browserWebviewPool.acquire('browser-a');
+ // Supply only the Electron boundary; the host, menu portal and focus
+ // handling are real, as in the retained-browser regression above.
+ Object.assign(entry.webview, {
+ getURL: () => 'https://example.test/',
+ getTitle: () => '',
+ canGoBack: () => false,
+ canGoForward: () => false,
+ getWebContentsId: () => 101,
+ setAudioMuted: () => undefined,
+ executeJavaScript: async () => undefined,
+ });
+ tabsIpc.list.mockImplementation(async ({ sessionId }: { sessionId: string }) =>
+ sessionId === 'task-a'
+ ? {
+ tabs: [{ id: 'browser-a', kind: 'web-browser', state: { url: 'https://example.test/' } }],
+ activeTabId: 'browser-a',
+ }
+ : { tabs: [], activeTabId: null },
+ );
+ const props = {
+ sessionId: 'task-a',
+ workdir: '/tmp/task-a',
+ remoteHostId: null,
+ isMac: true,
+ shellVisible: true,
+ };
+ const view = render(createElement(RightSidebarShell, props));
+ const nextTaskInput = document.createElement('input');
+ document.body.append(nextTaskInput);
+ 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' });
+ act(() => trigger.focus());
+ fireEvent.keyDown(trigger, { key: 'Enter' });
+ const firstMenu = await screen.findByRole('menu');
+ expect(view.container.contains(firstMenu)).toBe(false);
+ fireEvent.keyDown(firstMenu, { key: 'Escape' });
+ await waitFor(() => expect(firstMenu.isConnected).toBe(false));
+ await waitFor(() => expect(document.activeElement).toBe(trigger));
+
+ fireEvent.keyDown(trigger, { key: 'Enter' });
+ const menu = await screen.findByRole('menu');
+ // Change the task without a pointer event that could independently
+ // dismiss the menu, matching keyboard task switching.
+ view.rerender(createElement(
+ RightSidebarShell,
+ transition === 'task switch'
+ ? { ...props, sessionId: 'task-b', workdir: '/tmp/task-b' }
+ : { ...props, shellVisible: false },
+ ));
+ act(() => nextTaskInput.focus());
+ await waitFor(() => expect(menu.isConnected).toBe(false));
+ // Radix defers close autofocus with a zero-delay timer. Drain that
+ // callback before checking that the hidden opener cannot steal focus.
+ await act(async () => {
+ await new Promise((resolve) => setTimeout(resolve, 0));
+ });
+ expect(document.activeElement).toBe(nextTaskInput);
+ expect(entry.wrapper.parentElement).toBe(slot);
+ expect(entry.wrapper.isConnected).toBe(true);
+
+ view.rerender(createElement(RightSidebarShell, props));
+ expect(screen.queryByRole('menu')).toBeNull();
+ expect(trigger.getAttribute('data-state')).toBe('closed');
+ expect(entry.wrapper.parentElement).toBe(slot);
+ fireEvent.keyDown(trigger, { key: 'Enter' });
+ expect(await screen.findByRole('menu')).toBeTruthy();
+ } finally {
+ view.unmount();
+ nextTaskInput.remove();
+ browserWebviewPool.releaseAll();
+ unregisterTabKind('web-browser');
+ }
+ },
+ );
+
it('clears the active browser session only when a visible detached shell is hidden', async () => {
const setActiveSession = window.electronAPI.rsbBrowserBridge.setActiveSession;
const view = render(
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 a5bb86a00f..b31326c7a9 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
@@ -59,6 +59,8 @@ import { cn } from '@/lib/utils';
import { parseOmnibox } from './lib/parseOmnibox';
export interface BrowserChromeProps {
+ /** 保活宿主失活/隐藏时,关闭挂在 body 上的菜单。 */
+ visible?: boolean;
url: string;
isLoading: boolean;
canGoBack: boolean;
@@ -99,6 +101,7 @@ export interface BrowserChromeHandle {
export const BrowserChrome = forwardRef<BrowserChromeHandle, BrowserChromeProps>(
function BrowserChrome(
{
+ visible = true,
url,
isLoading,
canGoBack,
@@ -120,6 +123,17 @@ export const BrowserChrome = forwardRef<BrowserChromeHandle, BrowserChromeProps>
ref,
) {
const { t } = useTranslation();
+ const [moreMenuOpen, setMoreMenuOpen] = useState(false);
+ const handleMoreMenuOpenChange = useCallback(
+ (open: boolean) => {
+ setMoreMenuOpen(open);
+ onOverlayOpenChange?.(open);
+ },
+ [onOverlayOpenChange],
+ );
+ useLayoutEffect(() => {
+ if (!visible) handleMoreMenuOpenChange(false);
+ }, [visible, handleMoreMenuOpenChange]);
// URL pill 编辑态 —— 点 / focus 进入,Enter / Esc / blur 退出。
// editingValue 是编辑态的临时 buffer,提交才 onNavigate 出去。
@@ -303,7 +317,7 @@ export const BrowserChrome = forwardRef<BrowserChromeHandle, BrowserChromeProps>
)}
{/* 更多菜单:trigger 复用 chrome 图标按钮视觉(默认态 + 菜单打开时 active 高亮,
走 data-[state=open])。菜单项在无有效链接(新标签空白态)时置灰。 */}
- <DropdownMenu onOpenChange={onOverlayOpenChange}>
+ <DropdownMenu open={visible && moreMenuOpen} onOpenChange={handleMoreMenuOpenChange}>
<DropdownMenuTrigger asChild>
<Tip text={t('rightSidebar.browser.moreTools')} side="bottom">
<button
@@ -320,7 +334,15 @@ export const BrowserChrome = forwardRef<BrowserChromeHandle, BrowserChromeProps>
</button>
</Tip>
</DropdownMenuTrigger>
- <DropdownMenuContent align="end" className="min-w-[9rem]">
+ <DropdownMenuContent
+ align="end"
+ className="min-w-[9rem]"
+ onCloseAutoFocus={(event) => {
+ // A task switch must not pull focus back to its hidden trigger.
+ // Ordinary dismissal keeps Radix's default focus restoration.
+ if (!visible) event.preventDefault();
+ }}
+ >
<DropdownMenuItem
disabled={!hasValidLink || !canOpenInSystemBrowser}
onSelect={onOpenInSystemBrowser}
diff --git a/apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/BrowserTabBody.tsx b/apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/BrowserTabBody.tsx
index 8e7f2aaad5..56994841a7 100644
--- a/apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/BrowserTabBody.tsx
+++ b/apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/BrowserTabBody.tsx
@@ -478,6 +478,7 @@ export function BrowserTabBody({ state, ctx, active, shellVisible }: BrowserTabB
<div ref={rootRef} className="flex h-full w-full flex-col bg-content-area">
<BrowserChrome
ref={chromeRef}
+ visible={tabVisible}
url={state.url || 'about:blank'}
isLoading={browser.isLoading}
canGoBack={browser.canGoBack}