Skip to content

Commit 6e3e271

Browse files
committed
fix(web): refine compact composer controls
1 parent 1fc8c3c commit 6e3e271

5 files changed

Lines changed: 338 additions & 165 deletions

File tree

‎apps/web/src/components/chat/ComposerFooterControls.tsx‎

Lines changed: 13 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@ import type {
66
} from "@t3tools/contracts";
77
import { createModelSelection } from "@t3tools/shared/model";
88
import { BotIcon, PencilRulerIcon } from "lucide-react";
9-
import { type ComponentProps, memo, useId, useRef, useState } from "react";
9+
import { type ComponentProps, memo, useRef } from "react";
1010

1111
import type { ContextWindowSnapshot } from "../../lib/contextWindow";
12-
import { Menu as MenuPrimitive } from "@base-ui/react/menu";
1312
import { Menu, MenuPopup, MenuTrigger } from "../ui/menu";
1413
import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
1514
import { ComposerControl, ComposerControlIcon } from "./ComposerControl";
@@ -20,6 +19,7 @@ import { resolveModelPickerSelectedModel } from "./ModelPickerContent";
2019
import { ProviderModelPicker } from "./ProviderModelPicker";
2120
import { runtimeModeConfig } from "./runtimeModeConfig";
2221
import { useComposerMenuState } from "./useComposerMenuState";
22+
import { ComposerMenuSegment, ComposerMenuSegments } from "./ComposerMenuSegments";
2323

2424
export type RuntimeModeOption = { mode: RuntimeMode } & (typeof runtimeModeConfig)[RuntimeMode];
2525
const supervisedRuntimeModeOption = {
@@ -153,90 +153,44 @@ export const ComposerFooterModeControls = memo(function ComposerFooterModeContro
153153
);
154154
});
155155

