diff --git a/e2e/checks/accessibility.cjs b/e2e/checks/accessibility.cjs index b4cd3dc0b..85c4ade86 100644 --- a/e2e/checks/accessibility.cjs +++ b/e2e/checks/accessibility.cjs @@ -40,8 +40,8 @@ module.exports = async ({ page, go, shot, fail, settled, tolerate }) => { assert.ok(await skip.evaluate(el => el === document.activeElement), 'Skip link is not the first keyboard stop'); await page.keyboard.press('Enter'); assert.equal(await page.evaluate(() => document.activeElement?.id), 'main-content'); - await page.getByRole('button', { name: 'Toggle Sidebar', exact: true }).click(); - await page.getByRole('navigation', { name: 'Sections', exact: true }).getByRole('link', { name: 'Tasks', exact: true }).click(); + await page.getByRole('button', { name: 'Sections', exact: true }).click(); + await page.getByRole('menuitem', { name: 'Tasks', exact: true }).click(); await page.waitForFunction(() => document.activeElement?.id === 'main-content', null, { timeout: 5000 }).catch(() => {}); assert.equal(await page.evaluate(() => document.activeElement?.id), 'main-content', 'route navigation did not focus main'); await page.getByRole('button', { name: 'Jump to', exact: true }).click(); diff --git a/ui/src/App.vue b/ui/src/App.vue index 269bb06e4..ee35d463d 100644 --- a/ui/src/App.vue +++ b/ui/src/App.vue @@ -8,7 +8,6 @@ import { useAccountsStore } from "@/accounts/accounts"; import ChatDock from "@/chat/ChatDock.vue"; import AlertsBell from "@/alerts/AlertsBell.vue"; -import AppSidebar from "@/components/AppSidebar.vue"; import CommandPalette from "@/components/command-palette/CommandPalette.vue"; import AccountMenu from "@/components/topbar/AccountMenu.vue"; import OrgCrumb from "@/components/topbar/OrgCrumb.vue"; @@ -20,7 +19,7 @@ import ConnectionPill from "@/components/topbar/ConnectionPill.vue"; import { Breadcrumb, BreadcrumbItem, BreadcrumbList, BreadcrumbSeparator } from "@/components/ui/breadcrumb"; import { Alert, AlertDescription } from "@/components/ui/alert"; import { Card } from "@/components/ui/card"; -import { SidebarInset, SidebarProvider, SidebarTrigger } from "@/components/ui/sidebar"; +import { SidebarInset, SidebarProvider } from "@/components/ui/sidebar"; import NewTaskDialog from "@/tasks/NewTaskDialog.vue"; import SettingsShell from "@/settings/SettingsShell.vue"; import { TooltipProvider } from "@/components/ui/tooltip"; @@ -97,12 +96,10 @@ watch(() => accounts.status?.user, (user) => { Skip to main content -
- - + @@ -110,13 +107,13 @@ watch(() => accounts.status?.user, (user) => { -
+
- +
-import NavMain from "@/components/NavMain.vue"; -import NavUser from "@/components/NavUser.vue"; -import TeamSwitcher from "@/components/TeamSwitcher.vue"; -import { Sidebar, SidebarContent, SidebarFooter, SidebarHeader, useSidebar } from "@/components/ui/sidebar"; - -defineProps<{ hidden: string[] }>(); - -// Desktop navigation lives in the topbar; only the phone sheet remains. -const { isMobile } = useSidebar(); - - - diff --git a/ui/src/components/NavMain.vue b/ui/src/components/NavMain.vue deleted file mode 100644 index 9053e38c6..000000000 --- a/ui/src/components/NavMain.vue +++ /dev/null @@ -1,36 +0,0 @@ - - - diff --git a/ui/src/components/NavUser.vue b/ui/src/components/NavUser.vue deleted file mode 100644 index f94ebd4bc..000000000 --- a/ui/src/components/NavUser.vue +++ /dev/null @@ -1,54 +0,0 @@ - - - diff --git a/ui/src/components/TeamSwitcher.vue b/ui/src/components/TeamSwitcher.vue deleted file mode 100644 index 2b4ff3e8a..000000000 --- a/ui/src/components/TeamSwitcher.vue +++ /dev/null @@ -1,76 +0,0 @@ - - - diff --git a/ui/src/components/topbar/OrgCrumb.vue b/ui/src/components/topbar/OrgCrumb.vue index eceafd94e..f4b652aa1 100644 --- a/ui/src/components/topbar/OrgCrumb.vue +++ b/ui/src/components/topbar/OrgCrumb.vue @@ -41,7 +41,7 @@ const hover = useHoverOpen(); @@ -52,5 +52,5 @@ const hover = useHoverOpen(); - {{ name }} + {{ name }} diff --git a/ui/src/components/topbar/hover-open.ts b/ui/src/components/topbar/hover-open.ts index ab9e9548c..d1aa235fb 100644 --- a/ui/src/components/topbar/hover-open.ts +++ b/ui/src/components/topbar/hover-open.ts @@ -6,25 +6,33 @@ import { onUnmounted, ref } from "vue"; * is on the trigger, the menu's own close request is ignored, so a click on a * crumb the hover already opened does not snap it shut. Use with * `:modal="false"`: a modal menu blocks the pointer events this relies on. + * Touch and pen pointers are ignored: a tap fires enter and leave around its + * click, and the leave would shut the menu the click just opened. */ export function useHoverOpen(closeDelay = 150) { const open = ref(false); let overTrigger = false; let timer: ReturnType | undefined; - function enter(): void { + const mouse = (event?: PointerEvent) => !event || event.pointerType === "mouse"; + + function enter(event?: PointerEvent): void { + if (!mouse(event)) return; clearTimeout(timer); open.value = true; } - function leave(): void { + function leave(event?: PointerEvent): void { + if (!mouse(event)) return; clearTimeout(timer); timer = setTimeout(() => (open.value = false), closeDelay); } - function enterTrigger(): void { + function enterTrigger(event: PointerEvent): void { + if (!mouse(event)) return; overTrigger = true; enter(); } - function leaveTrigger(): void { + function leaveTrigger(event: PointerEvent): void { + if (!mouse(event)) return; overTrigger = false; leave(); }