Skip to content

Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active

🧭 refactor: Move the SelectDropDown Callers onto Dropdown and Remove It (#17434)

Marco Berettae247cb58d13d
diff --git a/client/src/components/Endpoints/Settings/Assistants.tsx b/client/src/components/Endpoints/Settings/Assistants.tsx
index 4757e9e532..61c4423c68 100644
--- a/client/src/components/Endpoints/Settings/Assistants.tsx
+++ b/client/src/components/Endpoints/Settings/Assistants.tsx
@@ -1,21 +1,16 @@
-import { useState, useMemo, useEffect } from 'react';
+import { useId, useState, useMemo, useEffect } from 'react';
import TextareaAutosize from 'react-textarea-autosize';
-import { Label, HoverCard, SelectDropDown, HoverCardTrigger } from '@librechat/client';
+import { Label, Dropdown, HoverCard, HoverCardTrigger } from '@librechat/client';
import type { Assistant, TPreset } from 'librechat-data-provider';
import type { TModelSelectProps, Option } from '~/common';
-import {
- cn,
- defaultTextProps,
- removeFocusRings,
- mapAssistants,
- createDropdownSetter,
-} from '~/utils';
import { useLocalize, useDebouncedInput, useAssistantListMap } from '~/hooks';
+import { cn, defaultTextProps, mapAssistants } from '~/utils';
import OptionHover from './OptionHover';
import { ESide } from '~/common';
export default function Settings({ conversation, setOption, models, readonly }: TModelSelectProps) {
const localize = useLocalize();
+ const fieldId = useId();
const defaultOption = useMemo(
() => ({ label: localize('com_endpoint_use_active_assistant'), value: '' }),
[localize],
@@ -119,14 +114,20 @@ export default function Settings({ conversation, setOption, models, readonly }:
<div className="grid grid-cols-6 gap-6">
<div className="col-span-6 flex flex-col items-center justify-start gap-6 sm:col-span-3">
<div className="grid w-full items-center gap-2">
- <SelectDropDown
+ <Label id={`${fieldId}-model`} className="text-start text-sm font-medium">
+ {localize('com_ui_model')}
+ </Label>
+ <Dropdown
+ variant="field"
+ testId="select-dropdown-button"
+ aria-labelledby={`${fieldId}-model`}
value={model ?? ''}
- title={localize('com_ui_model')}
- setValue={createDropdownSetter(setModel)}
- availableValues={modelOptions}
+ onChange={setModel}
+ options={modelOptions}
disabled={readonly}
- className={cn(defaultTextProps, 'flex w-full resize-none', removeFocusRings)}
- containerClassName="flex w-full resize-none"
+ searchable={modelOptions.length > 10}
+ searchPlaceholder={localize('com_ui_search')}
+ searchEmptyText={localize('com_ui_no_results_found')}
/>
</div>
</div>
@@ -134,14 +135,21 @@ export default function Settings({ conversation, setOption, models, readonly }:
<HoverCard openDelay={300}>
<HoverCardTrigger className="grid w-full items-center gap-2">
<div className="grid w-full items-center gap-2">
- <SelectDropDown
- title={localize('com_endpoint_assistant')}
- value={assistantValue}
- setValue={createDropdownSetter(setAssistant)}
- availableValues={assistants as Option[]}
+ <Label id={`${fieldId}-assistant`} className="text-start text-sm font-medium">
+ {localize('com_endpoint_assistant')}
+ </Label>
+ <Dropdown
+ variant="field"
+ testId="select-dropdown-button"
+ aria-labelledby={`${fieldId}-assistant`}
+ value={String(assistantValue.value ?? '')}
+ placeholder={defaultOption.label}
+ onChange={setAssistant}
+ options={assistants as Option[]}
disabled={readonly}
- className={cn(defaultTextProps, 'flex w-full resize-none', removeFocusRings)}
- containerClassName="flex w-full resize-none"
+ searchable={assistants.length > 10}
+ searchPlaceholder={localize('com_ui_search')}
+ searchEmptyText={localize('com_ui_no_results_found')}
/>
</div>
</HoverCardTrigger>
diff --git a/client/src/components/SidePanel/Builder/AssistantPanel.tsx b/client/src/components/SidePanel/Builder/AssistantPanel.tsx
index 8f9ef812c2..8100fea071 100644
--- a/client/src/components/SidePanel/Builder/AssistantPanel.tsx
+++ b/client/src/components/SidePanel/Builder/AssistantPanel.tsx
@@ -1,6 +1,6 @@
-import { useState, useMemo, useEffect } from 'react';
+import { useId, useState, useMemo, useEffect } from 'react';
+import { Spinner, Dropdown, useToastContext } from '@librechat/client';
import { useGetModelsQuery } from 'librechat-data-provider/react-query';
-import { Spinner, useToastContext, SelectDropDown } from '@librechat/client';
import { useForm, FormProvider, Controller, useWatch } from 'react-hook-form';
import {
Tools,
@@ -17,13 +17,7 @@ import {
useUpdateAssistantMutation,
useAvailableAgentToolsQuery,
} from '~/data-provider';
-import {
- cn,
- cardStyle,
- defaultTextProps,
- getAvailableModelSelection,
- removeFocusOutlines,
-} from '~/utils';
+import { cn, defaultTextProps, getAvailableModelSelection, removeFocusOutlines } from '~/utils';
import AssistantConversationStarters from './AssistantConversationStarters';
import AssistantToolsDialog from '~/components/Tools/AssistantToolsDialog';
import { useSelectAssistant, useLocalize, useLocalStorage } from '~/hooks';
@@ -69,6 +63,7 @@ export default function AssistantPanel({
const { data: allTools = [] } = useAvailableAgentToolsQuery();
const { onSelect: onSelectAssistant } = useSelectAssistant(endpoint);
const { showToast } = useToastContext();
+ const modelFieldId = useId();
const localize = useLocalize();
const methods = useForm<AssistantForm>({
@@ -394,34 +389,34 @@ export default function AssistantPanel({
</div>
{/* Model */}
<div className="mb-6">
- <label className={labelClass} htmlFor="model">
+ <span id={`${modelFieldId}-label`} className={labelClass}>
{localize('com_ui_model')}
- </label>
+ </span>
<Controller
name="model"
control={control}
rules={{ required: true, minLength: 1 }}
render={({ field, fieldState: { error } }) => (
<>
- <SelectDropDown
- emptyTitle={true}
- value={field.value}
- setValue={field.onChange}
- availableValues={models}
+ <Dropdown
+ variant="field"
+ testId="select-dropdown-button"
+ aria-labelledby={`${modelFieldId}-label`}
+ aria-describedby={error ? `${modelFieldId}-error` : undefined}
+ value={field.value ?? ''}
+ onChange={field.onChange}
+ options={models}
disabled={!modelsReady}
- showAbove={false}
- showLabel={false}
- className={cn(
- cardStyle,
- 'flex h-[2.5rem] w-full flex-none items-center justify-center px-4 hover:cursor-pointer',
- )}
- containerClassName={cn(
- 'rounded-md',
- error ? 'border-border-destructive border-2' : '',
- )}
+ searchable={models.length > 10}
+ searchPlaceholder={localize('com_ui_search')}
+ searchEmptyText={localize('com_ui_no_results_found')}
+ aria-invalid={error != null}
/>
{error && (
- <span className="text-text-destructive text-sm transition duration-300 ease-in-out">
+ <span
+ id={`${modelFieldId}-error`}
+ className="text-text-destructive text-sm transition duration-300 ease-in-out"
+ >
{localize('com_ui_field_required')}
</span>
)}
diff --git a/client/src/components/SidePanel/Builder/AssistantSelect.tsx b/client/src/components/SidePanel/Builder/AssistantSelect.tsx
index 3251ee1df1..4567ccb0db 100644
--- a/client/src/components/SidePanel/Builder/AssistantSelect.tsx
+++ b/client/src/components/SidePanel/Builder/AssistantSelect.tsx
@@ -1,6 +1,6 @@
import { useMemo, useCallback, useEffect, useRef } from 'react';
import { Plus } from 'lucide-react';
-import { SelectDropDown } from '@librechat/client';
+import { Dropdown } from '@librechat/client';
import {
Tools,
FileSources,
@@ -20,7 +20,6 @@ import type { UseMutationResult } from '@tanstack/react-query';
import type { UseFormReset } from 'react-hook-form';
import type { Actions, ExtendedFile, AssistantForm, TAssistantOption } from '~/common';
import { useListAssistantsQuery } from '~/data-provider';
-import { cn, createDropdownSetter } from '~/utils';
import { useFileMapContext } from '~/Providers';
import { useLocalize } from '~/hooks';
@@ -242,41 +241,28 @@ export default function AssistantSelect({
}, [selectedAssistant, query.data, onSelect]);
const createAssistant = localize('com_ui_create_assistant');
+ const assistants = query.data ?? [];
+ const selectedValue = typeof value === 'string' ? value : (value.value?.toString() ?? '');
return (
- <SelectDropDown
- value={value || null}
+ <Dropdown
+ variant="field"
+ className="w-auto min-w-0 grow"
+ /** Kept from the previous picker, so existing locators still find it. */
+ testId="select-dropdown-button"
+ ariaLabel={localize('com_ui_assistant')}
+ value={selectedValue}
placeholder={createAssistant}
- setValue={createDropdownSetter(onSelect)}
- availableValues={
- query.data ?? [
- {
- label: 'Loading...',
- value: '',
- },
- ]
- }
- iconSide="left"
- showAbove={false}
- showLabel={false}
- emptyTitle={true}
- containerClassName="grow"
+ onChange={onSelect}
+ searchable={assistants.length > 10}
searchPlaceholder={localize('com_assistants_search_name')}
- optionsListClass="rounded-lg shadow-lg dark:last:border"
- currentValueClass="text-base font-semibold"
- className={cn(
- 'mt-1 rounded-md',
- 'z-50 flex h-[2.5rem] w-full flex-none items-center justify-center px-4 hover:cursor-pointer',
- )}
- renderOption={() => (
- <span className="flex items-center gap-1.5 truncate">
- <span className="text-text-primary absolute inset-y-0 inset-s-0 flex items-center ps-2">
- <Plus className="w-[1rem]" />
- </span>
- <span className={cn('text-text-primary ms-4 flex h-6 items-center gap-1')}>
- {createAssistant}
- </span>
- </span>
- )}
+ searchEmptyText={localize('com_ui_no_results_found')}
+ options={[
+ { value: '', label: createAssistant, icon: <Plus className="size-4" aria-hidden="true" /> },
+ ...assistants.map((assistant) => ({
+ value: assistant.id,
+ label: assistant.name ?? '',
+ })),
+ ]}
/>
);
}
diff --git a/client/src/components/SidePanel/Parameters/DynamicDropdown.tsx b/client/src/components/SidePanel/Parameters/DynamicDropdown.tsx
index 20cfc0f8c7..746f6ba67c 100644
--- a/client/src/components/SidePanel/Parameters/DynamicDropdown.tsx
+++ b/client/src/components/SidePanel/Parameters/DynamicDropdown.tsx
@@ -1,6 +1,6 @@
-import { useMemo, useState } from 'react';
+import { useId, useMemo, useState } from 'react';
import { OptionTypes } from 'librechat-data-provider';
-import { Label, HoverCard, HoverCardTrigger, SelectDropDown } from '@librechat/client';
+import { Label, Dropdown, HoverCard, HoverCardTrigger } from '@librechat/client';
import type { DynamicSettingProps } from 'librechat-data-provider';
import { TranslationKeys, useLocalize, useParameterEffects } from '~/hooks';
import { useChatContext } from '~/Providers';
@@ -28,6 +28,7 @@ function DynamicDropdown({
conversation,
}: DynamicSettingProps) {
const localize = useLocalize();
+ const labelId = useId();
const { preset } = useChatContext();
const [inputValue, setInputValue] = useState<string | null>(null);
@@ -63,6 +64,8 @@ function DynamicDropdown({
return null;
}
+ const labelText = labelCode ? (localize(label as TranslationKeys) ?? label) : label || settingKey;
+
return (
<div
className={cn(
@@ -74,11 +77,8 @@ function DynamicDropdown({
<HoverCardTrigger className="grid h-full w-full content-between items-center gap-2">
{showLabel === true && (
<div className="flex w-full justify-between">
- <Label
- htmlFor={`${settingKey}-dynamic-dropdown`}
- className="text-start text-xs font-medium"
- >
- {labelCode ? (localize(label as TranslationKeys) ?? label) : label || settingKey}
+ <Label id={labelId} className="text-start text-xs font-medium">
+ {labelText}
{showDefault && (
<small className="high-contrast:opacity-100 opacity-40">
({localize('com_endpoint_default')}: {defaultValue})
@@ -87,16 +87,18 @@ function DynamicDropdown({
</Label>
</div>
)}
- <SelectDropDown
- showLabel={false}
- emptyTitle={true}
+ <Dropdown
+ variant="field"
+ testId="select-dropdown-button"
+ aria-labelledby={showLabel === true ? labelId : undefined}
+ ariaLabel={showLabel === true ? undefined : labelText}
disabled={readonly}
- value={selectedValue}
- setValue={handleChange}
- availableValues={options}
- containerClassName="w-full"
- className="py-1.5"
- id={`${settingKey}-dynamic-dropdown`}
+ value={selectedValue ?? ''}
+ onChange={handleChange}
+ options={options}
+ searchable={options.length > 10}
+ searchPlaceholder={localize('com_ui_search')}
+ searchEmptyText={localize('com_ui_no_results_found')}
placeholder={
placeholderCode
? (localize(placeholder as TranslationKeys) ?? placeholder)
diff --git a/client/src/style.css b/client/src/style.css
index 506eff6826..5e1dc84380 100644
--- a/client/src/style.css
+++ b/client/src/style.css
@@ -960,7 +960,7 @@ pre[class*='language-'] {
/* Tailwind 3 gave every button a pointer cursor and Tailwind 4 leaves the
* platform default, so this shim is what keeps the affordance. It belongs in
* `base`: unlayered it would outrank every utility in the sheet, and
- * `cursor-default` on `SelectDropDown` or `disabled:cursor-not-allowed` on a
+ * `cursor-default` on a trigger or `disabled:cursor-not-allowed` on a
* disabled button would stop meaning anything. */
@layer base {
[role='button'],
diff --git a/e2e/specs/mock/scenarios/assistant-model-field.spec.ts b/e2e/specs/mock/scenarios/assistant-model-field.spec.ts
new file mode 100644
index 0000000000..418d496a36
--- /dev/null
+++ b/e2e/specs/mock/scenarios/assistant-model-field.spec.ts
@@ -0,0 +1,94 @@
+import { expect, test } from '@playwright/test';
+import type { Page } from '@playwright/test';
+import { getAccessToken, requestJson } from '../helpers';
+import { openSidebar } from './sidebar';
+
+/**
+ * The Assistant Builder's model field is a field `Dropdown` named by its visible "Model" label,
+ * whose trigger also reads out the chosen model. It opens from the keyboard, marks the current
+ * model as selected, and a keyboard pick moves the field to the next model in the list.
+ */
+
+type CreatedAssistant = { id: string };
+
+const ASSISTANT_NAME = 'E2E model field assistant';
+const SECOND_MODEL = 'e2e-assistants-second-model';
+
+/** The mock lists one assistants model; a second one gives the keyboard somewhere to move. */
+async function offerSecondModel(page: Page) {
+ await page.route('**/api/models', async (route) => {
+ const response = await route.fetch();
+ const models = (await response.json()) as Record<string, string[]>;
+ models.assistants = [...new Set([...(models.assistants ?? []), SECOND_MODEL])];
+ await route.fulfill({ response, json: models });
+ });
+}
+
+async function createAssistant(page: Page): Promise<CreatedAssistant> {
+ await page.goto('/c/new', { timeout: 10000 });
+ const token = await getAccessToken(page);
+ return requestJson<CreatedAssistant>(page, {
+ path: '/api/assistants/v2',
+ token,
+ method: 'POST',
+ body: { endpoint: 'assistants', model: 'gpt-4o-mini', name: ASSISTANT_NAME },
+ });
+}
+
+async function deleteAssistant(page: Page, assistantId: string) {
+ const token = await getAccessToken(page);
+ await requestJson(page, {
+ path: `/api/assistants/v2/${encodeURIComponent(assistantId)}?endpoint=assistants&model=gpt-4o-mini`,
+ token,
+ method: 'DELETE',
+ body: { endpoint: 'assistants' },
+ });
+}
+
+test('the model field opens and takes a pick from the keyboard @scenario:assistant-model-field-keyboard', async ({
+ page,
+}) => {
+ test.setTimeout(60000);
+ const assistant = await createAssistant(page);
+ await offerSecondModel(page);
+
+ try {
+ await page.goto('/c/new?endpoint=assistants&model=gpt-4o-mini', { timeout: 10000 });
+ await openSidebar(page);
+ /** The mobile drawer opens on chat history; its panels are items of the Control Panel menu. */
+ const controlPanel = page.getByRole('button', { name: 'Control Panel' });
+ if (await controlPanel.isVisible()) {
+ await controlPanel.click();
+ await page.getByRole('menuitemcheckbox', { name: 'Assistant Builder' }).click();
+ } else {
+ await page.getByRole('button', { name: 'Assistant Builder' }).first().click();
+ }
+
+ /** The name is the label followed by the chosen model, so it changes with each pick. */
+ const field = page.getByRole('combobox', { name: /^Model / });
+ await expect(field).toHaveAccessibleName('Model gpt-4o-mini');
+
+ await field.focus();
+ await page.keyboard.press('Enter');
+ const listbox = page.getByRole('listbox');
+ await expect(listbox).toBeVisible();
+ await expect(listbox.getByRole('option', { name: 'gpt-4o-mini', exact: true })).toHaveAttribute(
+ 'aria-selected',
+ 'true',
+ );
+
+ const options = (await listbox.getByRole('option').allInnerTexts()).map((label) =>
+ label.trim(),
+ );
+ const next = options[options.indexOf('gpt-4o-mini') + 1] ?? options[0];
+ expect(options).toContain(SECOND_MODEL);
+
+ await page.keyboard.press('ArrowDown');
+ await page.keyboard.press('Enter');
+ await expect(listbox).toBeHidden();
+ await expect(field).toHaveAccessibleName(`Model ${next}`);
+ await expect(field).toBeFocused();
+ } finally {
+ await deleteAssistant(page, assistant.id);
+ }
+});
diff --git a/e2e/specs/mock/scenarios/assistant-select-empty.spec.ts b/e2e/specs/mock/scenarios/assistant-select-empty.spec.ts
index a07cd45a59..9779a923c4 100644
--- a/e2e/specs/mock/scenarios/assistant-select-empty.spec.ts
+++ b/e2e/specs/mock/scenarios/assistant-select-empty.spec.ts
@@ -7,7 +7,7 @@ import { openSidebar } from './sidebar';
/**
* The Assistant Builder's picker shows "Create Assistant" until an assistant is
* chosen. That label is an empty state, not a value, so it takes the muted tone
- * `SelectDropDown` gives its placeholder, while a chosen assistant reads as the
+ * the picker gives its placeholder, while a chosen assistant reads as the
* primary value. Both expected colours are resolved from the app's stylesheet,
* so the assertions hold in light and dark mode alike.
*/
diff --git a/eslint-suppressions.json b/eslint-suppressions.json
index b49d7a3796..4ea877ba84 100644
--- a/eslint-suppressions.json
+++ b/eslint-suppressions.json
@@ -642,9 +642,6 @@
"client/src/components/Endpoints/Settings/Assistants.tsx": {
"shadcn/no-restyle": {
"count": 1
- },
- "shadcn/require-static-classes": {
- "count": 4
}
},
"client/src/components/Endpoints/Settings/Examples.tsx": {
@@ -1181,19 +1178,6 @@
"count": 8
}
},
- "client/src/components/SidePanel/Builder/AssistantPanel.tsx": {
- "shadcn/no-restyle": {
- "count": 4
- },
- "shadcn/require-static-classes": {
- "count": 1
- }
- },
- "client/src/components/SidePanel/Builder/AssistantSelect.tsx": {
- "shadcn/no-restyle": {
- "count": 7
- }
- },
"client/src/components/SidePanel/Builder/Retrieval.tsx": {
"design/disabled-recipe": {
"count": 1
@@ -1246,7 +1230,7 @@
},
"client/src/components/SidePanel/Parameters/DynamicDropdown.tsx": {
"shadcn/no-restyle": {
- "count": 2
+ "count": 1
}
},
"client/src/components/SidePanel/Parameters/DynamicInput.tsx": {
diff --git a/packages/client/src/components/Dropdown.tsx b/packages/client/src/components/Dropdown.tsx
index 32b96bccf0..0f8d4b26c7 100644
--- a/packages/client/src/components/Dropdown.tsx
+++ b/packages/client/src/components/Dropdown.tsx
@@ -5,9 +5,9 @@ import * as Select from '@ariakit/react/select';
import * as Combobox from '@ariakit/react/combobox';
import type { Option } from '~/common';
import { useDialogDepth, usePopoverZIndex } from './OriginalDialog';
+import { fieldControl, fieldInvalid } from './Field';
import { cn, disabledFillClasses } from '~/utils';
import { focusOutlineRole } from './Focus';
-import { fieldControl } from './Field';
import './Dropdown.css';
type DropdownShape = 'default' | 'theme' | 'round';
@@ -30,6 +30,8 @@ interface DropdownProps {
ariaLabel?: string;
'aria-labelledby'?: string;
'aria-describedby'?: string;
+ /** Marks the field invalid; a `field` trigger then draws its border in the destructive role. */
+ 'aria-invalid'?: boolean;
/** Portals the list out of the trigger's parent. Defaults to `true`, and to `false` inside a
* dialog, whose focus trap and `aria-hidden` pass would cut a portaled list off. */
portal?: boolean;
@@ -48,6 +50,8 @@ interface DropdownProps {
searchable?: boolean;
searchPlaceholder?: string;
searchEmptyText?: string;
+ /** Shown in the secondary tone while no option is chosen. */
+ placeholder?: string;
}
const shapeClasses: Record<DropdownShape, string> = {
@@ -80,6 +84,7 @@ const Dropdown: React.FC<DropdownProps> = ({
ariaLabel,
'aria-labelledby': ariaLabelledBy,
'aria-describedby': ariaDescribedBy,
+ 'aria-invalid': ariaInvalid,
portal,
variant = 'default',
shape = 'theme',
@@ -88,6 +93,7 @@ const Dropdown: React.FC<DropdownProps> = ({
searchable = false,
searchPlaceholder,
searchEmptyText,
+ placeholder,
}) => {
const valueId = `${useId()}value`;
const inDialog = useDialogDepth() > 0;
@@ -191,7 +197,7 @@ const Dropdown: React.FC<DropdownProps> = ({
iconOnly
? 'size-theme-button min-h-theme-target min-w-theme-target justify-center px-0'
: 'w-fit max-w-full gap-2 px-3',
- variant === 'field' && fieldControl,
+ variant === 'field' && [fieldControl, fieldInvalid],
variant === 'compact' && 'h-theme-button-compact px-2.5 py-0 text-xs transition-none',
triggerClassName,
)}
@@ -206,6 +212,7 @@ const Dropdown: React.FC<DropdownProps> = ({
ariaLabelledBy == null || iconOnly ? ariaLabelledBy : `${ariaLabelledBy} ${valueId}`
}
aria-describedby={ariaDescribedBy}
+ aria-invalid={ariaInvalid}
>
<div className={cn('flex min-w-0 items-center gap-2', iconOnly ? 'shrink-0' : 'w-full')}>
{icon}
@@ -217,7 +224,11 @@ const Dropdown: React.FC<DropdownProps> = ({
if (matchedOption && renderValue) {
return renderValue(matchedOption);
}
- return getOptionLabel(selectedValue);
+ const optionLabel = getOptionLabel(selectedValue);
+ if (!optionLabel && placeholder) {
+ return <span className="text-text-secondary">{placeholder}</span>;
+ }
+ return optionLabel;
})()}
</span>
)}
diff --git a/packages/client/src/components/MultiSearch.tsx b/packages/client/src/components/MultiSearch.tsx
deleted file mode 100644
index 2c522f9acb..0000000000
--- a/packages/client/src/components/MultiSearch.tsx
+++ /dev/null
@@ -1,156 +0,0 @@
-import React, { useState, useMemo, useCallback, useRef } from 'react';
-import { JSX } from 'react/jsx-runtime';
-import { Search, X } from 'lucide-react';
-import { cn } from '~/utils';
-
-/** This is a generic that can be added to Menu and Select components */
-export default function MultiSearch({
- value,
- onChange,
- placeholder,
- className = '',
-}: {
- value: string | null;
- onChange: (filter: string) => void;
- placeholder?: string;
- className?: string;
-}): JSX.Element {
- const inputRef = useRef<HTMLInputElement>(null);
-
- const onChangeHandler: React.ChangeEventHandler<HTMLInputElement> = useCallback(
- (e) => onChange(e.target.value),
- [onChange],
- );
-
- const clearSearch = () => {
- onChange('');
- setTimeout(() => {
- inputRef.current?.focus();
- }, 0);
- };
-
- return (
- <div
- className={cn(
- 'focus:to-surface-primary/50 group from-surface-tertiary-alt text-text-primary focus:from-surface-primary sticky inset-s-0 top-0 z-10 flex h-12 items-center gap-2 bg-gradient-to-b from-65% to-transparent px-3 py-2 transition-colors duration-300 focus:bg-gradient-to-b',
- className,
- )}
- >
- <Search
- className="text-text-secondary-alt h-4 w-4 transition-colors duration-300"
- aria-hidden={'true'}
- />
- <input
- ref={inputRef}
- type="text"
- value={value ?? ''}
- onChange={onChangeHandler}
- placeholder={String(placeholder ?? 'Search...')}
- aria-label="Search Model"
- className="placeholder-text-secondary focus:ring-focus-control flex-1 rounded-md border-none bg-transparent px-2.5 py-2 text-sm focus:ring-1 focus:outline-hidden"
- />
- <button
- className={cn(
- 'text-text-secondary-alt relative flex h-5 w-5 items-center justify-end rounded-md',
- (value?.length ?? 0) ? 'cursor-pointer opacity-100' : 'hidden',
- )}
- aria-label={'Clear search'}
- onClick={clearSearch}
- tabIndex={0}
- >
- <X
- aria-hidden={'true'}
- className={cn(
- 'text-text-secondary-alt',
- (value?.length ?? 0) ? 'cursor-pointer opacity-100' : 'opacity-0',
- )}
- />
- </button>
- </div>
- );
-}
-
-/**
- * Helper function that will take a multiSearch input
- * @param node
- */
-function defaultGetStringKey(node: unknown): string {
- if (typeof node === 'string') {
- // BUGFIX: Detect psedeo separators and make sure they don't appear in the list when filtering items
- // it makes sure (for the most part) that the model name starts and ends with dashes
- // The long-term fix here would be to enable seperators (model groupings) but there's no
- // feature mocks for such a thing yet
- if (node.startsWith('---') && node.endsWith('---')) {
- return '';
- }
-
- return node.toUpperCase();
- }
- // This should be a noop, but it's here for redundancy
- return '';
-}
-
-/**
- * Hook for conditionally making a multi-element list component into a sortable component
- * Returns a RenderNode for search input when search functionality is available
- * @param availableOptions
- * @param placeholder
- * @param getTextKeyOverride
- * @param className - Additional classnames to add to the search container
- * @param disabled - If the search should be disabled
- * @returns
- */
-export function useMultiSearch<OptionsType extends unknown[]>({
- availableOptions = [] as unknown as OptionsType,
- placeholder,
- getTextKeyOverride,
- className,
- disabled = false,
-}: {
- availableOptions?: OptionsType;
- placeholder?: string;
- getTextKeyOverride?: (node: OptionsType[0]) => string;
- className?: string;
- disabled?: boolean;
-}): [OptionsType, React.ReactNode] {
- const [filterValue, setFilterValue] = useState<string | null>(null);
-
- // We conditionally show the search when there's more than 10 elements in the menu
- const shouldShowSearch = availableOptions.length > 10 && !disabled;
-
- // Define the helper function used to enable search
- // If this is invalidly described, we will assume developer error - tf. avoid rendering
- const getTextKeyHelper = getTextKeyOverride || defaultGetStringKey;
-
- // Iterate said options
- const filteredOptions = useMemo(() => {
- const currentFilter = filterValue ?? '';
- if (!shouldShowSearch || !currentFilter || !availableOptions.length) {
- // Don't render if available options aren't present, there's no filter active
- return availableOptions;
- }
- // Filter through the values, using a simple text-based search
- // nothing too fancy, but we can add a better search algo later if we need
- const upperFilterValue = currentFilter.toUpperCase();
-
- return availableOptions.filter((value) =>
- getTextKeyHelper(value).includes(upperFilterValue),
- ) as OptionsType;
- }, [availableOptions, getTextKeyHelper, filterValue, shouldShowSearch]);
-
- const onSearchChange = useCallback(
- (nextFilterValue: string) => setFilterValue(nextFilterValue),
- [],
- );
-
- const searchRender = shouldShowSearch ? (
- <MultiSearch
- value={filterValue}
- className={className}
- onChange={onSearchChange}
- placeholder={placeholder}
- />
- ) : null;
-
- return [filteredOptions, searchRender];
-}
diff --git a/packages/client/src/components/SelectDropDown.tsx b/packages/client/src/components/SelectDropDown.tsx
deleted file mode 100644
index bff99b1670..0000000000
--- a/packages/client/src/components/SelectDropDown.tsx
+++ /dev/null
@@ -1,304 +0,0 @@
-import React from 'react';
-import { JSX } from 'react/jsx-runtime';
-import {
- Label,
- Listbox,
- Transition,
- ListboxButton,
- ListboxOption,
- ListboxOptions,
-} from '@headlessui/react';
-import type { Option, OptionWithIcon, DropdownValueSetter } from '~/common';
-import { cn, disabledFillClasses } from '~/utils';
-import { useMultiSearch } from './MultiSearch';
-import { CheckMark } from '~/svgs';
-
-type SelectDropDownProps = {
- id?: string;
- title?: string;
- disabled?: boolean;
- value: string | null | Option | OptionWithIcon;
- setValue: DropdownValueSetter | ((value: string) => void);
- tabIndex?: number;
- availableValues?: string[] | Option[] | OptionWithIcon[];
- emptyTitle?: boolean;
- showAbove?: boolean;
- showLabel?: boolean;
- iconSide?: IconSide;
- optionIconSide?: IconSide;
- renderOption?: () => React.ReactNode;
- containerClassName?: string;
- currentValueClass?: string;
- optionsListClass?: string;
- optionsClass?: string;
- subContainerClassName?: string;
- className?: string;
- placeholder?: string;
- searchClassName?: string;
- searchPlaceholder?: string;
- showOptionIcon?: boolean;
-};
-
-/** `left` and `right` are physical edges in every direction; `start` and `end` follow the
- * reading direction, so they mirror in RTL. */
-type IconSide = 'left' | 'right' | 'start' | 'end';
-
-const checkMarkSide: Record<IconSide, string> = {
- left: 'left-0 pl-2',
- right: 'right-0 pr-3',
- start: 'inset-s-0 ps-2',
- end: 'inset-e-0 pe-3',
-};
-
-/** Room for a check mark that sits before the label. */
-const labelCheckGap: Record<IconSide, string> = { left: 'ml-4', right: '', start: 'ms-4', end: '' };
-
-const trailingOptionIcon: Record<IconSide, string> = {
- left: '',
- right: 'absolute right-0 pr-2',
- start: '',
- end: 'absolute inset-e-0 pe-2',
-};
-
-function getOptionText(option: string | Option | OptionWithIcon): string {
- if (typeof option === 'string') {
- return option;
- }
- if ('label' in option) {
- return option.label ?? '';
- }
- if ('value' in option) {
- return (option.value ?? '') + '';
- }
- return '';
-}
-
-function SelectDropDown({
- title: _title,
- value,
- disabled,
- setValue,
- availableValues,
- showAbove = false,
- showLabel = true,
- emptyTitle = false,
- iconSide = 'end',
- optionIconSide = 'start',
- placeholder,
- containerClassName,
- optionsListClass,
- optionsClass,
- currentValueClass,
- subContainerClassName,
- className,
- renderOption,
- searchClassName,
- searchPlaceholder,
- showOptionIcon = false,
-}: SelectDropDownProps): JSX.Element {
- const transitionProps = { className: 'top-full mt-3' };
- if (showAbove) {
- transitionProps.className = 'bottom-full mb-3';
- }
-
- let title = _title;
- if (emptyTitle) {
- title = '';
- }
-
- const values = availableValues ?? [];
-
- // Enable searchable select if enough items are provided.
- const [filteredValues, searchRender] = useMultiSearch<string[] | Option[]>({
- availableOptions: values,
- placeholder: searchPlaceholder,
- getTextKeyOverride: (option) => getOptionText(option).toUpperCase(),
- className: searchClassName,
- disabled,
- });
- const hasSearchRender = searchRender != null;
- const options = hasSearchRender ? filteredValues : values;
- const renderIcon = showOptionIcon && value != null && (value as OptionWithIcon).icon != null;
- /** The wide padding keeps the label clear of a trailing check mark, on the same axis as it. */
- const optionPadding = iconSide === 'left' || iconSide === 'right' ? 'pr-9 pl-3' : 'ps-3 pe-9';
-
- return (
- <div className={cn('flex items-center justify-center gap-2', containerClassName ?? '')}>
- <div className={cn('relative w-full', subContainerClassName ?? '')}>
- <Listbox value={value} onChange={setValue} disabled={disabled}>
- {({ open }) => (
- <>
- <ListboxButton
- data-testid="select-dropdown-button"
- onKeyDown={(event) => {
- if (event.key !== 'Enter') {
- return;
- }
- event.preventDefault();
- if (!open) {
- event.currentTarget.dispatchEvent(
- new KeyboardEvent('keydown', { key: 'ArrowDown', bubbles: true }),
- );
- }
- }}
- className={cn(
- 'border-border-control bg-surface-secondary focus-visible:ring-focus-control disabled:bg-surface-secondary relative flex w-full cursor-default flex-col rounded-md border py-2 ps-3 pe-10 text-start focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-hidden sm:text-sm',
- disabledFillClasses,
- className ?? '',
- )}
- >
- {showLabel && (
- <Label
- className="text-text-secondary block text-xs"
- id="headlessui-listbox-label-:r1:"
- data-headlessui-state=""
- >
- {title}
- </Label>
- )}
- <span className="inline-flex w-full truncate">
- <span
- className={cn(
- 'text-text-primary flex h-6 items-center gap-1 truncate text-sm',
- !showLabel ? 'text-xs' : '',
- currentValueClass ?? '',
- )}
- >
- {!showLabel && !emptyTitle && (
- <span className="text-text-secondary text-xs">{title}:</span>
- )}
- {renderIcon && trailingOptionIcon[optionIconSide] === '' && (
- <span className="icon-md flex items-center">
- {(value as OptionWithIcon).icon}
- </span>
- )}
- {renderIcon && (
- <span className="icon-md absolute inset-e-0 me-8 flex items-center">
- {(value as OptionWithIcon).icon}
- </span>
- )}
- {(() => {
- if (!value) {
- return <span className="text-text-secondary">{placeholder}</span>;
- }
- if (typeof value !== 'string') {
- return value.label ?? '';
- }
- return value;
- })()}
- </span>
- </span>
- <span className="pointer-events-none absolute inset-y-0 inset-e-0 flex items-center pe-2">
- <svg
- stroke="currentColor"
- fill="none"
- strokeWidth="2"
- viewBox="0 0 24 24"
- strokeLinecap="round"
- strokeLinejoin="round"
- className="text-text-tertiary h-4 w-4"
- height="1em"
- width="1em"
- xmlns="http://www.w3.org/2000/svg"
- style={showAbove ? { transform: 'scaleY(-1)' } : {}}
- >
- <polyline points="6 9 12 15 18 9"></polyline>
- </svg>
- </span>
- </ListboxButton>
- <Transition
- show={open}
- as="div"
- leave="transition ease-in duration-100"
- leaveFrom="opacity-100"
- leaveTo="opacity-0"
- {...transitionProps}
- >
- <ListboxOptions
- className={cn(
- 'border-border-light bg-surface-secondary absolute z-10 mt-2 max-h-60 w-full overflow-auto rounded-sm border text-xs md:w-[100%]',
- optionsListClass ?? '',
- )}
- >
- {renderOption && (
- <ListboxOption
- key={'listbox-render-option'}
- value={null}
- className={cn(
- 'group text-text-primary hover:bg-surface-hover relative flex h-[2.625rem] cursor-pointer items-center overflow-hidden select-none',
- optionPadding,
- optionsClass ?? '',
- )}
- >
- {renderOption() as React.JSX.Element}
- </ListboxOption>
- )}
- {searchRender as React.JSX.Element}
- {options.map((option: string | Option, i: number) => {
- if (!option) {
- return null;
- }
- const currentLabel =
- typeof option === 'string' ? option : (option.label ?? option.value ?? '');
- const currentValue = typeof option === 'string' ? option : (option.value ?? '');
- const currentIcon =
- typeof option === 'string'
- ? null
- : ((option.icon as React.ReactNode) ?? null);
- let activeValue: string | number | null | Option = value;
- if (typeof activeValue !== 'string') {
- activeValue = activeValue?.value ?? '';
- }
- return (
- <ListboxOption
- key={i}
- value={option}
- className={({ active }) =>
- cn(
- 'group text-text-primary hover:bg-surface-hover relative flex h-[2.625rem] cursor-pointer items-center overflow-hidden select-none',
- optionPadding,
- active ? 'bg-surface-active text-text-primary' : '',
- optionsClass ?? '',
- )
- }
- >
- <span className="flex items-center gap-1.5 truncate">
- <span
- className={cn(
- 'text-text-primary flex h-6 items-center gap-1',
- option === value ? 'font-semibold' : '',
- labelCheckGap[iconSide],
- )}
- >
- {currentIcon != null && (
- <span className={cn('me-1', trailingOptionIcon[optionIconSide])}>
- {currentIcon}
- </span>
- )}
- {currentLabel}
- </span>
- {value != null && currentValue === activeValue && (
- <span
- className={cn(
- 'text-text-primary absolute inset-y-0 flex items-center',
- checkMarkSide[iconSide],
- )}
- >
- <CheckMark />
- </span>
- )}
- </span>
- </ListboxOption>
- );
- })}
- </ListboxOptions>
- </Transition>
- </>
- )}
- </Listbox>
- </div>
- </div>
- );
-}
-
-export default SelectDropDown;
diff --git a/packages/client/src/components/__tests__/SelectDropDown.spec.tsx b/packages/client/src/components/__tests__/SelectDropDown.spec.tsx
deleted file mode 100644
index 1711f7f737..0000000000
--- a/packages/client/src/components/__tests__/SelectDropDown.spec.tsx
+++ /dev/null
@@ -1,102 +0,0 @@
-import { useState } from 'react';
-import userEvent from '@testing-library/user-event';
-import { act, render, screen, waitFor } from '@testing-library/react';
-import type { FormEvent } from 'react';
-import SelectDropDown from '../SelectDropDown';
-
-const OPTIONS = [
- { label: 'Loading...', value: '' },
- { label: 'Second', value: 'second' },
-];
-
-async function openList() {
- await userEvent.setup().click(screen.getByTestId('select-dropdown-button'));
-}
-
-describe('SelectDropDown', () => {
- it.each(['{Enter}', ' '])(
- 'reopens an empty picker with %s after clearing its value',
- async (key) => {
- function Picker() {
- const [value, setValue] = useState<(typeof OPTIONS)[number] | null>(OPTIONS[1]);
- return (
- <SelectDropDown
- value={value}
- setValue={(next) => setValue(next as typeof value)}
- availableValues={OPTIONS}
- placeholder="Create Assistant"
- renderOption={() => <span>Create Assistant</span>}
- showLabel={false}
- emptyTitle={true}
- />
- );
- }
- const user = userEvent.setup();
- const onSubmit = jest.fn((event: FormEvent<HTMLFormElement>) => event.preventDefault());
- render(
- <form onSubmit={onSubmit}>
- <Picker />
- </form>,
- );
- const button = screen.getByTestId('select-dropdown-button');
- await act(async () => {
- await user.click(button);
- });
- await act(async () => {
- await user.click(await screen.findByRole('option', { name: 'Create Assistant' }));
- });
- expect(button).toHaveTextContent('Create Assistant');
-
- await waitFor(() => expect(screen.queryByRole('listbox')).not.toBeInTheDocument());
- act(() => button.focus());
- await act(async () => {
- await user.keyboard(key);
- });
- await waitFor(() => expect(screen.getByRole('listbox')).toBeVisible());
- expect(onSubmit).not.toHaveBeenCalled();
- expect(screen.getByRole('option', { name: 'Second' }).querySelector('svg')).toBeNull();
- await act(async () => {
- await user.keyboard('{Escape}');
- });
- await waitFor(() => expect(screen.queryByRole('listbox')).not.toBeInTheDocument());
- },
- );
- it('renders the placeholder in the muted tone when no value is chosen', () => {
- render(
- <SelectDropDown
- value={null}
- setValue={jest.fn()}
- availableValues={OPTIONS}
- placeholder="Create Assistant"
- showLabel={false}
- emptyTitle={true}
- />,
- );
-
- expect(screen.getByText('Create Assistant')).toHaveClass('text-text-secondary');
- });
-
- it('does not mark an empty-valued option as selected when no value is chosen', async () => {
- render(
- <SelectDropDown
- value={null}
- setValue={jest.fn()}
- availableValues={OPTIONS}
- placeholder="Create Assistant"
- />,
- );
- await openList();
-
- const empty = await screen.findByRole('option', { name: 'Loading...' });
- expect(empty.querySelector('svg')).toBeNull();
- });
-
- it('marks the chosen option as selected', async () => {
- render(<SelectDropDown value={OPTIONS[1]} setValue={jest.fn()} availableValues={OPTIONS} />);
- await openList();
-
- const chosen = await screen.findByRole('option', { name: 'Second' });
- expect(chosen.querySelector('svg')).not.toBeNull();
- expect(screen.getByRole('option', { name: 'Loading...' }).querySelector('svg')).toBeNull();
- });
-});
diff --git a/packages/client/src/components/focus.spec.tsx b/packages/client/src/components/focus.spec.tsx
index 2e28a8bdbc..1342378564 100644
--- a/packages/client/src/components/focus.spec.tsx
+++ b/packages/client/src/components/focus.spec.tsx
@@ -7,7 +7,6 @@ import { Tabs, TabsList, TabsTrigger } from './Tabs';
import InputWithDropdown from './InputWithDropDown';
import { InputCombobox } from './InputCombobox';
import { SecretInput } from './SecretInput';
-import MultiSearch from './MultiSearch';
import Dropdown from './Dropdown';
jest.mock('./MorphIcon', () => {
@@ -51,16 +50,6 @@ describe('shared control keyboard focus', () => {
});
});
- it('rings the model search field in the focus role', async () => {
- const user = userEvent.setup();
- render(<MultiSearch value="" onChange={jest.fn()} />);
-
- await user.tab();
- const search = screen.getByRole('textbox', { name: 'Search Model' });
- expect(search).toHaveFocus();
- expect(search).toHaveClass('focus:ring-1', 'focus:ring-focus-control');
- });
-
it('rings the dropdown toggle and its options in the focus role', async () => {
const user = userEvent.setup();
render(<InputWithDropdown aria-label="Stop word" options={['alpha', 'beta']} />);
diff --git a/packages/client/src/components/index.ts b/packages/client/src/components/index.ts
index 0d4d17c5da..4d1c51b4a5 100644
--- a/packages/client/src/components/index.ts
+++ b/packages/client/src/components/index.ts
@@ -39,7 +39,6 @@ export * from './SegmentedMeter';
export * from './Collapsible';
export * from './InputOTP';
export * from './IconButton';
-export * from './MultiSearch';
export * from './Resizable';
export { default as Radio } from './Radio';
export { default as Badge } from './Badge';
@@ -65,7 +64,6 @@ export { default as DelayedRender } from './DelayedRender';
export { default as ThemeSelector } from './ThemeSelector';
export { default as InfoHoverCard } from './InfoHoverCard';
export { default as CheckboxButton } from './CheckboxButton';
-export { default as SelectDropDown } from './SelectDropDown';
export { default as ControlCombobox } from './ControlCombobox';
export { default as EmptyState } from './EmptyState';
export type { EmptyStateProps } from './EmptyState';
diff --git a/packages/client/src/theme/highContrast.css b/packages/client/src/theme/highContrast.css
index ed651bd61b..02dd3a79cd 100644
--- a/packages/client/src/theme/highContrast.css
+++ b/packages/client/src/theme/highContrast.css
@@ -10,7 +10,7 @@
* only works because selection is marked by a perimeter; and `::placeholder`
* has no token at all, so it falls through to Tailwind preflight's raw
* `gray-400`. Both defects reach package primitives — `TimePicker`,
- * `SelectDropDown`, `MultiSelect`, `InputWithDropDown`, `Badge`, `DataTable`,
+ * `MultiSelect`, `InputWithDropDown`, `Badge`, `DataTable`,
* `Input`, `Textarea` — so shipping the palette without these rules ships a
* broken palette.
*