diff --git a/ui/src/components/LanguagePopover.tsx b/ui/src/components/LanguagePopover.tsx index 2d13b896e..7a36675d4 100644 --- a/ui/src/components/LanguagePopover.tsx +++ b/ui/src/components/LanguagePopover.tsx @@ -67,7 +67,7 @@ export default function LanguagePopover() { ref={panelRef} role="radiogroup" aria-label={t('language.settings')} - className="ss-menu absolute left-0 bottom-full mb-3 z-50 !w-[300px] animate-dropdown-in" + className="ss-menu absolute left-0 bottom-full mb-3 z-50 !w-[300px] max-w-[calc(100vw-6rem)] max-h-[calc(100dvh-8rem)] overflow-y-auto animate-dropdown-in" > {localeOptions.map((entry) => { const on = locale === entry.code; diff --git a/ui/src/components/Layout.tsx b/ui/src/components/Layout.tsx index d8ecee95e..ab50fe4da 100644 --- a/ui/src/components/Layout.tsx +++ b/ui/src/components/Layout.tsx @@ -1,5 +1,5 @@ import { Link, Outlet, useNavigate, useLocation } from 'react-router-dom'; -import { useState, useCallback, useMemo } from 'react'; +import { useState, useCallback, useMemo, useEffect, useRef } from 'react'; import { useQuery } from '@tanstack/react-query'; import { LayoutDashboard, @@ -17,6 +17,8 @@ import { Settings, Keyboard, Compass, + Menu, + X, } from 'lucide-react'; import { api, type AuditAllResponse } from '../api/client'; import { queryKeys, staleTimes } from '../lib/queryKeys'; @@ -24,6 +26,8 @@ import { pendingCount } from './sync/syncView'; import { useAppContext } from '../context/AppContext'; import { useGlobalShortcuts } from '../hooks/useGlobalShortcuts'; import KeyboardShortcutsModal from './KeyboardShortcutsModal'; +import DialogShell from './DialogShell'; +import IconButton from './IconButton'; import ShortcutHUD from './ShortcutHUD'; import ScrollToTop from './ScrollToTop'; import { TargetAgents } from './targetAgents'; @@ -88,13 +92,37 @@ function isActive(item: NavItem, pathname: string): boolean { export default function Layout() { const t = useT(); const [shortcutsOpen, setShortcutsOpen] = useState(false); + const location = useLocation(); + const [navigationOpen, setNavigationOpen] = useState(false); + const [navigationLocation, setNavigationLocation] = useState(location); + if (navigationLocation !== location) { + setNavigationLocation(location); + setNavigationOpen(false); + } + const menuButton = useRef(null); + const closeNavigation = useCallback(() => { + setNavigationOpen(false); + menuButton.current?.focus(); + }, []); + + useEffect(() => { + const desktop = window.matchMedia('(min-width: 768px)'); + const onResize = () => { if (desktop.matches) setNavigationOpen(false); }; + desktop.addEventListener('change', onResize); + return () => desktop.removeEventListener('change', onResize); + }, []); const { isProjectMode, projectRoot } = useAppContext(); const { startTour } = useTour(); const nav = useNavigate(); - const location = useLocation(); - const toggleShortcuts = useCallback(() => setShortcutsOpen((v) => !v), []); - const handleSync = useCallback(() => nav('/sync'), [nav]); - const { modifierHeld } = useGlobalShortcuts({ onToggleHelp: toggleShortcuts, onSync: handleSync }); + const toggleShortcuts = useCallback(() => { + if (navigationOpen) closeNavigation(); + setShortcutsOpen((v) => !v); + }, [navigationOpen, closeNavigation]); + const handleNavigate = useCallback((path: string) => { + if (navigationOpen) closeNavigation(); + nav(path); + }, [navigationOpen, closeNavigation, nav]); + const { modifierHeld } = useGlobalShortcuts({ onToggleHelp: toggleShortcuts, onNavigate: handleNavigate }); const { data: overview } = useOverviewQuery(); const version = overview?.version; @@ -104,9 +132,8 @@ export default function Layout() { const { data: synced } = useSyncedTargetsQuery(); const targetAgents = useMemo(() => Object.fromEntries((synced?.targets ?? []).flatMap((x) => (x.agent ? [[x.name, x.agent]] : []))), [synced]); - return ( -
-
- + + ); -
+ return ( +
+ +
+ + {t('app.name')} +
+ +
+
+ } label={t('common.close')} onClick={closeNavigation} /> +
+ {sidebar} +
+
+ +
diff --git a/ui/src/components/tour/TourProvider.tsx b/ui/src/components/tour/TourProvider.tsx index 2728bcff1..00f69c001 100644 --- a/ui/src/components/tour/TourProvider.tsx +++ b/ui/src/components/tour/TourProvider.tsx @@ -127,7 +127,7 @@ export function TourProvider({ children }: { children: ReactNode }) { const cached = queryClient.getQueryData(queryKeys.overview); const skillCount = cached?.skillCount ?? 0; - const builtSteps = buildSteps({ isProjectMode, skillCount }); + const builtSteps = buildSteps({ isProjectMode, skillCount, isMobile: !window.matchMedia('(min-width: 768px)').matches }); setSteps(builtSteps); setCurrentStep(0); setIsActive(true); diff --git a/ui/src/components/tour/tourSteps.test.ts b/ui/src/components/tour/tourSteps.test.ts new file mode 100644 index 000000000..de4f8b992 --- /dev/null +++ b/ui/src/components/tour/tourSteps.test.ts @@ -0,0 +1,10 @@ +import { describe, expect, it } from 'vitest'; +import { buildSteps } from './tourSteps'; + +describe('buildSteps', () => { + it('omits the hidden sidebar shortcut target on mobile only', () => { + const options = { isProjectMode: false, skillCount: 1 }; + expect(buildSteps(options).some((s) => s.id === 'shortcuts-btn')).toBe(true); + expect(buildSteps({ ...options, isMobile: true }).some((s) => s.id === 'shortcuts-btn')).toBe(false); + }); +}); diff --git a/ui/src/components/tour/tourSteps.ts b/ui/src/components/tour/tourSteps.ts index 5f881258f..7b1ff9778 100644 --- a/ui/src/components/tour/tourSteps.ts +++ b/ui/src/components/tour/tourSteps.ts @@ -35,11 +35,12 @@ const ALL_STEPS: TourStep[] = [ interface BuildStepsOptions { isProjectMode: boolean; skillCount: number; + isMobile?: boolean; } -export function buildSteps({ isProjectMode, skillCount }: BuildStepsOptions): TourStep[] { +export function buildSteps({ isProjectMode, skillCount, isMobile = false }: BuildStepsOptions): TourStep[] { // A project keeps its skills in its own repository, so there is no Git Sync page. - let steps = isProjectMode ? ALL_STEPS.filter((s) => s.id !== 'git-actions') : ALL_STEPS; + let steps = ALL_STEPS.filter((s) => !(isProjectMode && s.id === 'git-actions') && !(isMobile && s.id === 'shortcuts-btn')); if (skillCount === 0) { steps = steps.map((s) => (HAS_EMPTY_COPY.has(s.id) ? { ...s, empty: true } : s)); } diff --git a/ui/src/hooks/useGlobalShortcuts.ts b/ui/src/hooks/useGlobalShortcuts.ts index 136ab4203..f27f0652c 100644 --- a/ui/src/hooks/useGlobalShortcuts.ts +++ b/ui/src/hooks/useGlobalShortcuts.ts @@ -61,11 +61,12 @@ export function claimSaveShortcut(): () => void { interface UseGlobalShortcutsOptions { onToggleHelp: () => void; onRefresh?: () => void; - onSync?: () => void; + onNavigate?: (path: string) => void; } -export function useGlobalShortcuts({ onToggleHelp, onRefresh, onSync }: UseGlobalShortcutsOptions) { - const navigate = useNavigate(); +export function useGlobalShortcuts({ onToggleHelp, onRefresh, onNavigate }: UseGlobalShortcutsOptions) { + const defaultNavigate = useNavigate(); + const navigate = onNavigate ?? defaultNavigate; const pendingChordRef = useRef(null); const chordTimerRef = useRef | null>(null); const [modifierHeld, setModifierHeld] = useState(false); @@ -93,11 +94,7 @@ export function useGlobalShortcuts({ onToggleHelp, onRefresh, onSync }: UseGloba // Reset modifier state immediately — macOS often swallows the // Meta keyup after a Cmd+key shortcut, leaving the HUD stuck. setModifierHeld(false); - if (onSync) { - onSync(); - } else { - navigate('/sync'); - } + navigate('/sync'); return; } // All other modifier combos: let browser handle natively @@ -197,7 +194,7 @@ export function useGlobalShortcuts({ onToggleHelp, onRefresh, onSync }: UseGloba clearChord(); clearModifierTimer(); }; - }, [navigate, onToggleHelp, onRefresh, onSync, clearChord]); + }, [navigate, onToggleHelp, onRefresh, clearChord]); return { modifierHeld }; } diff --git a/ui/src/i18n/locales/de.json b/ui/src/i18n/locales/de.json index 19d6d1801..a250f83e7 100644 --- a/ui/src/i18n/locales/de.json +++ b/ui/src/i18n/locales/de.json @@ -588,6 +588,7 @@ "layout.group.library": "Bibliothek", "layout.group.destinations": "Ziele", "layout.group.maintain": "Pflege", + "layout.navigation": "Navigation", "layout.nav.audit": "Audit", "layout.nav.dashboard": "Dashboard", "layout.nav.extras": "Extras", diff --git a/ui/src/i18n/locales/en.json b/ui/src/i18n/locales/en.json index df792317b..0f53740d0 100644 --- a/ui/src/i18n/locales/en.json +++ b/ui/src/i18n/locales/en.json @@ -756,6 +756,7 @@ "layout.group.library": "Library", "layout.group.destinations": "Destinations", "layout.group.maintain": "Maintain", + "layout.navigation": "Navigation", "layout.nav.audit": "Audit", "layout.nav.dashboard": "Dashboard", "layout.nav.extras": "Extras", diff --git a/ui/src/i18n/locales/es.json b/ui/src/i18n/locales/es.json index 30b4a3b3e..17115471e 100644 --- a/ui/src/i18n/locales/es.json +++ b/ui/src/i18n/locales/es.json @@ -588,6 +588,7 @@ "layout.group.library": "Biblioteca", "layout.group.destinations": "Destinos", "layout.group.maintain": "Mantenimiento", + "layout.navigation": "Navegación", "layout.nav.audit": "Auditoría", "layout.nav.dashboard": "Panel", "layout.nav.extras": "Extras", diff --git a/ui/src/i18n/locales/fa.json b/ui/src/i18n/locales/fa.json index 3cef862d8..f197582d1 100644 --- a/ui/src/i18n/locales/fa.json +++ b/ui/src/i18n/locales/fa.json @@ -588,6 +588,7 @@ "layout.group.library": "کتابخانه", "layout.group.destinations": "مقصدها", "layout.group.maintain": "نگهداری", + "layout.navigation": "ناوبری", "layout.nav.audit": "ممیزی", "layout.nav.dashboard": "داشبورد", "layout.nav.extras": "Extras", diff --git a/ui/src/i18n/locales/fr.json b/ui/src/i18n/locales/fr.json index 5ec0eadf5..4a812536a 100644 --- a/ui/src/i18n/locales/fr.json +++ b/ui/src/i18n/locales/fr.json @@ -588,6 +588,7 @@ "layout.group.library": "Bibliothèque", "layout.group.destinations": "Destinations", "layout.group.maintain": "Maintenance", + "layout.navigation": "Navigation", "layout.nav.audit": "Audit", "layout.nav.dashboard": "Tableau de bord", "layout.nav.extras": "Extras", diff --git a/ui/src/i18n/locales/id.json b/ui/src/i18n/locales/id.json index bac59472a..4eee6fc66 100644 --- a/ui/src/i18n/locales/id.json +++ b/ui/src/i18n/locales/id.json @@ -588,6 +588,7 @@ "layout.group.library": "Pustaka", "layout.group.destinations": "Tujuan", "layout.group.maintain": "Pemeliharaan", + "layout.navigation": "Navigasi", "layout.nav.audit": "Audit", "layout.nav.dashboard": "Dasbor", "layout.nav.extras": "Extras", diff --git a/ui/src/i18n/locales/ja.json b/ui/src/i18n/locales/ja.json index 226a6d729..e0456e208 100644 --- a/ui/src/i18n/locales/ja.json +++ b/ui/src/i18n/locales/ja.json @@ -588,6 +588,7 @@ "layout.group.library": "ライブラリ", "layout.group.destinations": "同期先", "layout.group.maintain": "メンテナンス", + "layout.navigation": "ナビゲーション", "layout.nav.audit": "監査", "layout.nav.dashboard": "ダッシュボード", "layout.nav.extras": "Extras", diff --git a/ui/src/i18n/locales/ko.json b/ui/src/i18n/locales/ko.json index 48608649c..2c3983fa2 100644 --- a/ui/src/i18n/locales/ko.json +++ b/ui/src/i18n/locales/ko.json @@ -588,6 +588,7 @@ "layout.group.library": "라이브러리", "layout.group.destinations": "대상", "layout.group.maintain": "유지보수", + "layout.navigation": "탐색 메뉴", "layout.nav.audit": "감사", "layout.nav.dashboard": "대시보드", "layout.nav.extras": "Extras", diff --git a/ui/src/i18n/locales/pt-BR.json b/ui/src/i18n/locales/pt-BR.json index b1bf60520..5ef81fe69 100644 --- a/ui/src/i18n/locales/pt-BR.json +++ b/ui/src/i18n/locales/pt-BR.json @@ -588,6 +588,7 @@ "layout.group.library": "Biblioteca", "layout.group.destinations": "Destinos", "layout.group.maintain": "Manutenção", + "layout.navigation": "Navegação", "layout.nav.audit": "Auditoria", "layout.nav.dashboard": "Painel", "layout.nav.extras": "Extras", diff --git a/ui/src/i18n/locales/zh-CN.json b/ui/src/i18n/locales/zh-CN.json index 7b142e245..6b3f50c58 100644 --- a/ui/src/i18n/locales/zh-CN.json +++ b/ui/src/i18n/locales/zh-CN.json @@ -588,6 +588,7 @@ "layout.group.library": "资源库", "layout.group.destinations": "目的地", "layout.group.maintain": "维护", + "layout.navigation": "导航菜单", "layout.nav.audit": "审计", "layout.nav.dashboard": "仪表盘", "layout.nav.extras": "Extras", diff --git a/ui/src/i18n/locales/zh-TW.json b/ui/src/i18n/locales/zh-TW.json index 85b44cba9..f88fc9f2d 100644 --- a/ui/src/i18n/locales/zh-TW.json +++ b/ui/src/i18n/locales/zh-TW.json @@ -588,6 +588,7 @@ "layout.group.library": "資源庫", "layout.group.destinations": "目的地", "layout.group.maintain": "維護", + "layout.navigation": "導覽選單", "layout.nav.audit": "稽核", "layout.nav.dashboard": "儀表板", "layout.nav.extras": "Extras", diff --git a/ui/src/pages/ResourcesPage.tsx b/ui/src/pages/ResourcesPage.tsx index a0d64a976..9a8215e22 100644 --- a/ui/src/pages/ResourcesPage.tsx +++ b/ui/src/pages/ResourcesPage.tsx @@ -1020,7 +1020,7 @@ export default function ResourcesPage({ kind }: { kind: Kind }) { )} /> -