diff --git a/src/Bermuda.Web/e2e/panes.spec.ts b/src/Bermuda.Web/e2e/panes.spec.ts new file mode 100644 index 0000000..950c54a --- /dev/null +++ b/src/Bermuda.Web/e2e/panes.spec.ts @@ -0,0 +1,120 @@ +import type { Page } from '@playwright/test' +import { test, expect } from './fixtures' +import { mapCollapsedKey, sidebarCollapsedKey } from '../src/components/useCollapsiblePane' + +const sidebarToggle = (page: Page) => page.getByRole('button', { name: /sidebar/i }) +const mapToggle = (page: Page) => page.getByRole('button', { name: /map/i }) + +async function resetPanes(page: Page) { + await page.evaluate(([sidebarKey, mapKey]) => { + localStorage.removeItem(sidebarKey) + localStorage.removeItem(mapKey) + }, [sidebarCollapsedKey, mapCollapsedKey] as const) + await page.reload() + await page.waitForSelector('tbody tr') + await page.waitForSelector('.leaflet-container') +} + +test.describe('collapsible panes', () => { + test.beforeEach(async ({ page }) => { + await resetPanes(page) + await expect(sidebarToggle(page)).toHaveAttribute('aria-expanded', 'true') + await expect(mapToggle(page)).toHaveAttribute('aria-expanded', 'true') + }) + + // The shared WebView2 keeps localStorage. Leave both panes open for the rest of the suite. + test.afterEach(async ({ page }) => { + await resetPanes(page) + }) + + test('collapses and expands the sidebar and the map', async ({ page }) => { + const sidebar = page.locator('[data-pane="sidebar"]') + const map = page.locator('[data-pane="map"]') + const sidebarButton = sidebarToggle(page) + const mapButton = mapToggle(page) + + expect(await sidebar.evaluate(el => getComputedStyle(el).transitionProperty)).toContain('width') + expect(await map.evaluate(el => getComputedStyle(el).transitionProperty)).toMatch(/width|flex-basis/) + + // Focus was inside the sidebar, so collapsing with Ctrl+B moves it to the toggle. + await page.getByRole('button', { name: 'New window' }).focus() + await page.evaluate(() => { + const el = document.querySelector('[data-pane="sidebar"]') + const widths: number[] = [] + ;(window as unknown as { __paneWidths?: number[] }).__paneWidths = widths + if (!el) return + const start = performance.now() + const tick = () => { + widths.push(el.getBoundingClientRect().width) + if (performance.now() - start < 420) requestAnimationFrame(tick) + } + requestAnimationFrame(tick) + }) + await page.keyboard.press('Control+b') + await page.waitForTimeout(450) + const duration = await sidebar.evaluate(el => getComputedStyle(el).transitionDuration) + if (!duration.split(',').every(part => part.trim() === '0s')) { + const widths = await page.evaluate(() => (window as unknown as { __paneWidths: number[] }).__paneWidths) + const openWidth = Math.max(...widths) + expect(widths.some(width => width < openWidth - 24 && width > 56)).toBe(true) + } + await expect(sidebarButton).toHaveAttribute('aria-expanded', 'false') + await expect(sidebarButton).toBeFocused() + await expect(page.locator('#app-sidebar')).toBeHidden() + await expect.poll(() => sidebar.evaluate(el => el.getBoundingClientRect().width)).toBeLessThan(56) + await expect(page.locator('tbody tr')).toHaveCount(8) + await expect(mapButton).toHaveAttribute('aria-expanded', 'true') + + await page.locator('.leaflet-control-zoom-in').focus() + await page.keyboard.press('Control+Backslash') + await expect(mapButton).toHaveAttribute('aria-expanded', 'false') + await expect(mapButton).toBeFocused() + await expect(page.locator('#incident-map')).toBeHidden() + await expect.poll(async () => { + const rect = await map.evaluate(el => el.getBoundingClientRect()) + return Math.min(rect.width, rect.height) + }).toBeLessThan(56) + + await sidebarButton.click() + await expect(sidebarButton).toHaveAttribute('aria-expanded', 'true') + await expect(page.locator('#app-sidebar')).toBeVisible() + await expect(page.getByRole('button', { name: 'Open probe' })).toBeVisible() + await expect.poll(() => sidebar.evaluate(el => el.getBoundingClientRect().width)).toBeGreaterThan(200) + + await mapButton.click() + await expect(mapButton).toHaveAttribute('aria-expanded', 'true') + await expect(page.locator('.leaflet-container')).toBeVisible() + await expect(page.locator('.leaflet-interactive')).toHaveCount(8) + }) + + test('keeps each pane collapsed after reload', async ({ page }) => { + await sidebarToggle(page).click() + await mapToggle(page).click() + await expect(sidebarToggle(page)).toHaveAttribute('aria-expanded', 'false') + await expect(mapToggle(page)).toHaveAttribute('aria-expanded', 'false') + await expect.poll(() => page.evaluate(([sidebarKey, mapKey]) => ({ + sidebar: localStorage.getItem(sidebarKey), + map: localStorage.getItem(mapKey), + }), [sidebarCollapsedKey, mapCollapsedKey] as const)).toEqual({ sidebar: 'true', map: 'true' }) + + await page.reload() + await page.waitForSelector('tbody tr') + await expect(sidebarToggle(page)).toHaveAttribute('aria-expanded', 'false') + await expect(mapToggle(page)).toHaveAttribute('aria-expanded', 'false') + await expect(page.locator('#app-sidebar')).toBeHidden() + await expect(page.locator('#incident-map')).toBeHidden() + + await sidebarToggle(page).click() + await mapToggle(page).click() + await expect.poll(() => page.evaluate(([sidebarKey, mapKey]) => ({ + sidebar: localStorage.getItem(sidebarKey), + map: localStorage.getItem(mapKey), + }), [sidebarCollapsedKey, mapCollapsedKey] as const)).toEqual({ sidebar: 'false', map: 'false' }) + + await page.reload() + await page.waitForSelector('tbody tr') + await page.waitForSelector('.leaflet-container') + await expect(sidebarToggle(page)).toHaveAttribute('aria-expanded', 'true') + await expect(mapToggle(page)).toHaveAttribute('aria-expanded', 'true') + }) +}) diff --git a/src/Bermuda.Web/src/App.css b/src/Bermuda.Web/src/App.css index 0517759..7d4cde9 100644 --- a/src/Bermuda.Web/src/App.css +++ b/src/Bermuda.Web/src/App.css @@ -16,6 +16,7 @@ color-scheme: dark; color: rgba(255, 255, 255, 0.87); flex: 1; + min-width: 0; min-height: 0; overflow: hidden; box-sizing: border-box; @@ -24,11 +25,6 @@ flex-direction: column; } -.heading-logo { - width: 2.25rem; - height: 2.25rem; -} - /* Narrow windows: the dashboard stacks (see IncidentsDashboard.module.css), so let the page scroll. */ @media (max-width: 900px) { .content { @@ -36,15 +32,6 @@ } } -.content h1 { - display: flex; - align-items: center; - gap: 0.6rem; - flex-shrink: 0; - margin: 0 0 1.25rem; - font-size: 2rem; -} - .logo { height: 6em; padding: 1.5em; @@ -80,10 +67,3 @@ .read-the-docs { color: #888; } - -.app-header { - display: flex; - align-items: center; - justify-content: space-between; - gap: 1rem; -} diff --git a/src/Bermuda.Web/src/App.module.css b/src/Bermuda.Web/src/App.module.css new file mode 100644 index 0000000..3b99d9c --- /dev/null +++ b/src/Bermuda.Web/src/App.module.css @@ -0,0 +1,97 @@ +.shell { + display: flex; + flex: 1 1 auto; + min-height: 0; + min-width: 0; + align-items: stretch; +} + +.sidebar { + display: flex; + flex-direction: row; + align-items: stretch; + flex: 0 0 17rem; + width: 17rem; + min-width: 0; + min-height: 0; + overflow: hidden; + box-sizing: border-box; + background: #242424; + color: rgba(255, 255, 255, 0.87); + color-scheme: dark; + border-right: 1px solid #1e293b; + transition: flex-basis 200ms ease, width 200ms ease; +} + +.sidebar[data-collapsed='true'] { + flex-basis: 2.75rem; + width: 2.75rem; +} + +.pane { + flex: 1 1 auto; + align-self: stretch; + min-width: 0; + min-height: 0; + overflow: auto; + display: flex; + flex-direction: column; + gap: 0.9rem; + padding: 0.25rem 0.85rem 1rem 0.15rem; + box-sizing: border-box; + opacity: 1; + visibility: visible; + transition: opacity 200ms ease, visibility 0s linear; +} + +.sidebar[data-collapsed='true'] .pane { + overflow: hidden; + opacity: 0; + visibility: hidden; + pointer-events: none; + transition: opacity 200ms ease, visibility 0s linear 200ms; +} + +.brand { + display: flex; + align-items: center; + gap: 0.6rem; + margin: 0; + min-height: 2.25rem; + font-size: 1.25rem; + font-weight: 600; + line-height: 1.2; + white-space: nowrap; +} + +.logo { + width: 2rem; + height: 2rem; + flex: 0 0 auto; +} + +.nav { + display: flex; + flex-direction: column; + gap: 0.75rem; + min-width: 0; +} + +.windows button { + width: 100%; + box-sizing: border-box; + padding: 0.4em 0.75em; + font-size: 0.875rem; + text-align: left; + /* Explicit: the global button rule uses a light background under a light OS theme. */ + background-color: #1a1a1a; + color: rgba(255, 255, 255, 0.87); +} + +@media (prefers-reduced-motion: reduce) { + .sidebar, + .pane { + transition-duration: 0s; + transition-delay: 0s; + } +} diff --git a/src/Bermuda.Web/src/App.tsx b/src/Bermuda.Web/src/App.tsx index db98848..c6c11d6 100644 --- a/src/Bermuda.Web/src/App.tsx +++ b/src/Bermuda.Web/src/App.tsx @@ -4,10 +4,29 @@ import { OpenWindows } from './components/OpenWindows' import logo from './assets/bermuda.svg' import { IncidentsDashboard } from './components/IncidentsDashboard' import { UpdateBanner } from './components/UpdateBanner' +import { sidebarCollapsedKey, useCollapsiblePane } from './components/useCollapsiblePane' import { bermudaHost } from './bridge' +import styles from './App.module.css' +import toggleStyles from './components/paneToggle.module.css' import './App.css' +function SidebarIcon() { + return ( + + ) +} + function App() { + const { + collapsed: sidebarCollapsed, + toggle: toggleSidebar, + paneRef: sidebarPaneRef, + toggleRef: sidebarToggleRef, + } = useCollapsiblePane(sidebarCollapsedKey, 'KeyB') + // Indeterminate taskbar progress while the initial incidents query is in // flight; IncidentsDashboard clears it once it mounts (data is ready, since // it only renders past the Suspense boundary below). @@ -17,21 +36,55 @@ function App() { } }, []) + const sidebarLabel = sidebarCollapsed ? 'Expand sidebar' : 'Collapse sidebar' + return ( -
-
-

- - Bermuda -

- - -
- - Loading incidents…

}> - -
-
+
+
+ + +
+
+ + Loading incidents…

}> + +
+
+
) } diff --git a/src/Bermuda.Web/src/components/ChannelPicker.module.css b/src/Bermuda.Web/src/components/ChannelPicker.module.css index 0969d08..5017a05 100644 --- a/src/Bermuda.Web/src/components/ChannelPicker.module.css +++ b/src/Bermuda.Web/src/components/ChannelPicker.module.css @@ -4,6 +4,7 @@ border: 0; min-width: 0; display: flex; + flex-wrap: wrap; gap: 0.375rem; align-items: center; } diff --git a/src/Bermuda.Web/src/components/IncidentsDashboard.module.css b/src/Bermuda.Web/src/components/IncidentsDashboard.module.css index 3a8c786..8c6b96a 100644 --- a/src/Bermuda.Web/src/components/IncidentsDashboard.module.css +++ b/src/Bermuda.Web/src/components/IncidentsDashboard.module.css @@ -12,10 +12,43 @@ overflow: auto; } -.mapSection { +.mapColumn { + display: flex; + flex-direction: row; + align-items: stretch; flex: 0 0 40%; - min-width: 420px; + width: 40%; + min-width: calc(420px + 2.75rem); + box-sizing: border-box; + overflow: hidden; + transition: flex-basis 200ms ease, width 200ms ease, min-width 200ms ease, height 200ms ease; +} + +.mapColumn[data-collapsed='true'] { + flex-basis: 2.75rem; + width: 2.75rem; + min-width: 2.75rem; +} + +.mapPane { + flex: 1 1 auto; + align-self: stretch; + min-width: 0; + min-height: 0; display: flex; + overflow: hidden; + opacity: 1; + visibility: visible; + transition: opacity 200ms ease, visibility 0s linear; +} + +.mapColumn[data-collapsed='true'] .mapPane { + flex: 0 0 0; + width: 0; + opacity: 0; + visibility: hidden; + pointer-events: none; + transition: opacity 200ms ease, visibility 0s linear 200ms; } /* Too narrow for two columns (the map alone needs 420px): stack them and let the page scroll. */ @@ -30,9 +63,25 @@ overflow-y: visible; } - .mapSection { + .mapColumn { flex: none; + width: 100%; min-width: 0; height: 24rem; } + + .mapColumn[data-collapsed='true'] { + flex-basis: auto; + width: 100%; + min-width: 0; + height: 2.75rem; + } +} + +@media (prefers-reduced-motion: reduce) { + .mapColumn, + .mapPane { + transition-duration: 0s; + transition-delay: 0s; + } } diff --git a/src/Bermuda.Web/src/components/IncidentsDashboard.tsx b/src/Bermuda.Web/src/components/IncidentsDashboard.tsx index 789a2d2..edfa563 100644 --- a/src/Bermuda.Web/src/components/IncidentsDashboard.tsx +++ b/src/Bermuda.Web/src/components/IncidentsDashboard.tsx @@ -14,6 +14,8 @@ import { import { useFdc3Listeners } from '../fdc3/useFdc3Listeners' import { IncidentsTable } from './IncidentsTable' import { IncidentMap } from './IncidentMap' +import { mapCollapsedKey, useCollapsiblePane } from './useCollapsiblePane' +import toggleStyles from './paneToggle.module.css' import styles from './IncidentsDashboard.module.css' const query = graphql` @@ -30,9 +32,27 @@ const query = graphql` } ` +function MapPaneIcon() { + return ( + + ) +} + export function IncidentsDashboard() { const data = useLazyLoadQuery(query, {}) const [selectedId, setSelectedId] = useState(null) + const { + collapsed: mapCollapsed, + toggle: toggleMap, + paneRef: mapPaneRef, + toggleRef: mapToggleRef, + } = useCollapsiblePane(mapCollapsedKey, 'Backslash', () => { + // Leaflet measures its container once. Re-measure after the width transition. + window.setTimeout(() => window.dispatchEvent(new Event('resize')), 220) + }) // A user's pick is shared on the joined FDC3 user channel (a no-op when not // joined). Only direct selections broadcast — incidents *received* over FDC3 @@ -88,6 +108,8 @@ export function IncidentsDashboard() { } }, [criticalOpenCount]) + const mapLabel = mapCollapsed ? 'Expand map' : 'Collapse map' + return (
@@ -97,12 +119,37 @@ export function IncidentsDashboard() { onSelect={select} />
-
- +
+
+ +
+
) diff --git a/src/Bermuda.Web/src/components/paneToggle.module.css b/src/Bermuda.Web/src/components/paneToggle.module.css new file mode 100644 index 0000000..01e4954 --- /dev/null +++ b/src/Bermuda.Web/src/components/paneToggle.module.css @@ -0,0 +1,30 @@ +.toggle { + flex: 0 0 auto; + align-self: flex-start; + box-sizing: border-box; + width: 2.25rem; + height: 2.25rem; + margin: 0.25rem; + padding: 0; + display: grid; + place-items: center; + border-radius: 8px; + border: 1px solid transparent; + background: transparent; + color: #cbd5e1; + cursor: pointer; +} + +.toggle svg { + display: block; +} + +.toggle:hover { + background: rgba(255, 255, 255, 0.08); + border-color: transparent; +} + +.toggle:focus-visible { + outline: 2px solid #38bdf8; + outline-offset: 2px; +} diff --git a/src/Bermuda.Web/src/components/useCollapsiblePane.ts b/src/Bermuda.Web/src/components/useCollapsiblePane.ts new file mode 100644 index 0000000..7def061 --- /dev/null +++ b/src/Bermuda.Web/src/components/useCollapsiblePane.ts @@ -0,0 +1,77 @@ +import { useCallback, useEffect, useRef, useState } from 'react' + +/** localStorage keys for the two panes. Absent or any value other than "true" means expanded. */ +export const sidebarCollapsedKey = 'bermuda.sidebarCollapsed' +export const mapCollapsedKey = 'bermuda.mapCollapsed' + +function readCollapsed(key: string): boolean { + try { + return window.localStorage.getItem(key) === 'true' + } catch { + // Private mode and some WebView policies throw; start expanded. + return false + } +} + +function writeCollapsed(key: string, collapsed: boolean) { + try { + window.localStorage.setItem(key, String(collapsed)) + } catch { + // The pane still toggles for this session when storage is unavailable. + } +} + +function isEditable(target: EventTarget | null): boolean { + if (!(target instanceof HTMLElement)) return false + if (target.isContentEditable) return true + return target.tagName === 'INPUT' || target.tagName === 'TEXTAREA' || target.tagName === 'SELECT' +} + +/** + * Collapsed flag for one pane, persisted under `storageKey`. + * `shortcutCode` is a KeyboardEvent.code (for example "KeyB") fired with Ctrl. + * Collapsing moves focus out of the pane first, so it is not left on a control + * that is about to become inert. + */ +export function useCollapsiblePane( + storageKey: string, + shortcutCode?: string, + onExpand?: () => void, +) { + const [collapsed, setCollapsed] = useState(() => readCollapsed(storageKey)) + const collapsedRef = useRef(collapsed) + const paneRef = useRef(null) + const toggleRef = useRef(null) + const onExpandRef = useRef(onExpand) + onExpandRef.current = onExpand + + const toggle = useCallback(() => { + const next = !collapsedRef.current + collapsedRef.current = next + const pane = paneRef.current + const active = document.activeElement + if (next && pane && active instanceof Node && pane.contains(active)) { + toggleRef.current?.focus({ focusVisible: true }) + } + // Write before re-rendering so a reload in the same turn still sees the new value. + writeCollapsed(storageKey, next) + setCollapsed(next) + if (!next) onExpandRef.current?.() + }, [storageKey]) + + useEffect(() => { + if (!shortcutCode) return + const onKeyDown = (event: KeyboardEvent) => { + if (event.repeat || !event.ctrlKey || event.altKey || event.shiftKey || event.metaKey) return + if (event.code !== shortcutCode) return + if (isEditable(event.target)) return + event.preventDefault() + toggle() + } + // Capture so a focused child (the map, for example) cannot swallow the shortcut. + window.addEventListener('keydown', onKeyDown, true) + return () => window.removeEventListener('keydown', onKeyDown, true) + }, [shortcutCode, toggle]) + + return { collapsed, toggle, paneRef, toggleRef } +}