Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/ui/lib/ActionMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,11 @@ export function ActionMenu(props: ActionMenuProps) {
e.preventDefault()
onDismiss()
}
} else if (e.key === KEYS.down || (e.ctrlKey && e.key === 'n')) {
} else if (e.key === KEYS.down) {
e.preventDefault()
const newIdx = selectedIdx === lastIdx ? 0 : selectedIdx + 1
setSelectedIdx(newIdx)
} else if (e.key === KEYS.up || (e.ctrlKey && e.key === 'p')) {
} else if (e.key === KEYS.up) {
e.preventDefault()
const newIdx = selectedIdx === 0 ? lastIdx : selectedIdx - 1
setSelectedIdx(newIdx)
Expand Down
24 changes: 0 additions & 24 deletions test/e2e/action-menu.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,30 +29,6 @@ test('Enter key does not prematurely submit a linked form', async ({ page }) =>
await expectNotVisible(page, [page.getByText('Name is required')])
})

test('Ctrl+N/P navigate up and down', async ({ page }) => {
await page.goto('/projects/mock-project/instances')
await openActionMenu(page)

// wait for instance list to load so the items don't shift mid-test
await expect(page.getByRole('option', { name: 'db1' })).toBeVisible()

const selected = getSelectedItem(page)
// first item is selected by default
await expect(selected).toHaveText('New instance')

// Ctrl+N moves down
await page.keyboard.press('Control+n')
await expect(selected).toHaveText('db1')

// Ctrl+P moves back up
await page.keyboard.press('Control+p')
await expect(selected).toHaveText('New instance')

// Ctrl+N again gets the same second item
await page.keyboard.press('Control+n')
await expect(selected).toHaveText('db1')
})

test('Arrow keys navigate up and down', async ({ page }) => {
await page.goto('/projects/mock-project/instances')
await openActionMenu(page)
Expand Down
Loading