Skip to content

Commit 2290684

Browse files
fix(web): Favorites and search rows stay one line like provider tabs
1 parent 790ba13 commit 2290684

2 files changed

Lines changed: 41 additions & 16 deletions

File tree

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

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ export const ModelListRow = memo(function ModelListRow(props: {
2424
acpRegistryIconUrl?: string | undefined;
2525
isFavorite: boolean;
2626
isSelected: boolean;
27-
showProvider: boolean;
27+
inlineProviderIcon: boolean;
28+
showInstanceBadge: boolean;
2829
showNewBadge?: boolean;
2930
unavailable?: boolean;
3031
jumpLabel?: string | null;
@@ -37,6 +38,27 @@ export const ModelListRow = memo(function ModelListRow(props: {
3738
subProvider: props.subProvider,
3839
};
3940
const providerLabel = getProviderRowLabel(props.providerDisplayName, props.subProvider);
41+
const providerIcon = props.inlineProviderIcon ? (
42+
<ProviderInstanceIcon
43+
driverKind={props.driverKind}
44+
displayName={props.providerDisplayName}
45+
accentColor={props.providerAccentColor}
46+
acpRegistryAgentId={props.acpRegistryAgentId}
47+
acpRegistryIconUrl={props.acpRegistryIconUrl}
48+
showBadge={props.showInstanceBadge}
49+
size="compact"
50+
className="size-3.5"
51+
/>
52+
) : (
53+
<ProviderInstanceIcon
54+
driverKind={props.driverKind}
55+
displayName={props.providerDisplayName}
56+
acpRegistryAgentId={props.acpRegistryAgentId}
57+
acpRegistryIconUrl={props.acpRegistryIconUrl}
58+
className="size-3"
59+
iconClassName="size-3"
60+
/>
61+
);
4062

4163
const row = (
4264
<ComboboxItem
@@ -52,6 +74,7 @@ export const ModelListRow = memo(function ModelListRow(props: {
5274
>
5375
<div className="min-w-0 flex-1 text-left">
5476
<div className="flex min-w-0 items-center gap-2">
77+
{props.inlineProviderIcon ? providerIcon : null}
5578
<div className="min-w-0 truncate text-sm font-normal leading-snug">
5679
{getDisplayModelName(model)}
5780
</div>
@@ -69,21 +92,16 @@ export const ModelListRow = memo(function ModelListRow(props: {
6992
</Badge>
7093
) : null}
7194
</div>
72-
{props.showProvider && (
73-
<div className="mt-1 flex items-center gap-1.5">
74-
<ProviderInstanceIcon
75-
driverKind={props.driverKind}
76-
displayName={props.providerDisplayName}
77-
acpRegistryAgentId={props.acpRegistryAgentId}
78-
acpRegistryIconUrl={props.acpRegistryIconUrl}
79-
className="size-3"
80-
iconClassName="size-3"
81-
/>
95+
{props.subProvider ? (
96+
<div
97+
className={cn("mt-1 flex items-center gap-1.5", props.inlineProviderIcon && "pl-5.5")}
98+
>
99+
{props.inlineProviderIcon ? null : providerIcon}
82100
<span className="truncate text-xs font-normal leading-snug text-muted-foreground/70">
83101
{providerLabel}
84102
</span>
85103
</div>
86-
)}
104+
) : null}
87105
</div>
88106

89107
<div className="flex shrink-0 items-center gap-1.5">

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ import { InlineButton } from "../ui/button";
6060
import {
6161
isProviderInstancePickerReady,
6262
isProviderInstancePickerVisible,
63+
shouldShowInstanceBadge,
6364
type ProviderInstanceEntry,
6465
} from "../../providerInstances";
6566
import { providerModelKey, sortProviderModelItems } from "../../modelOrdering";
@@ -575,8 +576,8 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
575576

576577
const isLocked = lockedProvider !== null;
577578
const isSearching = searchQuery.trim().length > 0;
578-
// Inside one provider's tab the provider line repeats the selected rail icon on every row.
579-
const rowsMixProviders = isSearching || selectedInstanceId === "favorites";
579+
// Rows that mix providers mark each with an inline icon; a provider's own tab already shows it on the rail.
580+
const inlineProviderIcon = isSearching || selectedInstanceId === "favorites";
580581
// Fit the tallest tab so switching tabs never resizes the popup and moves the rail under the cursor.
581582
const tallestTabUnits = (() => {
582583
const unitsByTab = new Map<ProviderInstanceId | "favorites", number>();
@@ -592,7 +593,7 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
592593
for (const model of flatModels) {
593594
if (!matchesLockedProvider(model)) continue;
594595
const isFavorite = favoritesSet.has(providerModelKey(model.instanceId, model.slug));
595-
if (isFavorite) addRow("favorites", true);
596+
if (isFavorite) addRow("favorites", Boolean(model.subProvider));
596597
if (model.isLegacy && !isFavorite) {
597598
tabsWithLegacyRow.add(model.instanceId);
598599
} else {
@@ -993,6 +994,7 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
993994
}
994995
const disabledReason =
995996
getModelDisabledReason?.(model.instanceId, model.slug) ?? null;
997+
const entry = entryByInstanceId.get(model.instanceId);
996998
return (
997999
<ModelListRow
9981000
key={modelKey}
@@ -1012,7 +1014,12 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
10121014
? selectedModelKeySet.has(modelKey)
10131015
: modelKey === activeModelKey
10141016
}
1015-
showProvider={rowsMixProviders || Boolean(model.subProvider)}
1017+
inlineProviderIcon={inlineProviderIcon}
1018+
showInstanceBadge={
1019+
inlineProviderIcon &&
1020+
entry !== undefined &&
1021+
shouldShowInstanceBadge(entry, instanceEntries)
1022+
}
10161023
showNewBadge={model.badge === "new"}
10171024
unavailable={model.isUnavailable === true}
10181025
jumpLabel={modelJumpLabelByKey.get(modelKey) ?? null}

0 commit comments

Comments
 (0)