davidl/tolaria
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: stabilize global search keyboard navigation

Browse Source
This commit is contained in:
lucaronin
2026-05-27 11:13:45 +02:00
parent 4296977fe3
commit bdb9fabfd0
3 changed files with 301 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

128
src/components/SearchPanel.test.tsx
View File

@@ -117,7 +117,7 @@ describe('SearchPanel', () => {
render(
<SearchPanel open={true} vaultPath="/vault" entries={MOCK_ENTRIES} onSelectNote={vi.fn()} onClose={onClose} />,
)
fireEvent.keyDown(window, { key: 'Escape' })
fireEvent.keyDown(document, { key: 'Escape' })
expect(onClose).toHaveBeenCalled()
})
@@ -217,6 +217,132 @@ describe('SearchPanel', () => {
})
})
it('moves down one result when ArrowDown is pressed in the input', async () => {
const entries: VaultEntry[] = [
...MOCK_ENTRIES,
{
...MOCK_ENTRIES[0],
path: '/vault/topic/search.md',
filename: 'search.md',
title: 'Search Patterns',
},
]
mockInvokeFn.mockResolvedValue({
results: [
{ title: 'Result One', path: '/vault/essay/ai-apis.md', snippet: 'First result', score: 0.9, note_type: null },
{ title: 'Result Two', path: '/vault/event/retreat.md', snippet: 'Second result', score: 0.8, note_type: null },
{ title: 'Result Three', path: '/vault/topic/search.md', snippet: 'Third result', score: 0.7, note_type: null },
],
elapsed_ms: 20,
})
render(
<SearchPanel open={true} vaultPath="/vault" entries={entries} onSelectNote={vi.fn()} onClose={vi.fn()} />,
)
const input = screen.getByPlaceholderText('Search in all notes...')
fireEvent.change(input, { target: { value: 'test' } })
await waitFor(() => {
expect(screen.getByText('Search Patterns')).toBeInTheDocument()
})
await act(async () => {
fireEvent.keyDown(input, { key: 'ArrowDown' })
})
await waitFor(() => {
const resultTwo = screen.getByText('Refactoring Retreat').closest('[class*="cursor-pointer"]')!
const resultThree = screen.getByText('Search Patterns').closest('[class*="cursor-pointer"]')!
expect(resultTwo.className).toContain('bg-accent')
expect(resultThree.className).not.toContain('bg-accent')
})
})
it('ignores duplicate native ArrowDown keydown events for one press', async () => {
const entries: VaultEntry[] = [
...MOCK_ENTRIES,
{
...MOCK_ENTRIES[0],
path: '/vault/topic/search.md',
filename: 'search.md',
title: 'Search Patterns',
},
]
mockInvokeFn.mockResolvedValue({
results: [
{ title: 'Result One', path: '/vault/essay/ai-apis.md', snippet: 'First result', score: 0.9, note_type: null },
{ title: 'Result Two', path: '/vault/event/retreat.md', snippet: 'Second result', score: 0.8, note_type: null },
{ title: 'Result Three', path: '/vault/topic/search.md', snippet: 'Third result', score: 0.7, note_type: null },
],
elapsed_ms: 20,
})
render(
<SearchPanel open={true} vaultPath="/vault" entries={entries} onSelectNote={vi.fn()} onClose={vi.fn()} />,
)
const input = screen.getByPlaceholderText('Search in all notes...')
fireEvent.change(input, { target: { value: 'test' } })
await waitFor(() => {
expect(screen.getByText('Search Patterns')).toBeInTheDocument()
})
await act(async () => {
fireEvent.keyDown(input, { key: 'ArrowDown' })
fireEvent.keyDown(input, { key: 'ArrowDown' })
})
await waitFor(() => {
const resultTwo = screen.getByText('Refactoring Retreat').closest('[class*="cursor-pointer"]')!
const resultThree = screen.getByText('Search Patterns').closest('[class*="cursor-pointer"]')!
expect(resultTwo.className).toContain('bg-accent')
expect(resultThree.className).not.toContain('bg-accent')
})
})
it('allows a second ArrowDown press immediately after keyup', async () => {
const entries: VaultEntry[] = [
...MOCK_ENTRIES,
{
...MOCK_ENTRIES[0],
path: '/vault/topic/search.md',
filename: 'search.md',
title: 'Search Patterns',
},
]
mockInvokeFn.mockResolvedValue({
results: [
{ title: 'Result One', path: '/vault/essay/ai-apis.md', snippet: 'First result', score: 0.9, note_type: null },
{ title: 'Result Two', path: '/vault/event/retreat.md', snippet: 'Second result', score: 0.8, note_type: null },
{ title: 'Result Three', path: '/vault/topic/search.md', snippet: 'Third result', score: 0.7, note_type: null },
],
elapsed_ms: 20,
})
render(
<SearchPanel open={true} vaultPath="/vault" entries={entries} onSelectNote={vi.fn()} onClose={vi.fn()} />,
)
const input = screen.getByPlaceholderText('Search in all notes...')
fireEvent.change(input, { target: { value: 'test' } })
await waitFor(() => {
expect(screen.getByText('Search Patterns')).toBeInTheDocument()
})
await act(async () => {
fireEvent.keyDown(input, { key: 'ArrowDown' })
fireEvent.keyUp(input, { key: 'ArrowDown' })
fireEvent.keyDown(input, { key: 'ArrowDown' })
})
await waitFor(() => {
expect(screen.getByText('Search Patterns').closest('[class*="cursor-pointer"]')!.className).toContain('bg-accent')
})
})
it('selects result on Enter and calls onSelectNote', async () => {
mockInvokeFn.mockResolvedValue({
results: [

147
src/components/SearchPanel.tsx
View File

@@ -21,6 +21,23 @@ interface SearchPanelProps {
type SearchKeyboardAction = 'close' | 'next' | 'previous' | 'select'
interface SearchKeyboardEvent {
key: string
nativeEvent?: Event
preventDefault: () => void
repeat?: boolean
stopImmediatePropagation?: () => void
stopPropagation?: () => void
}
interface SearchKeyboardActionContext {
handleSelect: (result: SearchResult) => void
onClose: () => void
resultsRef: React.MutableRefObject<SearchResult[]>
selectedIndexRef: React.MutableRefObject<number>
setSelectedIndex: React.Dispatch<React.SetStateAction<number>>
}
function resolveSearchKeyboardAction(key: string): SearchKeyboardAction | null {
switch (key) {
case 'Escape':
@@ -41,10 +58,89 @@ function nextSearchSelectionIndex(
currentIndex: number,
resultCount: number,
): number {
if (resultCount <= 0) return 0
if (action === 'next') return Math.min(currentIndex + 1, resultCount - 1)
return Math.max(currentIndex - 1, 0)
}
function shouldHandleKeydown(
event: SearchKeyboardEvent,
pressedKeys: Set<string>,
handledEvents: WeakSet<Event>,
): boolean {
const eventIdentity = resolveSearchKeyboardEventIdentity(event)
if (eventIdentity) {
if (handledEvents.has(eventIdentity)) return false
handledEvents.add(eventIdentity)
}
if (event.repeat) return true
if (pressedKeys.has(event.key)) return false
pressedKeys.add(event.key)
return true
}
function resolveSearchKeyboardEventIdentity(event: SearchKeyboardEvent): Event | null {
if (event.nativeEvent instanceof Event) return event.nativeEvent
if (event instanceof Event) return event
return null
}
function applySearchSelection(
action: Extract<SearchKeyboardAction, 'next' | 'previous'>,
resultsRef: React.MutableRefObject<SearchResult[]>,
selectedIndexRef: React.MutableRefObject<number>,
setSelectedIndex: React.Dispatch<React.SetStateAction<number>>,
) {
const nextIndex = nextSearchSelectionIndex(action, selectedIndexRef.current, resultsRef.current.length)
selectedIndexRef.current = nextIndex
setSelectedIndex(nextIndex)
}
function performSearchKeyboardAction(action: SearchKeyboardAction, context: SearchKeyboardActionContext) {
if (action === 'close') {
context.onClose()
return
}
if (action === 'select') {
const result = context.resultsRef.current[context.selectedIndexRef.current]
if (result) context.handleSelect(result)
return
}
applySearchSelection(action, context.resultsRef, context.selectedIndexRef, context.setSelectedIndex)
}
function useSearchKeyboardDocumentListeners({
handleKeyDown,
handleKeyUp,
open,
pressedKeysRef,
}: {
handleKeyDown: (event: KeyboardEvent) => void
handleKeyUp: (event: KeyboardEvent) => void
open: boolean
pressedKeysRef: React.MutableRefObject<Set<string>>
}) {
useEffect(() => {
const pressedKeys = pressedKeysRef.current
if (!open) {
pressedKeys.clear()
return
}
document.addEventListener('keydown', handleKeyDown, true)
document.addEventListener('keyup', handleKeyUp, true)
return () => {
document.removeEventListener('keydown', handleKeyDown, true)
document.removeEventListener('keyup', handleKeyUp, true)
pressedKeys.clear()
}
}, [handleKeyDown, handleKeyUp, open, pressedKeysRef])
}
function searchVaultPathsForEntries(entries: VaultEntry[], fallbackVaultPath: string): string | string[] {
const paths = entries
.map((entry) => entry.workspace?.path)
@@ -95,33 +191,25 @@ function useSearchKeyboard({
selectedIndexRef: React.MutableRefObject<number>
setSelectedIndex: React.Dispatch<React.SetStateAction<number>>
}) {
const handleKeyDown = useCallback((e: { key: string; preventDefault: () => void }) => {
const pressedKeysRef = useRef(new Set<string>())
const handledEventsRef = useRef(new WeakSet<Event>())
const handleKeyDown = useCallback((e: SearchKeyboardEvent) => {
const action = resolveSearchKeyboardAction(e.key)
if (!action) return
e.preventDefault()
if (action === 'close') {
onClose()
return
}
e.stopImmediatePropagation?.()
e.stopPropagation?.()
if (!shouldHandleKeydown(e, pressedKeysRef.current, handledEventsRef.current)) return
if (action === 'select') {
const result = resultsRef.current[selectedIndexRef.current]
if (result) handleSelect(result)
return
}
setSelectedIndex(i => nextSearchSelectionIndex(action, i, resultsRef.current.length))
performSearchKeyboardAction(action, { handleSelect, onClose, resultsRef, selectedIndexRef, setSelectedIndex })
}, [handleSelect, onClose, resultsRef, selectedIndexRef, setSelectedIndex])
useEffect(() => {
if (!open) return
const handleKey = (e: KeyboardEvent) => handleKeyDown(e)
window.addEventListener('keydown', handleKey)
return () => window.removeEventListener('keydown', handleKey)
}, [open, handleKeyDown])
const handleKeyUp = useCallback((e: { key: string }) => {
if (resolveSearchKeyboardAction(e.key)) pressedKeysRef.current.delete(e.key)
}, [])
return handleKeyDown
useSearchKeyboardDocumentListeners({ handleKeyDown, handleKeyUp, open, pressedKeysRef })
}
function useSearchPanelController({ open, vaultPath, entries, onSelectNote, onClose }: SearchPanelProps) {
@@ -150,7 +238,7 @@ function useSearchPanelController({ open, vaultPath, entries, onSelectNote, onCl
if (open) setTimeout(() => inputRef.current?.focus(), 50)
}, [open])
const handleKeyDown = useSearchKeyboard({
useSearchKeyboard({
open,
onClose,
handleSelect,
@@ -162,7 +250,6 @@ function useSearchPanelController({ open, vaultPath, entries, onSelectNote, onCl
return {
elapsedMs,
handleKeyDown,
handleSelect,
inputRef,
listRef,
@@ -188,7 +275,6 @@ export function SearchPanel({
const {
elapsedMs,
entryLookup,
handleKeyDown,
handleSelect,
inputRef,
listRef,
@@ -236,7 +322,6 @@ export function SearchPanel({
query={query}
loading={loading}
onChange={setQuery}
onKeyDown={handleKeyDown}
/>
<SearchContent
query={query}
@@ -261,11 +346,10 @@ interface SearchInputProps {
query: string
loading: boolean
onChange: (value: string) => void
onKeyDown?: React.KeyboardEventHandler<HTMLInputElement>
}
const SearchInput = forwardRef<HTMLInputElement, SearchInputProps>(
function SearchInput({ query, loading, onChange, onKeyDown }, ref) {
function SearchInput({ query, loading, onChange }, ref) {
return (
<div className="flex items-center gap-3 border-b border-border px-4 py-3">
<svg aria-hidden="true" className="h-4 w-4 shrink-0 text-muted-foreground" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2">
@@ -279,7 +363,6 @@ const SearchInput = forwardRef<HTMLInputElement, SearchInputProps>(
placeholder="Search in all notes..."
value={query}
onChange={e => onChange(e.target.value)}
onKeyDown={onKeyDown}
/>
{loading && (
<svg
@@ -381,14 +464,16 @@ function SearchResultRow({
})
return (
<button
type="button"
<div
role="option"
aria-selected={selected}
tabIndex={-1}
className={cn(
"w-full cursor-pointer border-0 bg-transparent px-4 py-2.5 text-left transition-colors",
selected ? "bg-accent" : "hover:bg-secondary",
)}
onClick={() => onSelect(result)}
onMouseEnter={() => onHover(index)}
onMouseMove={() => onHover(index)}
>
<div className="flex items-center gap-2">
{createElement(presentation.TypeIcon, {
@@ -402,7 +487,7 @@ function SearchResultRow({
<WorkspaceInitialsBadge workspace={presentation.workspace} testId="search-result-workspace-badge" />
</div>
<SearchResultSubtitle subtitle={presentation.subtitle} />
</button>
</div>
)
}
@@ -467,7 +552,7 @@ function SearchContent({
{hasResults && (
<>
<SearchResultsHeader count={results.length} elapsedMs={elapsedMs} />
<div ref={listRef}>
<div ref={listRef} role="listbox" aria-label="Search results">
{results.map((result, i) => (
<SearchResultRow
key={result.path}

58
tests/smoke/keyboard-command-routing.spec.ts
View File

@@ -14,6 +14,13 @@ import {
let tempVaultDir: string
const GLOBAL_SEARCH_INPUT = 'input[placeholder="Search in all notes..."]'
const GLOBAL_SEARCH_RESULTS = [
{ title: 'First Search Result', path: '/vault/first-search-result.md', snippet: 'first', score: 1, note_type: null },
{ title: 'Second Search Result', path: '/vault/second-search-result.md', snippet: 'second', score: 0.9, note_type: null },
{ title: 'Third Search Result', path: '/vault/third-search-result.md', snippet: 'third', score: 0.8, note_type: null },
]
async function openAlphaProjectInEditor(page: Page) {
await openFixtureVaultDesktopHarness(page, tempVaultDir)
await page.getByText('Alpha Project', { exact: true }).first().click()
@@ -68,6 +75,28 @@ async function dispatchAppCommand(page: Page, id: string): Promise<void> {
}, id)
}
async function installGlobalSearchResultsHarness(page: Page): Promise<void> {
await page.waitForFunction(() => Boolean(window.__mockHandlers?.search_vault))
await page.evaluate((results) => {
type Handler = (args?: Record<string, unknown>) => unknown
const handlers = window.__mockHandlers as Record<string, Handler>
Object.defineProperty(window, '__mockHandlers', {
configurable: true,
get: () => handlers,
set: (nextHandlers) => Object.assign(handlers, nextHandlers),
})
handlers.search_vault = () => ({ results, elapsed_ms: 1 })
}, GLOBAL_SEARCH_RESULTS)
}
function searchResultRow(page: Page, title: string) {
return page.locator('[role="option"]').filter({ hasText: title }).first()
}
async function expectSelectedSearchResult(page: Page, title: string): Promise<void> {
await expect(searchResultRow(page, title)).toHaveClass(/bg-accent/)
}
test.describe('keyboard command routing', () => {
test.beforeEach(() => {
tempVaultDir = createFixtureVaultCopy()
@@ -135,6 +164,35 @@ test.describe('keyboard command routing', () => {
await expect(page.locator('input[placeholder="Search notes..."]')).toBeFocused()
})
test('global search arrow keys move one result at a time @smoke', async ({ page }) => {
await openFixtureVaultDesktopHarness(page, tempVaultDir)
await installGlobalSearchResultsHarness(page)
await page.locator('body').click()
await dispatchShortcutEvent(page, {
key: 'f',
code: 'KeyF',
ctrlKey: false,
metaKey: true,
shiftKey: true,
altKey: false,
bubbles: true,
cancelable: true,
})
const input = page.locator(GLOBAL_SEARCH_INPUT)
await expect(input).toBeVisible({ timeout: 5_000 })
await input.fill('search')
await expect(searchResultRow(page, 'Third Search Result')).toBeVisible({ timeout: 5_000 })
await expectSelectedSearchResult(page, 'First Search Result')
await page.keyboard.press('ArrowDown')
await expectSelectedSearchResult(page, 'Second Search Result')
await page.keyboard.press('ArrowDown')
await expectSelectedSearchResult(page, 'Third Search Result')
await page.keyboard.press('ArrowUp')
await expectSelectedSearchResult(page, 'Second Search Result')
})
test('desktop menu-command bridge toggles organized state through the shared command path @smoke', async ({ page }) => {
await openAlphaProjectInEditor(page)