156-
/**
157-
* Permission modes as one horizontal toggle, with the shown mode named below.
158-
* Each segment is a real menu radio item, so arrow keys reach it from the rest of the menu
159-
* and a pick closes the menu. Lives inside a Menu: the permissions chip, the effort menu,
160-
* or the overflow menu.
161-
*/
162156
export function ComposerPermissionsSection(props: {
163157
runtimeMode: RuntimeMode;
164158
runtimeModeOptions: ReadonlyArray<
165159
{ mode: RuntimeMode } & (typeof runtimeModeConfig)[RuntimeMode]
166160
>;
167161
onRuntimeModeChange: (mode: RuntimeMode) => void;
168162
}) {
169-
// Hover or keyboard focus previews a mode's name and description before a pick.
170-
const [previewMode, setPreviewMode] = useState<RuntimeMode | null>(null);
171-
const shownMode = previewMode ?? props.runtimeMode;
172-
const shown =
173-
props.runtimeModeOptions.find((option) => option.mode === shownMode) ??
163+
const selected =
164+
props.runtimeModeOptions.find((option) => option.mode === props.runtimeMode) ??
174165
supervisedRuntimeModeOption;
175-
const descriptionId = useId();
176166
return (
177167
<div data-composer-permissions className="grid w-72 gap-1.5 px-2 py-1.5">
178-
<div className="font-medium text-muted-foreground text-xs">Permissions</div>
179-
<MenuPrimitive.RadioGroup
168+
<div className="flex min-h-5 items-center justify-between gap-3">
169+
<span className="font-medium text-muted-foreground text-xs">Permissions</span>
170+
<span className="text-sm">{selected.label}</span>
171+
</div>
172+
<ComposerMenuSegments
180173
aria-label="Permissions"
181174
value={props.runtimeMode}
182175
onValueChange={(value: RuntimeMode) => {
183176
if (value !== props.runtimeMode) props.onRuntimeModeChange(value);
184177
}}
185-
className="flex gap-0.5 rounded-lg bg-input/40 p-0.5"
186-
// Menus navigate with Up/Down only; the row reads horizontally, so Left/Right move too.
187-
onKeyDown={(event) => {
188-
if (event.key !== "ArrowLeft" && event.key !== "ArrowRight") return;
189-
const items = Array.from(
190-
event.currentTarget.querySelectorAll<HTMLElement>('[role="menuitemradio"]'),
191-
);
192-
const index = items.findIndex((item) => item === document.activeElement);
193-
const next = items[index + (event.key === "ArrowRight" ? 1 : -1)];
194-
if (index < 0 || !next) return;
195-
event.preventDefault();
196-
event.stopPropagation();
197-
next.focus();
198-
}}
199178
>
200179
{props.runtimeModeOptions.map((option) => {
201180
const OptionIcon = option.icon;
202181
return (
203-
<MenuPrimitive.RadioItem
182+
<ComposerMenuSegment
204183
key={option.mode}
205184
value={option.mode}
206185
label={option.label}
207-
aria-label={option.label}
208-
aria-describedby={`${descriptionId}-${option.mode}`}
186+
description={option.description}
209187
closeOnClick
210-
onPointerEnter={() => setPreviewMode(option.mode)}
211-
onPointerLeave={() => setPreviewMode(null)}
212-
onFocus={() => setPreviewMode(option.mode)}
213-
onBlur={() => setPreviewMode(null)}
214-
className="flex h-6 flex-1 cursor-pointer items-center justify-center rounded-md text-muted-foreground outline-none data-checked:bg-input/72 data-checked:text-foreground data-highlighted:text-foreground not-data-checked:data-highlighted:bg-accent focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-inset"
215188
>
216189
<OptionIcon aria-hidden="true" className="size-3.5" />
217-
</MenuPrimitive.RadioItem>
190+
</ComposerMenuSegment>
218191
);
219192
})}
220-
</MenuPrimitive.RadioGroup>
221-
{/* Static per-mode descriptions for screen readers; the preview below is visual only. */}
222-
{props.runtimeModeOptions.map((option) => (
223-
<span key={option.mode} id={`${descriptionId}-${option.mode}`} className="sr-only">
224-
{option.description}
225-
</span>
226-
))}
227-
<div className="grid gap-0.5" aria-hidden="true">
228-
<span
229-
className={
230-
shownMode === props.runtimeMode
231-
? "text-foreground text-sm"
232-
: "text-muted-foreground text-sm"
233-
}
234-
>
235-
{shown.label}
236-
</span>
237-
{/* Two lines reserved so the menu does not shift while you preview modes. */}
238-
<span className="min-h-8 text-muted-foreground text-xs leading-4">{shown.description}</span>
239-
</div>
193+
</ComposerMenuSegments>
240194
</div>
241195
);
242196
}
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
import { Menu as MenuPrimitive } from "@base-ui/react/menu";
2+
3+
import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
4+
5+
export function ComposerMenuSegments({ onKeyDown, ...props }: MenuPrimitive.RadioGroup.Props) {
6+
return (
7+
<MenuPrimitive.RadioGroup
8+
{...props}
9+
className="flex gap-0.5 rounded-lg bg-input/40 p-0.5"
10+
onKeyDown={(event) => {
11+
onKeyDown?.(event);
12+
if (event.defaultPrevented || (event.key !== "ArrowLeft" && event.key !== "ArrowRight"))
13+
return;
14+
// Left/Right stay in this row; Up/Down navigate the surrounding menu.
15+
const items = Array.from(
16+
event.currentTarget.querySelectorAll<HTMLElement>(
17+
'[role="menuitemradio"]:not([aria-disabled="true"])',
18+
),
19+
);
20+
const index = items.findIndex((item) => item === document.activeElement);
21+
const next = items[index + (event.key === "ArrowRight" ? 1 : -1)];
22+
if (index < 0 || !next) return;
23+
event.preventDefault();
24+
event.stopPropagation();
25+
next.focus();
26+
}}
27+
/>
28+
);
29+
}
30+
31+
export function ComposerMenuSegment({
32+
label,
33+
description,
34+
children,
35+
...props
36+
}: MenuPrimitive.RadioItem.Props & { label: string; description?: string | undefined }) {
37+
return (
38+
<Tooltip>
39+
<TooltipTrigger
40+
render={
41+
<MenuPrimitive.RadioItem
42+
{...props}
43+
label={label}
44+
aria-label={label}
45+
aria-description={description}
46+
className="flex h-6 min-w-0 flex-1 cursor-pointer items-center justify-center gap-1 rounded-md px-1 text-muted-foreground text-xs outline-none data-checked:bg-input/72 data-checked:text-foreground data-highlighted:text-foreground not-data-checked:data-highlighted:bg-accent focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-inset data-disabled:pointer-events-none data-disabled:opacity-64"
47+
/>
48+
}
49+
>
50+
{children}
51+
</TooltipTrigger>
52+
<TooltipPopup role="tooltip">
53+
<span className="grid gap-0.5">
54+
<span className="font-medium">{label}</span>
55+
{description ? <span>{description}</span> : null}
56+
</span>
57+
</TooltipPopup>
58+
</Tooltip>
59+
);
60+
}

