From 057f2bf6d853044b457335e6caf8b13949fc9b24 Mon Sep 17 00:00:00 2001 From: Pixel Perfect Date: Mon, 2 Nov 2026 11:34:19 -0800 Subject: [PATCH 1/8] feat(web): reveal the hidden sidebar on mouse hover --- apps/web/src/components/AppSidebarLayout.tsx | 4 +- .../settings/AppearanceSettingsPanel.tsx | 23 +++ .../components/settings/SettingsPanels.tsx | 4 + .../src/components/settings/settingsSearch.ts | 6 + .../components/ui/sidebar.browser.test.tsx | 101 +++++++++++- apps/web/src/components/ui/sidebar.tsx | 45 +++++- apps/web/src/components/ui/sidebarPeek.ts | 151 ++++++++++++++++++ apps/web/src/localApi.ts | 22 ++- docs/user/appearance.md | 7 + packages/contracts/src/settings.ts | 2 + 10 files changed, 351 insertions(+), 14 deletions(-) create mode 100644 apps/web/src/components/ui/sidebarPeek.ts diff --git a/apps/web/src/components/AppSidebarLayout.tsx b/apps/web/src/components/AppSidebarLayout.tsx index 91df5616f7f50..28eb39a03aca1 100644 --- a/apps/web/src/components/AppSidebarLayout.tsx +++ b/apps/web/src/components/AppSidebarLayout.tsx @@ -31,7 +31,7 @@ import { selectActiveRightPanel, useRightPanelStore } from "../rightPanelStore"; import { selectThreadTerminalUiState, useTerminalUiStateStore } from "../terminalUiStateStore"; import { cn, isMacPlatform } from "../lib/utils"; import { primaryServerKeybindingsAtom } from "../state/server"; -import { useEnvironmentIdentificationMode } from "../hooks/useSettings"; +import { useClientSettings, useEnvironmentIdentificationMode } from "../hooks/useSettings"; import { PanelAnimationSuppressionProvider, usePanelAnimationSettings, @@ -402,6 +402,7 @@ function SidebarControl() { } export function AppSidebarLayout({ children }: { children: ReactNode }) { + const revealOnHover = useClientSettings((settings) => settings.sidebarRevealOnHover); const sidebarArea = workspaceAreaProps("sidebar", 0, "Threads"); const [sidebarRouteReveal] = useState(() => ({ observedKey: null, @@ -454,6 +455,7 @@ export function AppSidebarLayout({ children }: { children: ReactNode }) { } /> + + updateSettings({ + sidebarRevealOnHover: DEFAULT_UNIFIED_SETTINGS.sidebarRevealOnHover, + }) + } + /> + ) : null + } + control={ + updateSettings({ sidebarRevealOnHover: checked })} + aria-label="Reveal sidebar on hover" + /> + } + /> void) { ...(settings.sidebarWorkingShelfEnabled !== DEFAULT_UNIFIED_SETTINGS.sidebarWorkingShelfEnabled ? ["Working section"] : []), + ...(settings.sidebarRevealOnHover !== DEFAULT_UNIFIED_SETTINGS.sidebarRevealOnHover + ? ["Reveal sidebar on hover"] + : []), ...(settings.sidebarAutoSettleAfterDays !== DEFAULT_UNIFIED_SETTINGS.sidebarAutoSettleAfterDays ? ["Auto-settle inactive threads"] : []), @@ -649,6 +652,7 @@ export function useSettingsRestore(onRestored?: () => void) { sidebarProjectGroupingMode: DEFAULT_UNIFIED_SETTINGS.sidebarProjectGroupingMode, sidebarProjectSortOrder: DEFAULT_UNIFIED_SETTINGS.sidebarProjectSortOrder, sidebarWorkingShelfEnabled: DEFAULT_UNIFIED_SETTINGS.sidebarWorkingShelfEnabled, + sidebarRevealOnHover: DEFAULT_UNIFIED_SETTINGS.sidebarRevealOnHover, sidebarAutoSettleAfterDays: DEFAULT_UNIFIED_SETTINGS.sidebarAutoSettleAfterDays, sidebarAutoSettleKeepPullRequests: DEFAULT_UNIFIED_SETTINGS.sidebarAutoSettleKeepPullRequests, sidebarAutoSettleOnMerge: DEFAULT_UNIFIED_SETTINGS.sidebarAutoSettleOnMerge, diff --git a/apps/web/src/components/settings/settingsSearch.ts b/apps/web/src/components/settings/settingsSearch.ts index d28e467b0cf70..7a337643f6a25 100644 --- a/apps/web/src/components/settings/settingsSearch.ts +++ b/apps/web/src/components/settings/settingsSearch.ts @@ -360,6 +360,12 @@ export const SETTINGS_SEARCH_ITEMS = [ title: "Panel animations", to: "/settings/appearance", }, + { + id: "sidebar-reveal-on-hover", + title: "Reveal sidebar on hover", + to: "/settings/appearance", + searchTerms: ["sidebar auto appear hover peek hidden left edge mouse"], + }, { id: "environment-identification", title: "Environment identification", diff --git a/apps/web/src/components/ui/sidebar.browser.test.tsx b/apps/web/src/components/ui/sidebar.browser.test.tsx index 288367fa4a3ed..034a7a7f46a08 100644 --- a/apps/web/src/components/ui/sidebar.browser.test.tsx +++ b/apps/web/src/components/ui/sidebar.browser.test.tsx @@ -1,8 +1,11 @@ import { page, userEvent } from "vite-plus/test/browser"; import { describe, expect, it, vi } from "vite-plus/test"; -import { render } from "../../../test/render"; +import { act, fakeTimers, render } from "../../../test/render"; import { Sidebar, SidebarProvider, SidebarRail, SidebarTrigger, useSidebar } from "./sidebar"; +import { Menu, MenuTrigger, MenuPopup, MenuItem } from "./menu"; +import { ensureLocalApi } from "~/localApi"; +import "~/index.css"; function CollapseFromInside() { const { setOpen } = useSidebar(); @@ -13,11 +16,16 @@ function CollapseFromInside() { ); } -function Harness(props: { readonly onResize?: (width: number) => void }) { +function Harness(props: { + readonly onResize?: (width: number) => void; + readonly revealOnHover?: boolean; + readonly defaultOpen?: boolean; +}) { return ( - + void }) { }} > + + Sidebar menu + + Menu action + + + + ); } describe("Sidebar", () => { + it("peeks only for mouse hover, overlays the chat, and keeps the explicit toggle available", async () => { + await page.viewport(1280, 800); + await using screen = await render(, { + router: false /* no routes involved */, + }); + using _timers = fakeTimers(); + const edge = screen.container.querySelector('[data-slot="sidebar-hover-edge"]')!; + const sidebar = screen.container.querySelector('[data-slot="sidebar"]')!; + const enter = async (pointerType: string) => { + edge.dispatchEvent(new PointerEvent("pointerover", { bubbles: true, pointerType })); + await act(() => vi.advanceTimersByTimeAsync(110)); + }; + for (const pointerType of ["touch", "pen"]) { + await enter(pointerType); + expect(sidebar.inert).toBe(true); + } + await enter("mouse"); + expect(sidebar.inert).toBe(false); + expect(sidebar.dataset.state).toBe("collapsed"); + expect(sidebar.contains(document.elementFromPoint(20, 325))).toBe(true); + expect(sidebar.querySelector('[data-slot="sidebar-gap"]')!.getBoundingClientRect().width).toBe( + 0, + ); + expect( + sidebar.querySelector('[data-slot="sidebar-container"]')!.getBoundingClientRect().left, + ).toBe(0); + const rail = sidebar.querySelector('[data-sidebar="rail"]')!; + const pointer = { + bubbles: true, + cancelable: true, + pointerId: 1, + button: 0, + pointerType: "mouse", + }; + rail.dispatchEvent(new PointerEvent("pointerdown", { ...pointer, clientX: 255 })); + rail.dispatchEvent(new PointerEvent("pointerup", { ...pointer, clientX: 350 })); + await act(() => vi.advanceTimersByTimeAsync(0)); + expect(sidebar.dataset.state).toBe("collapsed"); + expect(sidebar.querySelector('[data-slot="sidebar-gap"]')!.getBoundingClientRect().width).toBe( + 0, + ); + expect( + sidebar.querySelector('[data-slot="sidebar-container"]')!.getBoundingClientRect().width, + ).toBe(351); + screen.container.querySelector('[data-slot="sidebar-trigger"]')!.click(); + await act(() => vi.advanceTimersByTimeAsync(0)); + expect(sidebar.dataset.state).toBe("expanded"); + expect(sidebar.inert).toBe(false); + }); + + it("retains the peek for its popup and context menus, then dismisses on departure", async () => { + await page.viewport(1280, 800); + await using screen = await render(, { + router: false /* no routes involved */, + }); + const edge = screen.container.querySelector('[data-slot="sidebar-hover-edge"]')!; + const sidebar = screen.container.querySelector('[data-slot="sidebar"]')!; + await userEvent.hover(edge); + await vi.waitFor(() => expect(sidebar.inert).toBe(false)); + await userEvent.click(screen.getByRole("button", { name: "Sidebar menu" })); + await userEvent.hover(page.getByRole("menuitem", { name: "Menu action" })); + expect(sidebar.inert).toBe(false); + await userEvent.keyboard("{Escape}"); + const menu = ensureLocalApi().contextMenu.show([{ id: "action", label: "Context action" }], { + x: 100, + y: 100, + }); + await expect.element(page.getByRole("menuitem", { name: "Context action" })).toBeVisible(); + await userEvent.hover(screen.getByRole("button", { name: "Outside" })); + expect(sidebar.inert).toBe(false); + await ensureLocalApi().contextMenu.close(); + await menu; + await vi.waitFor(() => expect(sidebar.inert).toBe(true)); + }); + it("hands focus to the outside trigger when it collapses around the focused control", async () => { await page.viewport(1280, 800); await using screen = await render(, { router: false /* no routes involved */ }); diff --git a/apps/web/src/components/ui/sidebar.tsx b/apps/web/src/components/ui/sidebar.tsx index e99509c8ce60e..3fd6114c96299 100644 --- a/apps/web/src/components/ui/sidebar.tsx +++ b/apps/web/src/components/ui/sidebar.tsx @@ -22,6 +22,7 @@ import { setLocalStorageItem } from "~/hooks/useLocalStorage"; import { resolveSidebarState, type ResponsiveSidebarState } from "./sidebarState"; import * as Schema from "effect/Schema"; import { announceSidebarVisibility } from "~/lib/accessibilityAnnouncements"; +import { useSidebarPeek } from "./sidebarPeek"; const SIDEBAR_COOKIE_NAME = "sidebar_state"; const SIDEBAR_COOKIE_MAX_AGE = 60 * 60 * 24 * 7; @@ -78,6 +79,7 @@ type SidebarResolvedResizableOptions = { type SidebarInstanceContextProps = { resizable: SidebarResolvedResizableOptions | null; side: "left" | "right"; + revealed?: boolean; }; const SidebarContext = React.createContext(null); @@ -264,6 +266,7 @@ function Sidebar({ side = "left", variant = "sidebar", collapsible = "offcanvas", + revealOnHover = false, resizable = false, className, children, @@ -272,13 +275,22 @@ function Sidebar({ side?: "left" | "right"; variant?: "sidebar" | "floating" | "inset"; collapsible?: "offcanvas" | "icon" | "none"; + revealOnHover?: boolean; resizable?: boolean | SidebarResizableOptions; }) { const { isMobile, state, openMobile, setOpenMobile, setMobileSheetElement } = useSidebar(); const offcanvasCollapsed = !isMobile && collapsible === "offcanvas" && state === "collapsed"; + const hasHover = useMediaQuery("(any-hover: hover) and (any-pointer: fine)"); + const { ref: peekRef, ...peek } = useSidebarPeek( + revealOnHover && offcanvasCollapsed && side === "left" && hasHover, + ); const resolvedResizable = resolveSidebarResizable({ collapsible, isMobile, resizable }); - const instanceContextValue: SidebarInstanceContextProps = { side, resizable: resolvedResizable }; + const instanceContextValue: SidebarInstanceContextProps = { + side, + resizable: resolvedResizable, + revealed: peek.revealed, + }; if (collapsible === "none") { return ( @@ -340,11 +352,28 @@ function Sidebar({ return ( + {revealOnHover && offcanvasCollapsed && side === "left" && hasHover && ( +