mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-26 21:28:50 +01:00
* 🔧 refactor: Improve accessibility and styling in ChatGroupItem and FilterPrompts components * 🔧 fix: Add button type and keyboard accessibility to dropdown menu trigger in ChatGroupItem * 🔧 fix(757): Enhance accessibility by updating aria-labels and adding localization for prompt groups * 🔧 fix(618): Update version to 0.3.1 and enhance accessibility in InfoHoverCard component * 🔧 fix(618): Update aria-label in InfoHoverCard to use dynamic text prop for improved accessibility * 🔧 fix: Enhance accessibility by updating aria-labels and roles in Conversations components * 🔧 fix(620): Enhance accessibility by adding tabIndex to Tabs.Content components in ArtifactTabs, Settings, and Speech components * refactor: remove RevokeKeysButton component and update related components for accessibility - Deleted RevokeKeysButton component. - Updated SharedLinks and General components to use Label for accessibility. - Enhanced Personalization component with aria-labelledby and aria-describedby attributes. - Refactored ConversationModeSwitch to use ToggleSwitch for better state management. - Improved AutoSendTextSelector with local state management and accessibility attributes. - Replaced Switch components with ToggleSwitch in various Speech and TTS components for consistency. - Added aria-labelledby attributes to Dropdown components for better accessibility. - Updated translation.json to include new localization keys and improved existing ones. - Enhanced Slider component to support aria attributes for better accessibility. * 🔧 fix: Enhance user feedback for API key operations with success and error messages * 🔧 fix: Update aria-labels in Avatar component for improved localization and accessibility * 🔧 fix: Refactor handleFile and handleDrop functions for improved readability and maintainability
160 lines
5.4 KiB
TypeScript
160 lines
5.4 KiB
TypeScript
import React from 'react';
|
|
import * as Select from '@ariakit/react/select';
|
|
import type { Option } from '~/common';
|
|
import { cn } from '~/utils/';
|
|
import './Dropdown.css';
|
|
|
|
interface DropdownProps {
|
|
value?: string;
|
|
label?: string;
|
|
onChange: (value: string) => void;
|
|
options: (string | Option | { divider: true })[];
|
|
className?: string;
|
|
sizeClasses?: string;
|
|
testId?: string;
|
|
icon?: React.ReactNode;
|
|
iconOnly?: boolean;
|
|
renderValue?: (option: Option) => React.ReactNode;
|
|
ariaLabel?: string;
|
|
'aria-labelledby'?: string;
|
|
portal?: boolean;
|
|
}
|
|
|
|
const isDivider = (item: string | Option | { divider: true }): item is { divider: true } =>
|
|
typeof item === 'object' && 'divider' in item;
|
|
|
|
const isOption = (item: string | Option | { divider: true }): item is Option =>
|
|
typeof item === 'object' && 'value' in item && 'label' in item;
|
|
|
|
const Dropdown: React.FC<DropdownProps> = ({
|
|
value: selectedValue,
|
|
label = '',
|
|
onChange,
|
|
options,
|
|
className = '',
|
|
sizeClasses,
|
|
testId = 'dropdown-menu',
|
|
icon,
|
|
iconOnly = false,
|
|
renderValue,
|
|
ariaLabel,
|
|
'aria-labelledby': ariaLabelledBy,
|
|
portal = true,
|
|
}) => {
|
|
const handleChange = (value: string) => {
|
|
onChange(value);
|
|
};
|
|
|
|
const selectProps = Select.useSelectStore({
|
|
value: selectedValue,
|
|
setValue: handleChange,
|
|
});
|
|
|
|
const getOptionObject = (val: string | undefined): Option | undefined => {
|
|
if (val == null || val === '') {
|
|
return undefined;
|
|
}
|
|
return options
|
|
.filter((o) => !isDivider(o))
|
|
.map((o) => (typeof o === 'string' ? { value: o, label: o } : o))
|
|
.find((o) => isOption(o) && o.value === val) as Option | undefined;
|
|
};
|
|
|
|
const getOptionLabel = (currentValue: string | undefined) => {
|
|
if (currentValue == null || currentValue === '') {
|
|
return '';
|
|
}
|
|
const option = getOptionObject(currentValue);
|
|
return option ? option.label : currentValue;
|
|
};
|
|
|
|
return (
|
|
<div className={cn('relative', className)}>
|
|
<Select.Select
|
|
store={selectProps}
|
|
className={cn(
|
|
'focus:ring-offset-ring-offset relative inline-flex items-center justify-between rounded-xl border border-input bg-background px-3 py-2 text-sm text-text-primary transition-all duration-200 ease-in-out hover:bg-accent hover:text-accent-foreground focus:ring-ring-primary',
|
|
iconOnly ? 'h-full w-10' : 'w-fit gap-2',
|
|
className,
|
|
)}
|
|
data-testid={testId}
|
|
aria-label={ariaLabel}
|
|
aria-labelledby={ariaLabelledBy}
|
|
>
|
|
<div className="flex w-full items-center gap-2">
|
|
{icon}
|
|
{!iconOnly && (
|
|
<span className="block truncate">
|
|
{label}
|
|
{(() => {
|
|
const matchedOption = getOptionObject(selectedValue);
|
|
if (matchedOption && renderValue) {
|
|
return renderValue(matchedOption);
|
|
}
|
|
return getOptionLabel(selectedValue);
|
|
})()}
|
|
</span>
|
|
)}
|
|
</div>
|
|
{!iconOnly && <Select.SelectArrow />}
|
|
</Select.Select>
|
|
<Select.SelectPopover
|
|
portal={portal}
|
|
store={selectProps}
|
|
className={cn(
|
|
'popover-ui',
|
|
sizeClasses,
|
|
className,
|
|
'max-h-[80vh] overflow-y-auto',
|
|
'[pointer-events:auto]', // Override body's pointer-events:none when in modal
|
|
)}
|
|
>
|
|
{options.map((item, index) => {
|
|
if (isDivider(item)) {
|
|
return <div key={`divider-${index}`} className="my-1 border-t border-border-heavy" />;
|
|
}
|
|
|
|
const option = typeof item === 'string' ? { value: item, label: item } : item;
|
|
if (!isOption(option)) {
|
|
return null;
|
|
}
|
|
|
|
return (
|
|
<Select.SelectItem
|
|
key={`option-${index}`}
|
|
value={String(option.value)}
|
|
className="select-item"
|
|
data-theme={option.value}
|
|
>
|
|
<div className="flex w-full items-center gap-2">
|
|
{option.icon != null && <span>{option.icon as React.ReactNode}</span>}
|
|
<span className="block truncate">{option.label}</span>
|
|
{selectedValue === option.value && (
|
|
<span className="ml-auto pl-2">
|
|
<svg
|
|
width="24"
|
|
height="24"
|
|
viewBox="0 0 24 24"
|
|
fill="none"
|
|
xmlns="http://www.w3.org/2000/svg"
|
|
className="icon-md block group-hover:hidden"
|
|
>
|
|
<path
|
|
fillRule="evenodd"
|
|
clipRule="evenodd"
|
|
d="M2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12ZM16.0755 7.93219C16.5272 8.25003 16.6356 8.87383 16.3178 9.32549L11.5678 16.0755C11.3931 16.3237 11.1152 16.4792 10.8123 16.4981C10.5093 16.517 10.2142 16.3973 10.0101 16.1727L7.51006 13.4227C7.13855 13.014 7.16867 12.3816 7.57733 12.0101C7.98598 11.6386 8.61843 11.6687 8.98994 12.0773L10.6504 13.9039L14.6822 8.17451C15 7.72284 15.6238 7.61436 16.0755 7.93219Z"
|
|
fill="currentColor"
|
|
/>
|
|
</svg>
|
|
</span>
|
|
)}
|
|
</div>
|
|
</Select.SelectItem>
|
|
);
|
|
})}
|
|
</Select.SelectPopover>
|
|
</div>
|
|
);
|
|
};
|
|
|
|
export default Dropdown;
|