Skip to content

Dodaios is an open-source agent OS for your desktop: it runs your coding agents, browser and apps by voice or chat, on your own machine. Formerly Personal Jarvis.

fix(chat): open composer menus on the current pick without a focus ring

rubenluetke10-beepfb2deeb79222
diff --git a/jarvis/ui/web/frontend/src/components/agentchat/ComposerBrainPicker.tsx b/jarvis/ui/web/frontend/src/components/agentchat/ComposerBrainPicker.tsx
index 3ee26721be..161eb5962d 100644
--- a/jarvis/ui/web/frontend/src/components/agentchat/ComposerBrainPicker.tsx
+++ b/jarvis/ui/web/frontend/src/components/agentchat/ComposerBrainPicker.tsx
@@ -268,4 +268,4 @@ function RailButton({
* medium-weight word with a quiet chevron that lifts on hover.
*/
export const COMPOSER_CONTROL_CLASS =
- "h-8 w-auto max-w-[240px] gap-1.5 rounded-lg border-transparent bg-transparent px-2 py-0 text-sm font-medium text-foreground/80 shadow-none hover:border-transparent hover:bg-secondary hover:text-foreground focus-visible:ring-1 [&>svg:last-child]:h-3.5 [&>svg:last-child]:w-3.5";
+ "h-8 w-auto max-w-[240px] gap-1.5 rounded-lg border-transparent bg-transparent px-2 py-0 text-sm font-medium text-foreground/80 shadow-none hover:border-transparent hover:bg-secondary hover:text-foreground focus-visible:ring-1 aria-expanded:bg-secondary aria-expanded:text-foreground aria-expanded:ring-0 [&>svg:last-child]:h-3.5 [&>svg:last-child]:w-3.5";
diff --git a/jarvis/ui/web/frontend/src/components/ui/combobox.test.tsx b/jarvis/ui/web/frontend/src/components/ui/combobox.test.tsx
index 72d99b9960..83b4634fd8 100644
--- a/jarvis/ui/web/frontend/src/components/ui/combobox.test.tsx
+++ b/jarvis/ui/web/frontend/src/components/ui/combobox.test.tsx
@@ -106,7 +106,10 @@ describe("Combobox non-search listbox accessibility", () => {
});
expect(commonEnglish.id).not.toBe(allEnglish.id);
- fireEvent.keyDown(listbox, { key: "ArrowDown" });
+ // The list opens on the current value, not on its first row.
+ expect(listbox.getAttribute("aria-activedescendant")).toBe(
+ screen.getByRole("option", { name: "Baseline" }).id,
+ );
fireEvent.keyDown(listbox, { key: "ArrowDown" });
expect(listbox.getAttribute("aria-activedescendant")).toBe(allEnglish.id);
expect(document.querySelectorAll('[data-active="true"]')).toHaveLength(1);
diff --git a/jarvis/ui/web/frontend/src/components/ui/combobox.tsx b/jarvis/ui/web/frontend/src/components/ui/combobox.tsx
index 7ae46dd7f0..098297265e 100644
--- a/jarvis/ui/web/frontend/src/components/ui/combobox.tsx
+++ b/jarvis/ui/web/frontend/src/components/ui/combobox.tsx
@@ -420,8 +420,11 @@ export function Combobox({
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [open]);
+ // A typed query starts on its first hit. Only a query: on open the effect
+ // above already put the highlight on the current value, and resetting it
+ // here as well left every list opening on its first row.
useEffect(() => {
- if (!open) return;
+ if (!open || !query) return;
setActiveIndex(0);
}, [query, open]);