Skip to content

Commit e3d7260

Browse files
Merge remote-tracking branch 'origin/main' into fix/issue-28075
2 parents 6ae1ef8 + 2359643 commit e3d7260

7 files changed

Lines changed: 43 additions & 77 deletions

File tree

‎apps/web/src/components/ChatView.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ import { isEditableFocused } from "../lib/editableFocus";
184184
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
185185
import { shortcutLabelForCommand } from "../keybindings";
186186
import { cn } from "~/lib/utils";
187+
import { isModelPickerOpen } from "../modelPickerVisibility";
187188
import { COLLAPSED_SIDEBAR_TITLEBAR_INSET_CLASS } from "~/workspaceTitlebar";
188189
import { toastManager } from "./ui/toast";
189190
import { projectScriptIdFromCommand } from "~/projectScripts";
@@ -1847,7 +1848,8 @@ export default function ChatView(props: ChatViewProps) {
18471848
);
18481849
const scheduleComposerFocus = () => {
18491850
window.requestAnimationFrame(() => {
1850-
focusComposer();
1851+
// The model picker stays open through its own changes, so it keeps focus.
1852+
if (!isModelPickerOpen()) focusComposer();
18511853
});
18521854
};
18531855
const scheduleComposerFocusStable = useStableCallback(scheduleComposerFocus);

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,8 @@ import { resolveComposerControlsOwnership } from "./composerControlsOwnership";
3535
* permissions), mode controls and the overflow menu for blocks that do not fit. Rendered in the
3636
* expanded footer or the resting controls host.
3737
*/
38-
// Model and effort share one trigger; hover and open states brighten its text, not a box.
39-
const TEXT_CONTROL_STATES =
40-
"hover:bg-transparent data-pressed:bg-transparent data-popup-open:bg-transparent data-pressed:text-foreground data-popup-open:text-foreground";
38+
// Model and effort share one trigger; it stays filled while its popup is open.
39+
const MODEL_TRIGGER_STATES = "data-popup-open:bg-accent data-popup-open:text-foreground";
4140