‎apps/web/src/components/chat/ComposerPermissionsSection.browser.test.tsx‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,23 @@ it("marks the current mode as checked and closes on Escape", async () => {
8787
await expect.element(screen.getByRole("button", { name: "Effort" })).toHaveFocus();
8888
});
8989

90+
it("explains hovered permissions while keeping the selected mode in the header", async () => {
91+
await using screen = await render(<EffortMenu />, { router: false }); // no routes involved
92+
await userEvent.click(screen.getByRole("button", { name: "Effort" }));
93+
await userEvent.hover(page.getByRole("menuitemradio", { name: "Supervised" }));
94+
await expect
95+
.element(
96+
page.getByRole("tooltip").getByText("Ask before commands and file changes.", { exact: true }),
97+
)
98+
.toBeVisible();
99+
await expect
100+
.element(page.getByRole("menu").getByText("Full access", { exact: true }))
101+
.toBeVisible();
102+
await expect
103+
.element(page.getByRole("menuitemradio", { name: "Full access" }))
104+
.toHaveAttribute("aria-checked", "true");
105+
});
106+
90107
// The real composer menu focus rule (useComposerMenuProps), with a stub composer handle.
91108
function withComposer(children: ReactNode) {
92109
const handle = { focusAtEnd: vi.fn() };

‎apps/web/src/components/chat/TraitsPicker.browser.test.tsx‎

Lines changed: 75 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,33 @@ const levels = [
2424
function EffortMenu({
2525
options = levels,
2626
prompt = "",
27+
thinking = false,
28+
serviceTiers = 2,
2729
}: {
2830
options?: typeof levels;
2931
prompt?: string;
32+
thinking?: boolean;
33+
serviceTiers?: 2 | 3;
3034
}) {
3135
const [modelOptions, setModelOptions] = useState<
3236
ReadonlyArray<ProviderOptionSelection> | undefined
33-
>([{ id: "serviceTier", value: "fast" }]);
37+
>([...(thinking ? [{ id: "thinking", value: true }] : []), { id: "serviceTier", value: "fast" }]);
3438
const descriptors: ReadonlyArray<ProviderOptionDescriptor> = [
35-
{
36-
id: "reasoningEffort",
37-
label: "Reasoning",
38-
type: "select",
39-
currentValue: "medium",
40-
options,
41-
promptInjectedValues: ["ultrathink"],
42-
},
39+
thinking
40+
? {
41+
id: "thinking",
42+
label: "Thinking",
43+
type: "boolean",
44+
currentValue: true,
45+
}
46+
: {
47+
id: "reasoningEffort",
48+
label: "Reasoning",
49+
type: "select",
50+
currentValue: "medium",
51+
options,
52+
promptInjectedValues: ["ultrathink"],
53+
},
4354
{
4455
id: "serviceTier",
4556
label: "Service Tier",
@@ -48,6 +59,7 @@ function EffortMenu({
4859
options: [
4960
{ id: "standard", label: "Standard" },
5061
{ id: "fast", label: "Fast" },
62+
...(serviceTiers === 3 ? [{ id: "ultrafast", label: "Ultrafast" }] : []),
5163
],
5264
},
5365
];
@@ -114,13 +126,67 @@ it.each([2, 6])(
114126
await expect.element(slider).toHaveValue(String(count - 1));
115127
await userEvent.keyboard("{ArrowDown}");
116128
await expect.element(page.getByRole("menuitemradio", { name: "Standard" })).toHaveFocus();
129+
await userEvent.keyboard("{ArrowRight}");
130+
await expect.element(page.getByRole("menuitemradio", { name: "Fast" })).toHaveFocus();
131+
await userEvent.keyboard("{ArrowLeft}");
117132
await userEvent.keyboard("{ArrowUp}");
118133
await expect.element(slider).toHaveFocus();
119134
await userEvent.keyboard("{Escape}");
120135
await expect.element(screen.getByRole("button", { name: "Effort" })).toHaveFocus();
121136
},
122137
);
123138

139+
it.each([2, 3] as const)(
140+
"changes between %i service tiers without closing the menu or losing reasoning",
141+
async (count) => {
142+
// The menu has no routing behavior.
143+
await using screen = await render(<EffortMenu serviceTiers={count} />, {
144+
router: false,
145+
});
146+
await userEvent.tab();
147+
await userEvent.keyboard("{ArrowDown}");
148+
await expect.element(page.getByRole("slider", { name: "Reasoning" })).toHaveFocus();
149+
await userEvent.keyboard("{ArrowDown}");
150+
await expect.element(page.getByRole("menuitemradio", { name: "Standard" })).toHaveFocus();
151+
await userEvent.keyboard("{Enter}");
152+
await expect.element(page.getByRole("menuitemradio", { name: "Standard" })).toBeVisible();
153+
await expect.element(page.getByRole("menuitemradio", { name: "Standard" })).toHaveFocus();
154+
await userEvent.keyboard(count === 3 ? "{ArrowRight}{ArrowRight}" : "{ArrowRight}");
155+
const selectedTier = page.getByRole("menuitemradio", {
156+
name: count === 3 ? "Ultrafast" : "Fast",
157+
});
158+
await expect.element(selectedTier).toHaveFocus();
159+
await userEvent.keyboard("{Enter}");
160+
await expect.element(selectedTier).toHaveAttribute("aria-checked", "true");
161+
await expect.element(screen.getByRole("status")).toHaveTextContent(
162+
JSON.stringify([
163+
{ id: "reasoningEffort", value: "medium" },
164+
{ id: "serviceTier", value: count === 3 ? "ultrafast" : "fast" },
165+
]),
166+
);
167+
},
168+
);
169+
170+
it("toggles boolean Thinking both ways while preserving Service Tier", async () => {
171+
// The menu has no routing behavior.
172+
await using screen = await render(<EffortMenu thinking />, { router: false });
173+
await userEvent.tab();
174+
await userEvent.keyboard("{ArrowDown}");
175+
const toggle = page.getByRole("menuitemcheckbox", { name: "Thinking" });
176+
await expect.element(toggle).toHaveFocus();
177+
await expect.element(toggle).toHaveAttribute("aria-checked", "true");
178+
await userEvent.keyboard("{Enter}");
179+
await expect.element(toggle).toHaveAttribute("aria-checked", "false");
180+
await expect.element(screen.getByRole("status")).toHaveTextContent(
181+
JSON.stringify([
182+
{ id: "thinking", value: false },
183+
{ id: "serviceTier", value: "fast" },
184+
]),
185+
);
186+
await userEvent.click(toggle);
187+
await expect.element(toggle).toHaveAttribute("aria-checked", "true");
188+
});
189+
124190
it("keeps prompt-controlled Ultrathink disabled", async () => {
125191
const options = [...levels, { id: "ultrathink", label: "Ultrathink" }];
126192
// The menu has no routing behavior.

0 commit comments

Comments
 (0)