mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-21 10:50:14 +01:00
* feat: add light/dark differentiation on text color for login footer links for more accessible contrast in light mode * feat: add darker color focus ring on ThemeSelector in light mode for more accessible contrast * feat: increase contrast on text color for rendered error messages in light and dark mode so that they pass the 4.5:1 accessibility contrast threshold against their backgrounds * feat: add more accessible color vars to style.css for better contrast against light/dark backgrounds * feat: un-nest DropdownMenu from ListCard and make them siblings instead for better accessibility * feat: tweak --border-heavy in light mode so that it uses --gray-410 rather than --gray-400 so that the contrast ratio threshold is hit for accessibility * feat: switch email and password input border to border-heavy for more accessible contrast on Login page * fix: add proper focus ring for Action menu button in Prompts Sidenav * fix: align light and dark focus rings with surrounding elements on preview/edit menu dropdown button in Prompt Card * fix: remove aria-hidden on parent div with focusable child element according to accessibility guidelines * fix: add missing aria-readonly false property that should have been in previous accessibility PR * feat: add horizontal padding on rowRenderer's CellMeasurer div so that focus ring on rows doesnt clip behind virtualized table borders side-to-side (still need to figure out vertical clipping on final row / a better solution to be able to get overflows to work properly within the virtualized table) * feat: remove render prop override so that Share and Delete Buttons in Conversation dropdown can be pressed with Enter keystroke * fix: undo additional colors and changes to --surface-hover the initial changes came from a misunderstanding of contrast threshold requirements for hover effect accessibility * feat: better layout for non-nested prompt card / action menu combination * fix: add proper focus restoration behavior for Preview modal on close * fix: undo change to --border-heavy in light mode * fix: set borders for login input boxes back to light * feat: add announcement for state change when link copied to clipboard in conversation share modal * feat: add announcement to Refresh Link button * feat: add announcement for archiving chats * feat: make date sections in conversation history list <h2> rather than generic <div> for improved screen reader support * feat: ensure Share Link modal is accessible at high zoom percentage and low viewport width / height requirements by adding max height and overflow attributes to allow scrolling * feat: bold toast text so that it hits font size accessibility threshold (above 14 px when bolded - change makes text 16 px bold) so that the more disruptive contrast change of the toast background color is no longer necessary. The background color would need to achieve a 4.5:1 contrast ratio, which would significantly affect the established aesthetic of the current toast system if achieved. * fix: do not render side nav when it is hidden to avoid keyboard navigation with screen reader * fix: add side nav button state change announcements and don't render components that were previosuly reachable via keyboard navigation while in the side nav * feat: add tooltip anchor for Model Select * fix: only hide the model selector, export, and temp chat buttons when in mobile view and the sidenav is expanded * feat: add aria-haspopup support for MenuItems and add aria-haspopup: 'dialog' for Share and Delete buttons in ConvoOptions * feat: add label for DataTable search so that it does not rely on placeholder attribute for function identification * feat: make X buttons on dialogs 24x24px to achieve AA compliance * feat: add announcements for the search bar for model selector * feat: persistent label for DataTable * feat: make filter files text contrast compliant * feat: add non-color visual indicator to AudioRecorder listening state * feat: add aria-expanded attribute to tool call dropdown for screen reader * feat: add high contrast and rounded outlines for focus indicators on Run Code and Copy Code buttons for code blocks * fix: change Button to anchor tag in Shared Links component when linking to original conversation * fix: allow overflow in datatable cells so that focus indicators dont get cut off * feat: round out focus outline for link name in SharedLinks modal * feat: add aria-controls and aria-haspopup: "dialog" to SharedLinks delete button and modal * feat: add aria-controls for dropdown menu items on ConvoOptions for share and delete modals * feat: add trigger ref to 2FA button and modal in settings menu so focus returns to button on modal close * feat: add refs so that open sidebar and close sidebar buttons transfer focus to one another * chore: formatting * feat: make sure settings modal is accessible at 200% zoom for screen size 1366x768 viewport * feat: round out focus outline for link names in archived chats modal * feat: add result announcements for screen reader in DataTable search * feat: simplify layout for checkbox / api key components for better accessibility * feat: return focus to chat input on prompt variables modal close * feat: add persistent labels to TextareaAutosize Inputs in Variable form * feat: tighten max width so side scrolling not necessary at 400% zoom for VariableForm modal * feat: add persistent labels to prompt management page * feat: announce results found for search bars in prompts page and improve them in datatable * feat: de-nest DashGroupItem buttons in Prompts page to allow better navigation and comply with accessibility standard * feat: add heading for new prompt creation page for screen readers * feat: remove non-compliant description truncation for small screen sizes by making labels static on small enough viewport width * feat: add mobile view sidebar for prompts page * feat: add bolded text on select for AdvancedSwitch so that there is a visual indicator of selection and it does not rely solely on color as an indication of state * feat: add persistent labels to ModelSelector search inputs * feat: align aria-label with visual label for speech recognition users * feat: make MemoryCreateDialog accessible at 400% zoom (introduce max viewport height attr and make scrollable) * feat: add persistent label to Filter input for DataTable in file attach sidebar menu * feat: add persistent label for bookmark filter input in bookmarks sidebar menu * feat: add alert for screen readers for invalid inputs when editting bookmarks * feat: bold font in BookmarkForm error readout to pass contrast compliance thresholds for 14pt text * feat: align aria-label with visual label for BookmarkForm Ttile input * feat: add 400% zoom support for ALL modals utilizing OriginalDialog to prevent clipping * feat: remove state change on aria label and give consistent labelling for button, offload state change notification to the announcement div and make more assertive * feat: add aria-labels which convey that the buttons are sortable (divergence from visual text because iconography is used to signify sort functionality) * feat: add supplemental visuals to indicate link is clickable other than color in SharedLinks * feat: increase saturation to hit contrast threshold minimums on Link color in SharedLinks * feat: stop DataTable from disappearing at 400% zoom in SharedLinks * feat: increase contrast to hit contrast threshold minimums on Animated Search Input visual indicators * feat: add aria-label for AnimatedSearchInput (doesn't require explicit labelling because of Search icon) * fix: stop long example variable declaration from clipping at high zoom in variables info * feat: add aria-label to bettter describe sort button functionality for vision impaired users * chore: remove unused translation key * chore: address ESLint comments * fix: modify test to account for new alert on theme toggle switch for login page * chore: interpolate translation key
258 lines
7.9 KiB
TypeScript
258 lines
7.9 KiB
TypeScript
import { useState, useRef, useEffect, useMemo, memo, useCallback } from 'react';
|
|
import { AutoSizer, List } from 'react-virtualized';
|
|
import { Spinner, useCombobox } from '@librechat/client';
|
|
import { useSetRecoilState, useRecoilValue } from 'recoil';
|
|
import type { TPromptGroup } from 'librechat-data-provider';
|
|
import type { PromptOption } from '~/common';
|
|
import { removeCharIfLast, detectVariables } from '~/utils';
|
|
import VariableDialog from '~/components/Prompts/Groups/VariableDialog';
|
|
import { usePromptGroupsContext } from '~/Providers';
|
|
import MentionItem from './MentionItem';
|
|
import { useLocalize } from '~/hooks';
|
|
import store from '~/store';
|
|
|
|
const commandChar = '/';
|
|
|
|
const PopoverContainer = memo(
|
|
({
|
|
index,
|
|
children,
|
|
isVariableDialogOpen,
|
|
variableGroup,
|
|
setVariableDialogOpen,
|
|
textAreaRef,
|
|
}: {
|
|
index: number;
|
|
children: React.ReactNode;
|
|
isVariableDialogOpen: boolean;
|
|
variableGroup: TPromptGroup | null;
|
|
setVariableDialogOpen: (isOpen: boolean) => void;
|
|
textAreaRef: React.MutableRefObject<HTMLTextAreaElement | null>;
|
|
}) => {
|
|
const showPromptsPopover = useRecoilValue(store.showPromptsPopoverFamily(index));
|
|
return (
|
|
<>
|
|
{showPromptsPopover ? children : null}
|
|
<VariableDialog
|
|
open={isVariableDialogOpen}
|
|
onClose={() => {
|
|
setVariableDialogOpen(false);
|
|
requestAnimationFrame(() => {
|
|
textAreaRef.current?.focus();
|
|
});
|
|
}}
|
|
group={variableGroup}
|
|
/>
|
|
</>
|
|
);
|
|
},
|
|
);
|
|
|
|
const ROW_HEIGHT = 40;
|
|
|
|
function PromptsCommand({
|
|
index,
|
|
textAreaRef,
|
|
submitPrompt,
|
|
}: {
|
|
index: number;
|
|
textAreaRef: React.MutableRefObject<HTMLTextAreaElement | null>;
|
|
submitPrompt: (textPrompt: string) => void;
|
|
}) {
|
|
const localize = useLocalize();
|
|
const { allPromptGroups, hasAccess } = usePromptGroupsContext();
|
|
const { data, isLoading } = allPromptGroups;
|
|
|
|
const [activeIndex, setActiveIndex] = useState(0);
|
|
const timeoutRef = useRef<NodeJS.Timeout | null>(null);
|
|
const inputRef = useRef<HTMLInputElement | null>(null);
|
|
const [isVariableDialogOpen, setVariableDialogOpen] = useState(false);
|
|
const [variableGroup, setVariableGroup] = useState<TPromptGroup | null>(null);
|
|
const setShowPromptsPopover = useSetRecoilState(store.showPromptsPopoverFamily(index));
|
|
|
|
const prompts = useMemo(() => data?.promptGroups, [data]);
|
|
const promptsMap = useMemo(() => data?.promptsMap, [data]);
|
|
|
|
const { open, setOpen, searchValue, setSearchValue, matches } = useCombobox({
|
|
value: '',
|
|
options: prompts ?? [],
|
|
});
|
|
|
|
const handleSelect = useCallback(
|
|
(mention?: PromptOption, e?: React.KeyboardEvent<HTMLInputElement>) => {
|
|
if (!mention) {
|
|
return;
|
|
}
|
|
|
|
setSearchValue('');
|
|
setOpen(false);
|
|
setShowPromptsPopover(false);
|
|
|
|
if (textAreaRef.current) {
|
|
removeCharIfLast(textAreaRef.current, commandChar);
|
|
}
|
|
|
|
const group = promptsMap?.[mention.id];
|
|
if (!group) {
|
|
return;
|
|
}
|
|
|
|
const hasVariables = detectVariables(group.productionPrompt?.prompt ?? '');
|
|
if (hasVariables) {
|
|
if (e && e.key === 'Tab') {
|
|
e.preventDefault();
|
|
}
|
|
setVariableGroup(group);
|
|
setVariableDialogOpen(true);
|
|
return;
|
|
} else {
|
|
submitPrompt(group.productionPrompt?.prompt ?? '');
|
|
}
|
|
},
|
|
[setSearchValue, setOpen, setShowPromptsPopover, textAreaRef, promptsMap, submitPrompt],
|
|
);
|
|
|
|
useEffect(() => {
|
|
if (!open) {
|
|
setActiveIndex(0);
|
|
} else {
|
|
setVariableGroup(null);
|
|
}
|
|
}, [open]);
|
|
|
|
useEffect(() => {
|
|
return () => {
|
|
if (timeoutRef.current) {
|
|
clearTimeout(timeoutRef.current);
|
|
}
|
|
};
|
|
}, []);
|
|
|
|
useEffect(() => {
|
|
const currentActiveItem = document.getElementById(`prompt-item-${activeIndex}`);
|
|
currentActiveItem?.scrollIntoView({ behavior: 'instant', block: 'nearest' });
|
|
}, [activeIndex]);
|
|
|
|
if (!hasAccess) {
|
|
return null;
|
|
}
|
|
|
|
const rowRenderer = ({
|
|
index,
|
|
key,
|
|
style,
|
|
}: {
|
|
index: number;
|
|
key: string;
|
|
style: React.CSSProperties;
|
|
}) => {
|
|
const mention = matches[index] as PromptOption;
|
|
return (
|
|
<MentionItem
|
|
index={index}
|
|
type="prompt"
|
|
key={key}
|
|
style={style}
|
|
onClick={() => {
|
|
if (timeoutRef.current) {
|
|
clearTimeout(timeoutRef.current);
|
|
}
|
|
timeoutRef.current = null;
|
|
handleSelect(mention);
|
|
}}
|
|
name={mention.label ?? ''}
|
|
icon={mention.icon}
|
|
description={mention.description}
|
|
isActive={index === activeIndex}
|
|
/>
|
|
);
|
|
};
|
|
|
|
return (
|
|
<PopoverContainer
|
|
index={index}
|
|
isVariableDialogOpen={isVariableDialogOpen}
|
|
variableGroup={variableGroup}
|
|
setVariableDialogOpen={setVariableDialogOpen}
|
|
textAreaRef={textAreaRef}
|
|
>
|
|
<div className="absolute bottom-28 z-10 w-full space-y-2">
|
|
<div className="popover border-token-border-light rounded-2xl border bg-surface-tertiary-alt p-2 shadow-lg">
|
|
<input
|
|
// The user expects focus to transition to the input field when the popover is opened
|
|
// eslint-disable-next-line jsx-a11y/no-autofocus
|
|
autoFocus
|
|
ref={inputRef}
|
|
placeholder={localize('com_ui_command_usage_placeholder')}
|
|
className="mb-1 w-full border-0 bg-surface-tertiary-alt p-2 text-sm focus:outline-none dark:text-gray-200"
|
|
autoComplete="off"
|
|
value={searchValue}
|
|
onKeyDown={(e) => {
|
|
if (e.key === 'Escape') {
|
|
setOpen(false);
|
|
setShowPromptsPopover(false);
|
|
textAreaRef.current?.focus();
|
|
}
|
|
if (e.key === 'ArrowDown') {
|
|
setActiveIndex((prevIndex) => (prevIndex + 1) % matches.length);
|
|
} else if (e.key === 'ArrowUp') {
|
|
setActiveIndex((prevIndex) => (prevIndex - 1 + matches.length) % matches.length);
|
|
} else if (e.key === 'Enter' || e.key === 'Tab') {
|
|
if (e.key === 'Enter') {
|
|
e.preventDefault();
|
|
}
|
|
handleSelect(matches[activeIndex] as PromptOption | undefined, e);
|
|
} else if (e.key === 'Backspace' && searchValue === '') {
|
|
setOpen(false);
|
|
setShowPromptsPopover(false);
|
|
textAreaRef.current?.focus();
|
|
}
|
|
}}
|
|
onChange={(e) => setSearchValue(e.target.value)}
|
|
onFocus={() => setOpen(true)}
|
|
onBlur={() => {
|
|
timeoutRef.current = setTimeout(() => {
|
|
setOpen(false);
|
|
setShowPromptsPopover(false);
|
|
}, 150);
|
|
}}
|
|
/>
|
|
<div className="max-h-40 overflow-y-auto">
|
|
{(() => {
|
|
if (isLoading && open) {
|
|
return (
|
|
<div className="flex h-32 items-center justify-center text-text-primary">
|
|
<Spinner />
|
|
</div>
|
|
);
|
|
}
|
|
|
|
if (!isLoading && open) {
|
|
return (
|
|
<div className="max-h-40">
|
|
<AutoSizer disableHeight>
|
|
{({ width }) => (
|
|
<List
|
|
width={width}
|
|
overscanRowCount={5}
|
|
rowHeight={ROW_HEIGHT}
|
|
rowCount={matches.length}
|
|
rowRenderer={rowRenderer}
|
|
scrollToIndex={activeIndex}
|
|
height={Math.min(matches.length * ROW_HEIGHT, 160)}
|
|
/>
|
|
)}
|
|
</AutoSizer>
|
|
</div>
|
|
);
|
|
}
|
|
return null;
|
|
})()}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</PopoverContainer>
|
|
);
|
|
}
|
|
|
|
export default memo(PromptsCommand);
|