4241
export function ComposerControlsBar(props: {
4342
environmentId: EnvironmentId;
@@ -217,8 +216,8 @@ export function ComposerControlsBar(props: {
217216
modelOptionsByInstance={modelOptionsByInstance}
218217
size={controlSize}
219218
triggerClassName={cn(
220-
"group/model-trigger pe-1",
221-
TEXT_CONTROL_STATES,
219+
"group/model-trigger",
220+
MODEL_TRIGGER_STATES,
222221
composerControlsCollapsed ? "min-w-13 shrink text-xs!" : "min-w-13",
223222
)}
224223
triggerSuffix={effort.suffix}

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

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ type ColumnControl =
5252

5353
/**
5454
* The column lists the model's reasoning control first, under the header that names it, then
55-
* its other options. Picking a level of that control finishes the job and closes the popup.
55+
* its other options.
5656
*/
5757
function columnControls(
5858
provider: TraitsSelectionInput["provider"],
@@ -201,7 +201,7 @@ function moveBetweenRows(event: KeyboardEvent<HTMLElement>) {
201201
next.scrollIntoView({ block: "nearest" });
202202
}
203203

204-
function EffortLevels(props: { traits: TraitsSelectionInput; onLevelPick: () => void }) {
204+
function EffortLevels(props: { traits: TraitsSelectionInput }) {
205205
const traits = useTraitsSelection(props.traits);
206206
const { effort, others } = columnControls(
207207
props.traits.provider,
@@ -242,10 +242,7 @@ function EffortLevels(props: { traits: TraitsSelectionInput; onLevelPick: () =>
242242
label={value ? "On" : "Off"}
243243
selected={(control.descriptor.currentValue === true) === value}
244244
level={isEffort}
245-
onPick={() => {
246-
traits.changeBoolean(descriptor.id, value);
247-
if (isEffort) props.onLevelPick();
248-
}}
245+
onPick={() => traits.changeBoolean(descriptor.id, value)}
249246
/>
250247
))}
251248
</div>
@@ -276,10 +273,7 @@ function EffortLevels(props: { traits: TraitsSelectionInput; onLevelPick: () =>
276273
isDefault={option.isDefault}
277274
disabled={locked}
278275
level={isEffort}
279-
onPick={() => {
280-
traits.changeSelect(control.descriptor, option.id);
281-
if (isEffort) props.onLevelPick();
282-
}}
276+
onPick={() => traits.changeSelect(control.descriptor, option.id)}
283277
/>
284278
))}
285279
</div>
@@ -327,11 +321,7 @@ export function ComposerEffortColumn(props: { traits: TraitsSelectionInput | nul
327321
className="flex min-h-0 flex-1 flex-col gap-0.5 overflow-y-auto overscroll-contain px-2 pt-2.5 pb-1.5"
328322
onKeyDown={moveBetweenRows}
329323
>
330-
{props.traits ? (
331-
<EffortLevels traits={props.traits} onLevelPick={picker.close} />
332-
) : (
333-
<NoEffortRow />
334-
)}
324+
{props.traits ? <EffortLevels traits={props.traits} /> : <NoEffortRow />}
335325
</div>
336326
</>
337327
);
@@ -415,17 +405,12 @@ function PermissionsMenu(props: {
415405
options: ReadonlyArray<RuntimeModeOption>;
416406
onChange: (mode: RuntimeMode) => void;
417407
}) {
418-
const picker = use(DockedPickerContext);
419408
const triggerRef = useRef<HTMLButtonElement>(null);
420409
const current = props.options.find((option) => option.mode === props.runtimeMode);
421410
if (!current) return null;
422411
const CurrentIcon = current.icon;
423412
return (
424413
<Menu
425-
// Any pick, even the current mode, ends the job; a change also hands focus to the prompt.
426-
onOpenChange={(open, details) => {
427-
if (!open && details.reason === "item-press") picker.close();
428-
}}
429414
onOpenChangeComplete={(open) => {
430415
if (open) focusCheckedPermission(triggerRef.current);
431416
}}

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

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import {
2121
type ReactNode,
2222
type RefObject,
2323
} from "react";
24-
import { ArchiveIcon, ChevronRightIcon } from "lucide-react";
2524
import { ModelListRow } from "./ModelListRow";
2625
import { ModelPickerSidebar } from "./ModelPickerSidebar";
2726
import { getProviderStatusMessage, hasProviderSetup } from "./ProviderStatusBanner";
@@ -748,11 +747,8 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
748747
const modelKeys = visibleModels.map((model) =>
749748
modelPickerModelKey(model.instanceId, model.slug),
750749
);
751-
if (!legacySection) {
752-
return modelKeys;
753-
}
754-
modelKeys.splice(legacySection.currentModels.length, 0, legacySection.key);
755-
return modelKeys;
750+
// The toggle trails the list, so expanding it reveals older models above it.
751+
return legacySection ? [...modelKeys, legacySection.key] : modelKeys;
756752
})();
757753
const filteredModelByKey = ((): ReadonlyMap<string, ModelPickerItem> =>
758754
new Map(
@@ -843,7 +839,7 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
843839
className={cn(
844840
"relative flex w-screen max-w-90 flex-row overflow-hidden",
845841
props.docked
846-
? "h-full max-sm:h-56 max-sm:min-h-0! max-sm:w-full max-sm:max-w-none"
842+
? "max-sm:h-56 max-sm:min-h-0! max-sm:w-full max-sm:max-w-none"
847843
: "max-h-86.5",
848844
)}
849845
style={
@@ -1023,19 +1019,9 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
10231019
aria-expanded={legacySection.isExpanded}
10241020
className="group w-full cursor-pointer"
10251021
>
1026-
<ArchiveIcon aria-hidden="true" className="size-4 opacity-70" />
1027-
<div className="flex min-w-0 flex-1 items-center gap-2 text-left">
1028-
<div className="text-sm font-normal leading-snug">Legacy models</div>
1029-
<div className="text-xs font-normal leading-snug text-muted-foreground/70">
1030-
{legacySection.legacyModels.length}
1031-
</div>
1032-
</div>
1033-
<ChevronRightIcon
1034-
className={cn(
1035-
"size-4 transition-transform",
1036-
legacySection.isExpanded && "rotate-90",
1037-
)}
1038-
/>
1022+
<span className="text-sm leading-snug text-muted-foreground group-hover:text-foreground group-data-highlighted:text-foreground">
1023+
{legacySection.isExpanded ? "Show less" : "Show more"}
1024+
</span>
10391025
</ComboboxItem>
10401026
);
10411027
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,5 +164,8 @@ it("keeps a docked picker open after a pick and hands focus to that model's effo
164164
await expect.element(page.getByRole("radio", { name: "Medium" })).toHaveFocus();
165165

166166
await page.getByRole("option", { name: /Plain model/ }).click();
167+
await page.getByRole("option", { name: /Second model/ }).click();
168+
await expect.element(page.getByRole("radio", { name: "Medium" })).toHaveFocus();
169+
await userEvent.keyboard("{Escape}");
167170
await expect.element(search).not.toBeInTheDocument();
168171
});

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

Lines changed: 21 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,8 @@ function lockBackgroundScroll(popup: HTMLElement | null) {
6868
};
6969
}
7070

71-
/** What a docked effort column needs from its picker: the model it serves, and a way to close. */
72-
export const DockedPickerContext = createContext<{ modelLabel: string; close: () => void }>({
73-
modelLabel: "",
74-
close: () => {},
75-
});
71+
/** What a docked effort column needs from its picker: the model it serves. */
72+
export const DockedPickerContext = createContext<{ modelLabel: string }>({ modelLabel: "" });
7673

7774
export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
7875
environmentId: EnvironmentId | null;
@@ -107,8 +104,8 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
107104
/** Composer shortcuts this trigger answers besides the picker's own. */
108105
triggerShortcuts?: string;
109106
/**
110-
* Docks an effort column beside the list and a footer under both. Picking a model then keeps
111-
* the popup open and moves focus to the new model's levels.
107+
* Docks an effort column beside the list and a footer under both. The popup then stays open
108+
* until Escape or an outside press, and picking a model moves focus to its levels.
112109
*/
113110
effortColumn?: ReactNode;
114111
footer?: ReactNode;
@@ -185,13 +182,8 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
185182
setIsMenuOpen(false);
186183
return;
187184
}
188-
// The column renders the new model's levels on commit; a model with none closes the popup.
189-
// Levels an Ultrathink prompt locks still count, so the note explaining them stays visible.
190-
window.requestAnimationFrame(() => {
191-
const hasLevels = popupRef.current?.querySelector("[data-effort-level]") != null;
192-
if (hasLevels) focusEffort("levels");
193-
else setIsMenuOpen(false);
194-
});
185+
// The column renders the new model's levels on commit.
186+
window.requestAnimationFrame(() => focusEffort("levels"));
195187
};
196188

197189
const shortcutLabel = props.keybindings
@@ -235,6 +227,12 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
235227
.filter(Boolean)
236228
.join(" · ");
237229

230+
const triggerText = props.triggerLabel ?? multipleLabel ?? triggerTitle;
231+
const triggerTextProps = {
232+
className: "min-w-0 flex-1 overflow-hidden truncate",
233+
"data-chat-provider-model-picker-label": "true",
234+
} as const;
235+
238236
const picker = (
239237
<ModelPickerContent
240238
searchInputRef={searchInputRef}
@@ -367,19 +365,14 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
367365
/>
368366
</span>
369367
) : null}
370-
<Tooltip>
371-
<TooltipTrigger
372-
render={
373-
<span
374-
className="min-w-0 flex-1 overflow-hidden truncate"
375-
data-chat-provider-model-picker-label="true"
376-
/>
377-
}
378-
>
379-
{props.triggerLabel ?? multipleLabel ?? triggerTitle}
380-
</TooltipTrigger>
381-
<TooltipPopup side="top">{triggerTooltipContent}</TooltipPopup>
382-
</Tooltip>
368+
{props.isComposerOwned ? (
369+
<span {...triggerTextProps}>{triggerText}</span>
370+
) : (
371+
<Tooltip>
372+
<TooltipTrigger render={<span {...triggerTextProps} />}>{triggerText}</TooltipTrigger>
373+
<TooltipPopup side="top">{triggerTooltipContent}</TooltipPopup>
374+
</Tooltip>
375+
)}
383376
{props.triggerSuffix}
384377
{selectedModel?.isUnavailable && !selectedEntries && props.triggerLabel === undefined ? (
385378
<Badge variant="outline" size="sm">
@@ -405,9 +398,7 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
405398
touchBackdrop
406399
>
407400
{props.effortColumn ? (
408-
<DockedPickerContext
409-
value={{ modelLabel: triggerTitle, close: () => setIsMenuOpen(false) }}
410-
>
401+
<DockedPickerContext value={{ modelLabel: triggerTitle }}>
411402
<div className="flex flex-col">
412403
<div className="flex max-h-86.5 max-sm:max-h-none max-sm:flex-col">
413404
{picker}

‎apps/web/src/components/ui/tooltip.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ function TooltipPopup({
150150
data-slot="tooltip-popup"
151151
{...props}
152152
>
153-
<div className="px-2 py-1" data-slot="tooltip-viewport">
153+
<div className="min-w-0 px-2 py-1" data-slot="tooltip-viewport">
154154
{children}
155155
</div>
156156
</TooltipPrimitive.Popup>

0 commit comments

Comments
 (0)