mirror of
https://github.com/QwenLM/qwen-code.git
synced 2026-07-26 01:14:34 +00:00
* feat(web-shell): add keyboard-nav and IME-safe filter hooks Two reusable hooks for list-style dialogs: - useListboxKeyboard: Arrow/Home/End/Enter navigation driven by an active index, with a "keyboard mode" flag to suppress hover. Yields modified-key combos (Cmd/Ctrl/Alt/Shift), Home/End in text inputs, and Enter on focused buttons/links to native handling. - useFilterInput: IME-composition-safe search state so a filtered list does not refire on every intermediate pinyin character (commits on compositionend). * feat(web-shell): DialogShell Escape/backdrop close and focus management Give every dialog shared, accessible dismissal and focus behaviour: - Escape closes (guarded during IME composition so it cancels the composition, not the dialog) - click on the backdrop closes - Tab is trapped within the panel, wrapping at both ends - focus moves into the dialog on open and is restored to the opener on close * feat(web-shell): overhaul list-dialog interaction and accessibility Unify interaction across the model, theme, approval, resume, tools, delete, release and rewind dialogs: - keyboard navigation via useListboxKeyboard, with a roving highlight that opens on the current value and does not fight the mouse - consistent selection visuals: a single roving highlight plus a persistent "current" accent bar + checkmark; options are role=option divs (no stray focus ring) - IME-safe search via useFilterInput; fix Chinese-input jitter in the resume/delete/release search boxes - accessibility: role=listbox/option, aria-activedescendant, and aria-selected bound to the current value rather than the roving highlight - destructive dialogs keep Enter non-destructive where a confirm button is the commit (delete/release); rewind confirms on Enter like a single-select picker Refactors: - extract shared SessionRow used by resume/delete/release - rename resume-picker-* CSS primitives to picker-* (they are shared by all list dialogs, not resume-specific) Adds regression tests for the model duplicate-current fix, release hover selection, rewind Enter, the listbox/aria wiring, and the shared hooks. * fix(web-shell): address dialog interaction review feedback Follow-up fixes from upstream review: - DialogShell closes on completed backdrop clicks instead of mousedown, and its Tab trap now also catches the panel-focused fallback case - ToolsDialog now has full listbox semantics (ids, aria-activedescendant, aria-expanded) - Rewind keeps the roving cursor separate from the confirmed target; Enter only confirms, and the danger button executes the rewind - Model/Approval aria-selected now reflects the actual current value; model highlights stay in bounds when the model list shrinks - Home/End and modified arrow-key combos yield to native text navigation in search inputs; Escape yields to IME composition in DialogShell - Dead picker CSS and duplicate declarations removed; extra regression tests added for reviewer-raised edge cases * fix(web-shell): harden shared dialog keyboard and IME handling * fix(web-shell): tighten dialog shell focus, stacking, and backdrop behavior * fix(web-shell): align list dialog selection semantics and add coverage
158 lines
4.4 KiB
TypeScript
158 lines
4.4 KiB
TypeScript
// @vitest-environment jsdom
|
|
import { afterEach, describe, expect, it, vi } from 'vitest';
|
|
import { act } from 'react';
|
|
import { createRoot, type Root } from 'react-dom/client';
|
|
import type { DaemonSessionSummary } from '@qwen-code/webui/daemon-react-sdk';
|
|
import { I18nProvider } from '../../i18n';
|
|
import { dp } from './dialogStyles';
|
|
import { SessionRow } from './SessionRow';
|
|
|
|
Object.assign(globalThis, { IS_REACT_ACT_ENVIRONMENT: true });
|
|
|
|
const session = {
|
|
sessionId: 'sess-1234abcd',
|
|
displayName: 'My Session',
|
|
updatedAt: '2026-01-01T00:00:00.000Z',
|
|
clientCount: 2,
|
|
hasActivePrompt: true,
|
|
} as unknown as DaemonSessionSummary;
|
|
|
|
let container: HTMLDivElement | null = null;
|
|
let root: Root | null = null;
|
|
|
|
function mount(node: React.ReactNode) {
|
|
container = document.createElement('div');
|
|
document.body.appendChild(container);
|
|
root = createRoot(container);
|
|
act(() => {
|
|
root!.render(<I18nProvider language="en">{node}</I18nProvider>);
|
|
});
|
|
}
|
|
|
|
function row(): HTMLElement {
|
|
return container!.querySelector('[role="option"]')!;
|
|
}
|
|
|
|
afterEach(() => {
|
|
act(() => root?.unmount());
|
|
container?.remove();
|
|
root = null;
|
|
container = null;
|
|
});
|
|
|
|
describe('SessionRow', () => {
|
|
it('renders an option with the title and metadata', () => {
|
|
mount(
|
|
<SessionRow
|
|
session={session}
|
|
active={false}
|
|
current={false}
|
|
onClick={vi.fn()}
|
|
onActivate={vi.fn()}
|
|
/>,
|
|
);
|
|
expect(row().getAttribute('role')).toBe('option');
|
|
expect(row().textContent).toContain('My Session');
|
|
// clientCount surfaces in the meta line.
|
|
expect(row().textContent).toContain('2');
|
|
});
|
|
|
|
it('defaults aria-selected to `current` (not the roving highlight), explicit value wins', () => {
|
|
// The roving highlight must NOT be announced as "selected" — per WAI-ARIA
|
|
// it is conveyed by aria-activedescendant, while aria-selected marks the
|
|
// chosen value (here: the current session, also exposed via aria-current).
|
|
mount(
|
|
<SessionRow
|
|
session={session}
|
|
active={true}
|
|
current={false}
|
|
onClick={vi.fn()}
|
|
onActivate={vi.fn()}
|
|
/>,
|
|
);
|
|
expect(row().getAttribute('aria-selected')).toBe('false');
|
|
expect(row().getAttribute('aria-current')).toBeNull();
|
|
|
|
act(() => root?.unmount());
|
|
container?.remove();
|
|
mount(
|
|
<SessionRow
|
|
session={session}
|
|
active={false}
|
|
current={true}
|
|
onClick={vi.fn()}
|
|
onActivate={vi.fn()}
|
|
/>,
|
|
);
|
|
expect(row().getAttribute('aria-selected')).toBe('true');
|
|
expect(row().getAttribute('aria-current')).toBe('true');
|
|
|
|
act(() => root?.unmount());
|
|
container?.remove();
|
|
// Multi-select: an explicit ariaSelected (checked state) wins over current.
|
|
mount(
|
|
<SessionRow
|
|
session={session}
|
|
active={true}
|
|
ariaSelected={false}
|
|
current={true}
|
|
onClick={vi.fn()}
|
|
onActivate={vi.fn()}
|
|
/>,
|
|
);
|
|
expect(row().getAttribute('aria-selected')).toBe('false');
|
|
});
|
|
|
|
it('marks the current session and exposes the label as a tooltip', () => {
|
|
mount(
|
|
<SessionRow
|
|
session={session}
|
|
active={false}
|
|
current={true}
|
|
currentLabel="current"
|
|
onClick={vi.fn()}
|
|
onActivate={vi.fn()}
|
|
/>,
|
|
);
|
|
expect(row().className).toContain(dp('dialog-current'));
|
|
expect(row().getAttribute('title')).toBe('current');
|
|
});
|
|
|
|
it('renders leading and trailing slots', () => {
|
|
mount(
|
|
<SessionRow
|
|
session={session}
|
|
active={false}
|
|
current={false}
|
|
leading={<span data-testid="lead">[x]</span>}
|
|
trailing={<span data-testid="trail">inactive</span>}
|
|
onClick={vi.fn()}
|
|
onActivate={vi.fn()}
|
|
/>,
|
|
);
|
|
expect(container!.querySelector('[data-testid="lead"]')).not.toBeNull();
|
|
expect(container!.querySelector('[data-testid="trail"]')).not.toBeNull();
|
|
});
|
|
|
|
it('fires onClick and onActivate', () => {
|
|
const onClick = vi.fn();
|
|
const onActivate = vi.fn();
|
|
mount(
|
|
<SessionRow
|
|
session={session}
|
|
active={false}
|
|
current={false}
|
|
onClick={onClick}
|
|
onActivate={onActivate}
|
|
/>,
|
|
);
|
|
act(() => {
|
|
row().dispatchEvent(new MouseEvent('click', { bubbles: true }));
|
|
});
|
|
act(() => {
|
|
row().dispatchEvent(new MouseEvent('mousemove', { bubbles: true }));
|
|
});
|
|
expect(onClick).toHaveBeenCalledTimes(1);
|
|
expect(onActivate).toHaveBeenCalledTimes(1);
|
|
});
|
|
});
|