mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-22 03:10:15 +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
197 lines
6.5 KiB
TypeScript
197 lines
6.5 KiB
TypeScript
import React, { useEffect } from 'react';
|
|
import { QueryKeys } from 'librechat-data-provider';
|
|
import { Controller, useForm } from 'react-hook-form';
|
|
import { useQueryClient } from '@tanstack/react-query';
|
|
import { Checkbox, Label, TextareaAutosize, Input, useToastContext } from '@librechat/client';
|
|
import type { TConversationTag, TConversationTagRequest } from 'librechat-data-provider';
|
|
import { useBookmarkContext } from '~/Providers/BookmarkContext';
|
|
import { useConversationTagMutation } from '~/data-provider';
|
|
import { useLocalize } from '~/hooks';
|
|
import { cn, logger } from '~/utils';
|
|
|
|
type TBookmarkFormProps = {
|
|
tags?: string[];
|
|
bookmark?: TConversationTag;
|
|
conversationId?: string;
|
|
formRef: React.RefObject<HTMLFormElement>;
|
|
setOpen: React.Dispatch<React.SetStateAction<boolean>>;
|
|
mutation: ReturnType<typeof useConversationTagMutation>;
|
|
};
|
|
const BookmarkForm = ({
|
|
tags,
|
|
bookmark,
|
|
mutation,
|
|
conversationId,
|
|
setOpen,
|
|
formRef,
|
|
}: TBookmarkFormProps) => {
|
|
const localize = useLocalize();
|
|
const queryClient = useQueryClient();
|
|
const { showToast } = useToastContext();
|
|
const { bookmarks } = useBookmarkContext();
|
|
|
|
const {
|
|
register,
|
|
handleSubmit,
|
|
setValue,
|
|
getValues,
|
|
control,
|
|
formState: { errors },
|
|
} = useForm<TConversationTagRequest>({
|
|
mode: 'onBlur',
|
|
reValidateMode: 'onChange',
|
|
defaultValues: {
|
|
tag: bookmark?.tag ?? '',
|
|
description: bookmark?.description ?? '',
|
|
conversationId: conversationId ?? '',
|
|
addToConversation: conversationId != null && conversationId ? true : false,
|
|
},
|
|
});
|
|
|
|
useEffect(() => {
|
|
if (bookmark && bookmark.tag) {
|
|
setValue('tag', bookmark.tag);
|
|
setValue('description', bookmark.description ?? '');
|
|
}
|
|
}, [bookmark, setValue]);
|
|
|
|
const onSubmit = (data: TConversationTagRequest) => {
|
|
logger.log('tag_mutation', 'BookmarkForm - onSubmit: data', data);
|
|
if (mutation.isLoading) {
|
|
return;
|
|
}
|
|
if (data.tag === bookmark?.tag && data.description === bookmark?.description) {
|
|
return;
|
|
}
|
|
if (data.tag != null && (tags ?? []).includes(data.tag)) {
|
|
showToast({
|
|
message: localize('com_ui_bookmarks_create_exists'),
|
|
status: 'warning',
|
|
});
|
|
return;
|
|
}
|
|
const allTags =
|
|
queryClient.getQueryData<TConversationTag[]>([QueryKeys.conversationTags]) ?? [];
|
|
if (allTags.some((tag) => tag.tag === data.tag && tag.tag !== bookmark?.tag)) {
|
|
showToast({
|
|
message: localize('com_ui_bookmarks_create_exists'),
|
|
status: 'warning',
|
|
});
|
|
return;
|
|
}
|
|
|
|
mutation.mutate(data);
|
|
setOpen(false);
|
|
};
|
|
|
|
return (
|
|
<form
|
|
ref={formRef}
|
|
className="mt-6"
|
|
aria-label="Bookmark form"
|
|
method="POST"
|
|
onSubmit={handleSubmit(onSubmit)}
|
|
>
|
|
<div className="flex w-full flex-col items-center gap-2">
|
|
<div className="grid w-full items-center gap-2">
|
|
<Label htmlFor="bookmark-tag" className="text-left text-sm font-medium">
|
|
{localize('com_ui_bookmarks_title')}
|
|
</Label>
|
|
<Input
|
|
type="text"
|
|
id="bookmark-tag"
|
|
aria-label={localize('com_ui_bookmarks_title')}
|
|
{...register('tag', {
|
|
required: localize('com_ui_field_required'),
|
|
maxLength: {
|
|
value: 128,
|
|
message: localize('com_ui_field_max_length', {
|
|
field: localize('com_ui_bookmarks_title'),
|
|
length: 128,
|
|
}),
|
|
},
|
|
validate: (value) => {
|
|
return (
|
|
value === bookmark?.tag ||
|
|
bookmarks.every((bookmark) => bookmark.tag !== value) ||
|
|
localize('com_ui_bookmarks_tag_exists')
|
|
);
|
|
},
|
|
})}
|
|
aria-invalid={!!errors.tag}
|
|
placeholder={
|
|
bookmark ? localize('com_ui_bookmarks_edit') : localize('com_ui_bookmarks_new')
|
|
}
|
|
aria-describedby={errors.tag ? 'bookmark-tag-error' : undefined}
|
|
/>
|
|
{errors.tag && (
|
|
<span id="bookmark-tag-error" role="alert" className="text-sm font-bold text-red-500">
|
|
{errors.tag.message}
|
|
</span>
|
|
)}
|
|
</div>
|
|
|
|
<div className="mt-4 grid w-full items-center gap-2">
|
|
<Label
|
|
id="bookmark-description-label"
|
|
htmlFor="bookmark-description"
|
|
className="text-left text-sm font-medium"
|
|
>
|
|
{localize('com_ui_bookmarks_description')}
|
|
</Label>
|
|
<TextareaAutosize
|
|
{...register('description', {
|
|
maxLength: {
|
|
value: 1048,
|
|
message: localize('com_ui_field_max_length', {
|
|
field: localize('com_ui_bookmarks_description'),
|
|
length: 1048,
|
|
}),
|
|
},
|
|
})}
|
|
id="bookmark-description"
|
|
disabled={false}
|
|
className={cn(
|
|
'flex h-10 max-h-[250px] min-h-[100px] w-full resize-none rounded-lg border border-input bg-transparent px-3 py-2 text-sm ring-offset-background focus-visible:outline-none',
|
|
)}
|
|
aria-labelledby="bookmark-description-label"
|
|
/>
|
|
</div>
|
|
{conversationId != null && conversationId && (
|
|
<div className="mt-2 flex w-full items-center">
|
|
<Controller
|
|
name="addToConversation"
|
|
control={control}
|
|
render={({ field }) => (
|
|
<Checkbox
|
|
{...field}
|
|
checked={field.value}
|
|
onCheckedChange={field.onChange}
|
|
className="relative float-left mr-2 inline-flex h-4 w-4 cursor-pointer"
|
|
value={field.value?.toString()}
|
|
aria-label={localize('com_ui_bookmarks_add_to_conversation')}
|
|
/>
|
|
)}
|
|
/>
|
|
<button
|
|
type="button"
|
|
aria-label={localize('com_ui_bookmarks_add_to_conversation')}
|
|
className="form-check-label w-full cursor-pointer text-text-primary"
|
|
onClick={() =>
|
|
setValue('addToConversation', !(getValues('addToConversation') ?? false), {
|
|
shouldDirty: true,
|
|
})
|
|
}
|
|
>
|
|
<div className="flex select-none items-center">
|
|
{localize('com_ui_bookmarks_add_to_conversation')}
|
|
</div>
|
|
</button>
|
|
</div>
|
|
)}
|
|
</div>
|
|
</form>
|
|
);
|
|
};
|
|
|
|
export default BookmarkForm;
|