diff --git a/packages/app/public/index.html b/packages/app/public/index.html index dcb808b6a2..9f858cbadc 100644 --- a/packages/app/public/index.html +++ b/packages/app/public/index.html @@ -66,6 +66,7 @@ [role="slider"], [role="menuitem"], [tabindex], + [data-window-no-drag], [contenteditable="true"] { -webkit-app-region: no-drag !important; } diff --git a/packages/app/src/components/desktop/titlebar-drag-region.tsx b/packages/app/src/components/desktop/titlebar-drag-region.tsx index e39e211bf1..aa35181a71 100644 --- a/packages/app/src/components/desktop/titlebar-drag-region.tsx +++ b/packages/app/src/components/desktop/titlebar-drag-region.tsx @@ -24,6 +24,9 @@ import { isNative } from "@/constants/platform"; */ export const WINDOW_CONTENT_DATASET = { "window-content": "" }; +/** Reserves a clickable area for a control mounted outside the titlebar rail. */ +export const WINDOW_NO_DRAG_DATASET = { "window-no-drag": "" }; + export const titlebarDragSurfaceStyle: React.CSSProperties = { cursor: "default", // @ts-expect-error — WebkitAppRegion is not in CSSProperties diff --git a/packages/app/src/components/headers/compact-header.tsx b/packages/app/src/components/headers/compact-header.tsx index 1c3b45e0b3..fd8574f6a6 100644 --- a/packages/app/src/components/headers/compact-header.tsx +++ b/packages/app/src/components/headers/compact-header.tsx @@ -27,6 +27,7 @@ const NO_SHORTCUT: ShortcutKey[] = []; interface CompactHeaderProps { /** The leading island: the sidebar menu, or a back button. */ navigation: "menu" | "back"; + inDesktopTitlebar?: boolean; /** Back button action. Defaults to navigating back. */ onBack?: () => void; title?: string; @@ -49,6 +50,7 @@ interface CompactHeaderProps { */ export function CompactHeader({ navigation, + inDesktopTitlebar = false, onBack, title, titleTestID, @@ -58,22 +60,28 @@ export function CompactHeader({ }: CompactHeaderProps) { const insets = useSafeAreaInsets(); const inTopBand = useTopBand() !== null; + const usesTitlebarHeight = inTopBand || inDesktopTitlebar; const rootStyle = useMemo( () => [ styles.root, { - paddingTop: insets.top + (inTopBand ? 0 : HEADER_TOP_PADDING_MOBILE), + paddingTop: insets.top + (usesTitlebarHeight ? 0 : HEADER_TOP_PADDING_MOBILE), marginLeft: insets.left, marginRight: insets.right, }, ], - [inTopBand, insets.top, insets.left, insets.right], + [usesTitlebarHeight, insets.top, insets.left, insets.right], ); return ( - + {navigation === "menu" ? : } @@ -155,12 +163,16 @@ const styles = StyleSheet.create((theme) => ({ alignItems: "center", gap: theme.spacing[2], }, - topBandRow: { + titlebarRow: { height: HEADER_INNER_HEIGHT, flexDirection: "row", alignItems: "center", gap: theme.spacing[2], }, + desktopTitlebarDividerSpace: { + borderBottomWidth: theme.borderWidth[1], + borderBottomColor: "transparent", + }, titleGroup: { flex: 1, minWidth: 0, diff --git a/packages/app/src/screens/workspace/compact-workspace-header/index.browser.test.tsx b/packages/app/src/screens/workspace/compact-workspace-header/index.browser.test.tsx index bc87c9da59..7bcb0a0e23 100644 --- a/packages/app/src/screens/workspace/compact-workspace-header/index.browser.test.tsx +++ b/packages/app/src/screens/workspace/compact-workspace-header/index.browser.test.tsx @@ -20,8 +20,6 @@ afterEach(async () => { await act(async () => root.render(null)); usePanelStore.setState(initialPanel, true); }); -const noop = () => {}; -const explorerState = { expanded: false }; const geometry: WindowLayout = { bounds: { x: 0, y: 0, width: window.innerWidth, height: window.innerHeight }, verticalBarEdge: "trailing", @@ -42,9 +40,8 @@ it("updates compact header actions on panel changes without rendering the worksp title="Workspace" subtitle="Project" isSubtitleDistinct - onToggleExplorer={noop} - explorerToggleLabel="Explorer" - explorerToggleAccessibilityState={explorerState} + explorerAction={null} + inDesktopTitlebar={false} tabSwitcher={null} headerVariant="full" > diff --git a/packages/app/src/screens/workspace/compact-workspace-header/index.tsx b/packages/app/src/screens/workspace/compact-workspace-header/index.tsx index b87de93e36..0d6c90d5db 100644 --- a/packages/app/src/screens/workspace/compact-workspace-header/index.tsx +++ b/packages/app/src/screens/workspace/compact-workspace-header/index.tsx @@ -1,11 +1,6 @@ import { Fragment, useMemo, type ReactNode } from "react"; -import { useTranslation } from "react-i18next"; import { usePanelStore } from "@/stores/panel-store"; import { CompactHeader } from "@/components/headers/compact-header"; -import { - EXPLORER_TOGGLE_KEYS, - WorkspaceExplorerToggle, -} from "@/screens/workspace/workspace-explorer-toggle"; import { WorkspaceHeaderProjectRow } from "@/screens/workspace/workspace-header-project-row"; import { useWindowLayout, @@ -23,10 +18,9 @@ interface CompactWorkspaceHeaderProps { title: string; subtitle: string; isSubtitleDistinct: boolean; - onToggleExplorer: () => void; - explorerToggleLabel: string; - explorerToggleAccessibilityState: { expanded: boolean }; + explorerAction: ReactNode; tabSwitcher: ReactNode; + inDesktopTitlebar: boolean; /** Workspace overflow menu. */ children: ReactNode; headerVariant: "compact" | "full"; @@ -40,17 +34,15 @@ export function CompactWorkspaceHeader({ title, subtitle, isSubtitleDistinct, - onToggleExplorer, - explorerToggleLabel, - explorerToggleAccessibilityState, + explorerAction, children, tabSwitcher, + inDesktopTitlebar, serverId, headerVariant, isRouteFocused, isCompact, }: CompactWorkspaceHeaderProps) { - const { t } = useTranslation(); const actionsInBar = resolveWorkspaceActionPlacement(useWindowLayout()) === "vertical-bar"; const projectRow = useMemo( () => ( @@ -65,16 +57,7 @@ export function CompactWorkspaceHeader({ const symbols = { "tab-count": tabSwitcher, overflow: children, - explorer: ( - - ), + explorer: explorerAction, }; const actions = resolveWorkspaceBarActions(headerVariant).map((symbol) => ( {symbols[symbol]} @@ -85,6 +68,7 @@ export function CompactWorkspaceHeader({ {headerVariant === "compact" ? ( void; label: string; tooltipLabel: string; - tooltipKeys: ShortcutKey[]; accessibilityState: { expanded: boolean }; mobile: boolean; style?: StyleProp; } -export type WorkspaceExplorerToggleOwner = "mobile" | "header" | "window"; - -export function resolveWorkspaceExplorerToggleOwner({ - isMobile, - hasMacTrafficLights, -}: { - isMobile: boolean; - hasMacTrafficLights: boolean; -}): WorkspaceExplorerToggleOwner { - if (isMobile) return "mobile"; - return hasMacTrafficLights ? "window" : "header"; -} - -export function WorkspaceExplorerToggle({ +function WorkspaceExplorerToggle({ onPress, label, tooltipLabel, - tooltipKeys, accessibilityState, mobile, style, @@ -51,7 +41,7 @@ export function WorkspaceExplorerToggle({ testID="workspace-explorer-toggle" onPress={onPress} tooltipLabel={tooltipLabel} - tooltipKeys={tooltipKeys} + tooltipKeys={EXPLORER_TOGGLE_KEYS} tooltipSide="left" style={style} accessible @@ -68,42 +58,97 @@ export function WorkspaceExplorerToggle({ ); } -interface DesktopWorkspaceExplorerToggleProps extends Omit { - owner: WorkspaceExplorerToggleOwner; +export function useWorkspaceExplorerControls({ + hasWorkspace, + compact, + focusMode, + expanded, + onToggle, +}: { + hasWorkspace: boolean; + compact: boolean; + focusMode: boolean; + expanded: boolean; + onToggle: () => void; +}) { + const { t } = useTranslation(); + const hasLeadingWindowControls = useHasWindowChromeObstruction("top-left"); + const inDesktopTitlebar = hasLeadingWindowControls && hasWorkspace && !compact && !focusMode; + + return useMemo(() => { + const props = { + label: expanded + ? t("workspace.tabs.explorerSidebar.close") + : t("workspace.tabs.explorerSidebar.open"), + tooltipLabel: t("workspace.tabs.explorerSidebar.toggle"), + onPress: onToggle, + accessibilityState: { expanded }, + }; + + if (inDesktopTitlebar) { + // Keep the button in the header Tab order. The active rail carves its slot out of the drag region. + const headerSlot = expanded ? null : ( + + ); + return { + inDesktopTitlebar, + headerAction: headerSlot, + compactAction: headerSlot, + dockAction: ( + + ), + titlebarAction: ( + + + + ), + }; + } + + return { + inDesktopTitlebar, + headerAction: compact ? null : ( + + ), + compactAction: , + dockAction: compact ? ( + + ) : null, + titlebarAction: null, + }; + }, [compact, expanded, inDesktopTitlebar, onToggle, t]); } -export function WorkspaceHeaderExplorerToggle({ - owner, - accessibilityState, - style, - ...toggleProps -}: DesktopWorkspaceExplorerToggleProps) { - if (owner === "mobile" || (owner === "window" && accessibilityState.expanded)) return null; - return ( - - ); -} - -export function WorkspaceExplorerSidebarToggle({ - owner, - ...toggleProps -}: DesktopWorkspaceExplorerToggleProps) { - if (owner === "header") return null; - if (owner === "mobile") { - // The compact Explorer is an overlay like the compact agent list, so it closes with the same X. - return ( - - ); - } - return ; -} +const styles = StyleSheet.create((theme) => ({ + headerAction: { + marginRight: { xs: 0, md: -theme.spacing[2] }, + }, + dockAction: { + // The dock divider is absolutely positioned. Match the other headers' content center. + marginBottom: theme.borderWidth[1], + }, + titlebarSlot: { + position: "absolute", + top: 0, + right: theme.spacing[1], + height: WORKSPACE_SECONDARY_HEADER_HEIGHT, + // Center with the bordered workspace header and Explorer tabs row. + borderBottomWidth: theme.borderWidth[1], + borderBottomColor: "transparent", + justifyContent: "center", + zIndex: 1, + }, +})); diff --git a/packages/app/src/screens/workspace/workspace-screen.tsx b/packages/app/src/screens/workspace/workspace-screen.tsx index 29e5401ebe..ee2ce2ee0b 100644 --- a/packages/app/src/screens/workspace/workspace-screen.tsx +++ b/packages/app/src/screens/workspace/workspace-screen.tsx @@ -157,17 +157,8 @@ import { } from "@/screens/workspace/workspace-desktop-tabs-row"; import { useDesktopBrowserNewTabRequests } from "@/desktop/browser/new-tab-requests"; import type { WorkspaceTabDescriptor } from "@/screens/workspace/workspace-tabs-types"; -import { - resolveWorkspaceExplorerToggleOwner, - EXPLORER_TOGGLE_KEYS, - WorkspaceExplorerSidebarToggle, - WorkspaceHeaderExplorerToggle, -} from "@/screens/workspace/workspace-explorer-toggle"; -import { - useHasWindowChromeObstruction, - WindowChromeRegion, - WindowChromeSafeArea, -} from "@/utils/desktop-window"; +import { useWorkspaceExplorerControls } from "@/screens/workspace/workspace-explorer-toggle"; +import { WindowChromeRegion, WindowChromeSafeArea } from "@/utils/desktop-window"; import { resolveWorkspaceHeaderRenderState, type WorkspaceHeaderCheckoutState, @@ -1058,12 +1049,8 @@ function WorkspaceScreenContent({ const isMobile = useIsCompactFormFactor(); const canRenderDesktopPaneSplits = supportsDesktopPaneSplits(); const layoutMode = useWorkspaceLayoutStore((state) => state.layoutMode); - const hasMacTrafficLights = useHasWindowChromeObstruction("top-left"); - const explorerToggleOwner = resolveWorkspaceExplorerToggleOwner({ - isMobile, - hasMacTrafficLights, - }); const isFocusModeEnabled = usePanelStore((state) => state.desktop.focusModeEnabled); + const desktopFocusModeEnabled = isFocusModeEnabled && !isMobile; const toggleFocusMode = usePanelStore((state) => state.toggleFocusMode); const normalizedServerId = useMemo(() => trimNonEmpty(decodeSegment(serverId)) ?? "", [serverId]); @@ -1308,11 +1295,6 @@ function WorkspaceScreenContent({ explorerOpen: isExplorerSidebarShowing, }); - const explorerSidebarToggleAccessibilityState = useMemo( - () => ({ expanded: isExplorerSidebarShowing }), - [isExplorerSidebarShowing], - ); - useEffect(() => { // Back dismisses the compact overlay only. On a wide native layout the // explorer is a tab, `showMobileAgent` has no rendered consumer, and @@ -1820,9 +1802,6 @@ function WorkspaceScreenContent({ }), [t], ); - const explorerSidebarToggleLabel = isExplorerSidebarShowing - ? t("workspace.tabs.explorerSidebar.close") - : t("workspace.tabs.explorerSidebar.open"); const activeTabKey = useMemo(() => activeTabId ?? "", [activeTabId]); const handleCreateDraftTab = useCallback( @@ -3228,6 +3207,13 @@ function WorkspaceScreenContent({ workspaceKey: persistenceKey, }); + const explorerControls = useWorkspaceExplorerControls({ + hasWorkspace: !!workspaceDirectory, + compact: isMobile, + focusMode: desktopFocusModeEnabled, + expanded: isExplorerSidebarShowing, + onToggle: handleToggleExplorerSidebar, + }); const headerRight = useMemo( () => ( @@ -3254,17 +3240,7 @@ function WorkspaceScreenContent({ {workspaceDirectory ? ( <> - {workspaceActionsInBar ? null : ( - - )} + {workspaceActionsInBar ? null : explorerControls.headerAction} ) : null} @@ -3279,12 +3255,8 @@ function WorkspaceScreenContent({ scriptActions, handleViewScriptTerminal, handleOpenUrlInBrowserTab, - handleToggleExplorerSidebar, - explorerSidebarToggleLabel, - explorerSidebarToggleAccessibilityState, - explorerToggleOwner, + explorerControls.headerAction, workspaceActionsInBar, - t, ], ); @@ -3292,25 +3264,6 @@ function WorkspaceScreenContent({ () => shouldShowWorkspaceScreenHeader({ isFocusModeEnabled, isMobile }), [isFocusModeEnabled, isMobile], ); - const renderExplorerSidebarHeaderAction = useCallback( - () => ( - - ), - [ - explorerSidebarToggleAccessibilityState, - explorerSidebarToggleLabel, - explorerToggleOwner, - handleToggleExplorerSidebar, - t, - ], - ); const createTerminalDisabled = useMemo( () => createTerminalMutation.isPending || pendingTerminalCreateInput !== null, [createTerminalMutation.isPending, pendingTerminalCreateInput], @@ -3333,10 +3286,6 @@ function WorkspaceScreenContent({ ], ); const focusedPaneIdOrUndefined = useMemo(() => focusedPaneId ?? undefined, [focusedPaneId]); - const desktopFocusModeEnabled = useMemo( - () => isFocusModeEnabled && !isMobile, - [isFocusModeEnabled, isMobile], - ); const workspaceFloatingPanelPortalHostName = useMemo( () => `${WORKSPACE_FLOATING_PANEL_PORTAL_HOST_PREFIX}:${normalizedServerId}:${normalizedWorkspaceId}`, @@ -3460,14 +3409,13 @@ function WorkspaceScreenContent({ isRouteFocused={isRouteFocused} isCompact={isMobile} tabSwitcher={tabSwitcher} + inDesktopTitlebar={explorerControls.inDesktopTitlebar} + explorerAction={explorerControls.compactAction} isLoading={isWorkspaceHeaderLoading} title={workspaceHeaderTitle} subtitle={workspaceHeaderSubtitle} isSubtitleDistinct={isWorkspaceHeaderSubtitleDistinct} serverId={normalizedServerId} - onToggleExplorer={handleToggleExplorerSidebar} - explorerToggleLabel={explorerSidebarToggleLabel} - explorerToggleAccessibilityState={explorerSidebarToggleAccessibilityState} > ); return ( @@ -3775,7 +3722,7 @@ function WorkspaceScreenContent({ toggleFocusMode, handleReorderTabsInPane, buildDesktopPaneContentModel, - renderExplorerSidebarHeaderAction, + explorerControls.dockAction, desktopFocusModeEnabled, ]); @@ -3849,6 +3796,7 @@ function WorkspaceScreenContent({ onReorderTabsInPane={handleReorderTabsInPane} onSplitPane={handleSplitPane} > + {explorerControls.titlebarAction} {workspaceCenterColumn} {sharedExplorer} @@ -3986,12 +3934,6 @@ const styles = StyleSheet.create((theme) => ({ md: theme.spacing[2], }, }, - compactHeaderActionButton: { - marginRight: { - xs: 0, - md: -theme.spacing[2], - }, - }, compactHeaderMenuCluster: { flexDirection: "row", alignItems: "center", diff --git a/packages/app/src/screens/workspace/workspace-tab-layout.test.ts b/packages/app/src/screens/workspace/workspace-tab-layout.test.ts index 9b428bc0bc..4b8eb174b0 100644 --- a/packages/app/src/screens/workspace/workspace-tab-layout.test.ts +++ b/packages/app/src/screens/workspace/workspace-tab-layout.test.ts @@ -1,10 +1,5 @@ import { buildDesktopFrameStyle } from "@/components/ui/combobox-frame-style"; -import { - WorkspaceHeaderExplorerToggle, - WorkspaceExplorerSidebarToggle, -} from "./workspace-explorer-toggle"; import { describe, expect, it } from "vitest"; -import { SidebarCloseButton } from "@/components/headers/sidebar-close-button"; import { resolveWorkspaceTabChipBackdrop } from "@/screens/workspace/workspace-tab-chip-backdrop"; import { darkPureBlackTheme, darkTheme, lightTheme } from "@/styles/theme"; import { @@ -190,37 +185,6 @@ describe("retainWorkspaceTabMeasuredWidth", () => { }); }); -describe("Explorer toggle ownership", () => { - const toggleProps = { - onPress: () => {}, - label: "Close Explorer sidebar", - tooltipLabel: "Toggle Explorer sidebar", - tooltipKeys: [], - accessibilityState: { expanded: true }, - }; - - it("keeps only the header toggle when window controls do not obstruct it", () => { - expect(WorkspaceHeaderExplorerToggle({ ...toggleProps, owner: "header" })).not.toBeNull(); - expect(WorkspaceExplorerSidebarToggle({ ...toggleProps, owner: "header" })).toBeNull(); - }); - - it("keeps the dock toggle for window-owned and compact overlay chrome", () => { - for (const owner of ["window", "mobile"] as const) { - expect(WorkspaceHeaderExplorerToggle({ ...toggleProps, owner })).toBeNull(); - expect(WorkspaceExplorerSidebarToggle({ ...toggleProps, owner })).not.toBeNull(); - } - }); - - it("closes the compact overlay with the same X as the compact agent list", () => { - expect(WorkspaceExplorerSidebarToggle({ ...toggleProps, owner: "mobile" })?.type).toBe( - SidebarCloseButton, - ); - expect(WorkspaceExplorerSidebarToggle({ ...toggleProps, owner: "window" })?.type).not.toBe( - SidebarCloseButton, - ); - }); -}); - describe("resolveWorkspaceTabChipBackdrop", () => { const themes = { light: lightTheme, dark: darkTheme, pureBlack: darkPureBlackTheme }; const rails = { diff --git a/packages/desktop/e2e/explorer-toggle.spec.ts b/packages/desktop/e2e/explorer-toggle.spec.ts new file mode 100644 index 0000000000..0448a088f4 --- /dev/null +++ b/packages/desktop/e2e/explorer-toggle.spec.ts @@ -0,0 +1,164 @@ +import type { Locator, Page } from "@playwright/test"; +import { expect, test } from "../../app/e2e/support/fixtures"; +import { gotoWorkspace } from "../../app/e2e/support/helpers/launcher"; + +function explorerSidebar(page: Page) { + return page.getByTestId("workspace-explorer-sidebar").filter({ visible: true }); +} + +async function useDesktopWindowChrome(page: Page, mode: "native-mac" | "custom-windows") { + await page.addInitScript((windowChromeMode) => { + Object.assign(window, { + paseoDesktop: { + platform: windowChromeMode === "native-mac" ? "darwin" : "win32", + windowChromeMode, + invoke: async () => null, + events: { on: async () => () => undefined }, + getPendingOpenProject: async () => null, + window: { + getCurrentWindow: () => ({ + isFullscreen: async () => false, + onResized: async () => () => undefined, + }), + }, + }, + }); + }, mode); +} + +function explorerToggle(page: Page, expanded: boolean) { + return page.getByRole("button", { + name: expanded ? "Close Explorer sidebar" : "Open Explorer sidebar", + exact: true, + expanded, + }); +} + +async function recordExplorerToggle(button: Locator) { + const recording = await button.evaluateHandle((target) => { + const measure = () => { + const glyph = target.querySelector("svg")?.getBoundingClientRect(); + return { + connected: target.isConnected, + x: glyph?.x, + y: glyph?.y, + width: glyph?.width, + height: glyph?.height, + }; + }; + const before = measure(); + const frames: ReturnType[] = []; + const done = new Promise((resolve) => { + target.addEventListener( + "click", + () => { + const start = performance.now(); + const sample = () => { + frames.push(measure()); + if (performance.now() - start < 300) requestAnimationFrame(sample); + else resolve(); + }; + requestAnimationFrame(sample); + }, + { once: true }, + ); + }); + return { before, frames, done }; + }); + try { + await button.click(); + return await recording.evaluate(async ({ before, frames, done }) => { + await done; + return { before, frames }; + }); + } finally { + await recording.dispose(); + } +} + +async function expectExplorerToggleHasNativeClickArea(toggle: Locator) { + const regions = await toggle.evaluate((button) => { + const rect = button.getBoundingClientRect(); + const x = rect.x + rect.width / 2; + const y = rect.y + rect.height / 2; + return [ + ...document.querySelectorAll('[style*="app-region"], [data-window-no-drag], [role="button"]'), + ] + .filter((element) => { + const bounds = element.getBoundingClientRect(); + return bounds.left <= x && x < bounds.right && bounds.top <= y && y < bounds.bottom; + }) + .map((element) => getComputedStyle(element).getPropertyValue("-webkit-app-region")) + .filter((region) => region === "drag" || region === "no-drag"); + }); + expect(regions).toContain("drag"); + expect(regions.at(-1)).toBe("no-drag"); +} + +async function expectExplorerToggleInHeaderTabOrder(page: Page, expanded: boolean) { + const toggle = explorerToggle(page, expanded); + await toggle.focus(); + await page.keyboard.press("Tab"); + await expect(page.getByRole("button", { name: "Workspace actions", exact: true })).toBeFocused(); + await page.keyboard.press("Shift+Tab"); + await expect(toggle).toBeFocused(); +} + +async function expectExplorerToggleToHoldPosition(page: Page, expanded: boolean) { + const toggle = explorerToggle(page, expanded); + await expect(toggle).toBeVisible(); + await expectExplorerToggleHasNativeClickArea(toggle); + const { before, frames } = await recordExplorerToggle(toggle); + await expect(explorerToggle(page, !expanded)).toBeVisible(); + expect(before.width).toBeGreaterThan(0); + expect(frames.find((frame) => JSON.stringify(frame) !== JSON.stringify(before))).toBeUndefined(); +} + +test("keeps the Mac Explorer toggle in place across open and close", async ({ + page, + withWorkspace, +}) => { + await page.setViewportSize({ width: 1440, height: 900 }); + await useDesktopWindowChrome(page, "native-mac"); + + const { workspaceId } = await withWorkspace(); + await gotoWorkspace(page, workspaceId); + await expectExplorerToggleInHeaderTabOrder(page, false); + await expectExplorerToggleToHoldPosition(page, false); + await expectExplorerToggleInHeaderTabOrder(page, true); + await expectExplorerToggleToHoldPosition(page, true); + + await page.setViewportSize({ width: 930, height: 900 }); + await expectExplorerToggleToHoldPosition(page, false); + await expectExplorerToggleToHoldPosition(page, true); +}); + +async function expectClearOfWindowControls(page: Page, action: Locator) { + const minimize = page.getByRole("button", { name: "Minimize window", exact: true }); + await expect(minimize).toBeVisible(); + await expect(action).toBeVisible(); + const controlBounds = await minimize.boundingBox(); + const actionBounds = await action.boundingBox(); + expect(actionBounds!.x + actionBounds!.width).toBeLessThanOrEqual(controlBounds!.x); +} + +test("keeps the Explorer actions clear of Windows controls", async ({ page, withWorkspace }) => { + await page.setViewportSize({ width: 1440, height: 900 }); + await useDesktopWindowChrome(page, "custom-windows"); + + const { workspaceId } = await withWorkspace(); + await gotoWorkspace(page, workspaceId); + const open = explorerToggle(page, false); + await expectClearOfWindowControls(page, open); + await open.click(); + + const close = explorerToggle(page, true); + const newExplorerTab = explorerSidebar(page).getByRole("button", { + name: "New tab", + exact: true, + }); + await expectClearOfWindowControls(page, close); + await expectClearOfWindowControls(page, newExplorerTab); + await close.click(); + await expect(open).toBeVisible(); +});