Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(remote-desktop): 修复 macOS 全屏后工具栏无法唤出 (#5466)
Dash9959ef489234
diff --git a/apps/desktop/src/renderer/features/remote-desktop/RemoteDesktopViewerWindow.tsx b/apps/desktop/src/renderer/features/remote-desktop/RemoteDesktopViewerWindow.tsxindex d56b2e1150..a461755f5a 100644--- a/apps/desktop/src/renderer/features/remote-desktop/RemoteDesktopViewerWindow.tsx+++ b/apps/desktop/src/renderer/features/remote-desktop/RemoteDesktopViewerWindow.tsx@@ -29,6 +29,12 @@ import { Switch } from '@/components/ui/switch';import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';import { Tip } from '@/components/ui/tooltip';+// Fullscreen keeps an 8px toolbar strip visible. Electron drag regions swallow+// hover and macOS slides its own menu bar over the top edge, so reveal is+// pointer-driven and only collapses once the pointer moves back into the stage.+const TOOLBAR_REVEAL_EDGE = 8;+const TOOLBAR_HIDE_MARGIN = 16;+const QUALITY_LABELS = {auto: 'remoteDesktop.viewer.automatic',saver: 'remoteDesktop.viewer.saver',@@ -41,12 +47,14 @@ export function RemoteDesktopViewerWindow() {const { isMac, isFullscreen } = useMacFullscreen();const api = window.electronAPI.remoteDesktopViewer;const root = useRef<HTMLDivElement>(null),+ toolbar = useRef<HTMLElement>(null),controller = useRef<DesktopViewerController | null>(null);const [state, setState] = useState<ViewerSnapshot | null>(null);const [settings, setSettings] = useState<'display' | 'clipboard' | 'security' | null>(null),[selectOpen, setSelectOpen] = useState(false),[notice, setNotice] = useState<string | null>(null),[closeGeneration, setCloseGeneration] = useState<number | null>(null);+ const [toolbarRevealed, setToolbarRevealed] = useState(false);const [modes, setModes] = useState<RemoteDesktopDisplayMode[]>([]);const [modesStatus, setModesStatus] = useState<'idle' | 'loading' | 'failed'>('idle');const generation = useRef(-1);@@ -67,6 +75,17 @@ export function RemoteDesktopViewerWindow() {}setCloseGeneration(generation.current);}, []);+ useEffect(() => {+ setToolbarRevealed(false);+ if (!isFullscreen) return;+ const move = (event: PointerEvent) => {+ if (event.clientY <= TOOLBAR_REVEAL_EDGE) setToolbarRevealed(true);+ else if (event.clientY > (toolbar.current?.offsetHeight ?? 0) + TOOLBAR_HIDE_MARGIN)+ setToolbarRevealed(false);+ };+ window.addEventListener('pointermove', move, true);+ return () => window.removeEventListener('pointermove', move, true);+ }, [isFullscreen]);useEffect(() => {if (!root.current) return;controller.current = new DesktopViewerController(api, root.current, (snapshot) => {@@ -215,7 +234,9 @@ export function RemoteDesktopViewerWindow() {}}><header+ ref={toolbar}className="remote-viewer-toolbar"+ data-revealed={toolbarRevealed || undefined}data-settings-open={!!settings || undefined}data-select-open={selectOpen || undefined}style={{ paddingLeft: isMac && !isFullscreen ? 82 : 12 }}diff --git a/apps/desktop/src/renderer/features/remote-desktop/__tests__/viewerWindow.test.tsx b/apps/desktop/src/renderer/features/remote-desktop/__tests__/viewerWindow.test.tsxindex d4a68519d4..ba14a4f961 100644--- a/apps/desktop/src/renderer/features/remote-desktop/__tests__/viewerWindow.test.tsx+++ b/apps/desktop/src/renderer/features/remote-desktop/__tests__/viewerWindow.test.tsx@@ -34,12 +34,14 @@ vi.mock('../viewerController', () => ({close = () => this._api.close(1);},}));+const fullscreen = vi.hoisted(() => ({ value: false }));vi.mock('@/hooks/useMacFullscreen', () => ({- useMacFullscreen: () => ({ isMac: true, isFullscreen: false }),+ useMacFullscreen: () => ({ isMac: true, isFullscreen: fullscreen.value }),}));vi.mock('@/components/title-bar/WindowControls', () => ({ WindowControls: () => null }));afterEach(() => {+ fullscreen.value = false;cleanup();vi.clearAllMocks();});@@ -368,3 +370,34 @@ it('updates translated controls without ending or recreating the viewer connectiexpect(lifecycle.disposed).toHaveBeenCalledOnce();expect(listeners.size).toBe(0);});++it('reveals the fullscreen toolbar from the top edge and keeps it while macOS covers the edge', async () => {+ fullscreen.value = true;+ Object.assign(window, {+ electronAPI: {+ remoteDesktopViewer: {+ onActive: () => () => {},+ onLocale: () => () => {},+ onCloseRequested: () => () => {},+ state: async () => ({ generation: 1 }),+ rendererReady: async () => {},+ presentationReady: async () => {},+ inputFocus: async () => {},+ close: async () => {},+ },+ },+ });+ const { container } = render(<RemoteDesktopViewerWindow />);+ await act(async () => {});+ const toolbar = container.querySelector('.remote-viewer-toolbar')!;+ Object.defineProperty(toolbar, 'offsetHeight', { value: 60 });+ const move = (clientY: number) => fireEvent.pointerMove(window, { clientY });+ expect(toolbar.hasAttribute('data-revealed')).toBe(false);+ move(4);+ expect(toolbar.getAttribute('data-revealed')).toBe('true');+ // The pointer is still over the toolbar (or has left to the macOS menu bar).+ move(70);+ expect(toolbar.getAttribute('data-revealed')).toBe('true');+ move(200);+ expect(toolbar.hasAttribute('data-revealed')).toBe(false);+});diff --git a/apps/desktop/src/renderer/features/remote-desktop/viewerWindow.css b/apps/desktop/src/renderer/features/remote-desktop/viewerWindow.cssindex 7eb555ad63..ec8f6af295 100644--- a/apps/desktop/src/renderer/features/remote-desktop/viewerWindow.css+++ b/apps/desktop/src/renderer/features/remote-desktop/viewerWindow.css@@ -314,8 +314,10 @@inset: 0 0 auto;transition: transform 150ms ease-out;transform: translateY(calc(-100% + 8px));+ /* Drag regions never receive pointer events; fullscreen has no window to drag. */+ -webkit-app-region: no-drag;}-.remote-viewer-fullscreen .remote-viewer-toolbar:hover,+.remote-viewer-fullscreen .remote-viewer-toolbar[data-revealed='true'],.remote-viewer-fullscreen .remote-viewer-toolbar:focus-within,.remote-viewer-fullscreen .remote-viewer-toolbar[data-settings-open='true'],.remote-viewer-fullscreen .remote-viewer-toolbar[data-select-open='true'] {