From 1ea7467e5fa0995a0f869efa6bf28d066584eedf Mon Sep 17 00:00:00 2001 From: vaprdev <13180538+vaprdev@users.noreply.github.com> Date: Thu, 5 Nov 2026 00:35:59 +0000 Subject: [PATCH] fix(app): wrap arrow-key navigation in the theme list --- packages/app/e2e/regression/settings.spec.ts | 15 +++++++++++++++ .../app/src/settings/appearance/appearance.tsx | 1 + packages/app/src/settings/general/controllers.ts | 8 +++++++- 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/packages/app/e2e/regression/settings.spec.ts b/packages/app/e2e/regression/settings.spec.ts index 2655f607e57..3b681e06956 100644 --- a/packages/app/e2e/regression/settings.spec.ts +++ b/packages/app/e2e/regression/settings.spec.ts @@ -96,6 +96,21 @@ test("a settings page survives refresh", async ({ page }) => { await expect(page).toHaveURL("/settings?tab=appearance") }) +test("arrow keys wrap around the theme list", async ({ page }) => { + const { settings } = await open(page) + await settings.getByRole("tab", { name: "Appearance", exact: true }).click() + await settings.locator('[data-action="settings-theme"]').click() + const options = page.getByRole("listbox").getByRole("option") + await expect(page.getByRole("option", { name: "OpenCode", selected: true })).toBeFocused() + + await page.keyboard.press("End") + await expect(options.last()).toBeFocused() + await page.keyboard.press("ArrowDown") + await expect(options.first()).toBeFocused() + await page.keyboard.press("ArrowUp") + await expect(options.last()).toBeFocused() +}) + test("Questions settings default independently of old Permissions settings and survive reload", async ({ page }) => { const { settings } = await open(page, { seed: { diff --git a/packages/app/src/settings/appearance/appearance.tsx b/packages/app/src/settings/appearance/appearance.tsx index 1100ae2d613..39a1cdbc4e6 100644 --- a/packages/app/src/settings/appearance/appearance.tsx +++ b/packages/app/src/settings/appearance/appearance.tsx @@ -125,6 +125,7 @@ export const SettingsAppearance: Component = () => { current={appearance.theme.current()} placement="bottom-end" gutter={6} + shouldFocusWrap value={(option) => option.id} label={(option) => option.name} onSelect={appearance.theme.select} diff --git a/packages/app/src/settings/general/controllers.ts b/packages/app/src/settings/general/controllers.ts index 9d32530f509..bc99bcb5b5e 100644 --- a/packages/app/src/settings/general/controllers.ts +++ b/packages/app/src/settings/general/controllers.ts @@ -76,7 +76,13 @@ export function createAppearanceSettingsController() { const platform = usePlatform() const language = useLanguage() const theme = useTheme() - const themes = createMemo(() => theme.ids().map((id) => ({ id, name: theme.name(id) }))) + + // Keep the same option objects while themes load, so an open theme list keeps keyboard focus. + const themes = createMemo(() => theme.ids().map((id) => ({ id, name: theme.name(id) })), undefined, { + equals: (prev, next) => + prev.length === next.length && + prev.every((option, index) => option.id === next[index].id && option.name === next[index].name), + }) onMount(() => void theme.loadThemes())