mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-01-01 08:08:49 +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
334 lines
11 KiB
TypeScript
334 lines
11 KiB
TypeScript
import { useState, useCallback, useMemo } from 'react';
|
|
import { ArrowUpLeft } from 'lucide-react';
|
|
import { useSetRecoilState } from 'recoil';
|
|
import {
|
|
Button,
|
|
Input,
|
|
Table,
|
|
TableBody,
|
|
TableCell,
|
|
TableHead,
|
|
TableHeader,
|
|
TableRow,
|
|
useToastContext,
|
|
} from '@librechat/client';
|
|
import {
|
|
flexRender,
|
|
getCoreRowModel,
|
|
getFilteredRowModel,
|
|
getPaginationRowModel,
|
|
getSortedRowModel,
|
|
useReactTable,
|
|
type ColumnDef,
|
|
type SortingState,
|
|
type VisibilityState,
|
|
type ColumnFiltersState,
|
|
} from '@tanstack/react-table';
|
|
import {
|
|
fileConfig as defaultFileConfig,
|
|
checkOpenAIStorage,
|
|
mergeFileConfig,
|
|
megabyte,
|
|
isAssistantsEndpoint,
|
|
getEndpointFileConfig,
|
|
type TFile,
|
|
} from 'librechat-data-provider';
|
|
import { useFileMapContext, useChatContext } from '~/Providers';
|
|
import { useLocalize, useUpdateFiles } from '~/hooks';
|
|
import { useGetFileConfig } from '~/data-provider';
|
|
import store from '~/store';
|
|
|
|
interface DataTableProps<TData, TValue> {
|
|
columns: ColumnDef<TData, TValue>[];
|
|
data: TData[];
|
|
}
|
|
|
|
export default function DataTable<TData, TValue>({ columns, data }: DataTableProps<TData, TValue>) {
|
|
const localize = useLocalize();
|
|
const [sorting, setSorting] = useState<SortingState>([]);
|
|
const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([]);
|
|
const [columnVisibility, setColumnVisibility] = useState<VisibilityState>({});
|
|
const [{ pageIndex, pageSize }, setPagination] = useState({ pageIndex: 0, pageSize: 10 });
|
|
const setShowFiles = useSetRecoilState(store.showFiles);
|
|
|
|
const pagination = useMemo(
|
|
() => ({
|
|
pageIndex,
|
|
pageSize,
|
|
}),
|
|
[pageIndex, pageSize],
|
|
);
|
|
|
|
const table = useReactTable({
|
|
data,
|
|
columns,
|
|
state: {
|
|
sorting,
|
|
columnFilters,
|
|
columnVisibility,
|
|
pagination,
|
|
},
|
|
onSortingChange: setSorting,
|
|
onPaginationChange: setPagination,
|
|
getCoreRowModel: getCoreRowModel(),
|
|
getSortedRowModel: getSortedRowModel(),
|
|
onColumnFiltersChange: setColumnFilters,
|
|
getFilteredRowModel: getFilteredRowModel(),
|
|
onColumnVisibilityChange: setColumnVisibility,
|
|
getPaginationRowModel: getPaginationRowModel(),
|
|
defaultColumn: {
|
|
minSize: 0,
|
|
size: 10,
|
|
maxSize: 10,
|
|
enableResizing: true,
|
|
},
|
|
});
|
|
|
|
const fileMap = useFileMapContext();
|
|
const { showToast } = useToastContext();
|
|
const { setFiles, conversation } = useChatContext();
|
|
const { data: fileConfig = null } = useGetFileConfig({
|
|
select: (data) => mergeFileConfig(data),
|
|
});
|
|
const { addFile } = useUpdateFiles(setFiles);
|
|
|
|
const handleFileClick = useCallback(
|
|
(file: TFile) => {
|
|
if (!fileMap?.[file.file_id] || !conversation?.endpoint) {
|
|
showToast({
|
|
message: localize('com_ui_attach_error'),
|
|
status: 'error',
|
|
});
|
|
return;
|
|
}
|
|
|
|
const fileData = fileMap[file.file_id];
|
|
const endpoint = conversation.endpoint;
|
|
const endpointType = conversation.endpointType;
|
|
|
|
if (!fileData.source) {
|
|
return;
|
|
}
|
|
|
|
const isOpenAIStorage = checkOpenAIStorage(fileData.source);
|
|
const isAssistants = isAssistantsEndpoint(endpoint);
|
|
|
|
if (isOpenAIStorage && !isAssistants) {
|
|
showToast({
|
|
message: localize('com_ui_attach_error_openai'),
|
|
status: 'error',
|
|
});
|
|
return;
|
|
}
|
|
|
|
if (!isOpenAIStorage && isAssistants) {
|
|
showToast({
|
|
message: localize('com_ui_attach_warn_endpoint'),
|
|
status: 'warning',
|
|
});
|
|
}
|
|
|
|
const endpointFileConfig = getEndpointFileConfig({
|
|
fileConfig,
|
|
endpoint,
|
|
endpointType,
|
|
});
|
|
|
|
if (endpointFileConfig.disabled === true) {
|
|
showToast({
|
|
message: localize('com_ui_attach_error_disabled'),
|
|
status: 'error',
|
|
});
|
|
return;
|
|
}
|
|
|
|
if (fileData.bytes > (endpointFileConfig.fileSizeLimit ?? Number.MAX_SAFE_INTEGER)) {
|
|
showToast({
|
|
message: `${localize('com_ui_attach_error_size')} ${
|
|
(endpointFileConfig.fileSizeLimit ?? 0) / megabyte
|
|
} MB (${endpoint})`,
|
|
status: 'error',
|
|
});
|
|
return;
|
|
}
|
|
|
|
if (!defaultFileConfig.checkType(file.type, endpointFileConfig.supportedMimeTypes ?? [])) {
|
|
showToast({
|
|
message: `${localize('com_ui_attach_error_type')} ${file.type} (${endpoint})`,
|
|
status: 'error',
|
|
});
|
|
return;
|
|
}
|
|
|
|
addFile({
|
|
progress: 1,
|
|
attached: true,
|
|
file_id: fileData.file_id,
|
|
filepath: fileData.filepath,
|
|
preview: fileData.filepath,
|
|
type: fileData.type,
|
|
height: fileData.height,
|
|
width: fileData.width,
|
|
filename: fileData.filename,
|
|
source: fileData.source,
|
|
size: fileData.bytes,
|
|
metadata: fileData.metadata,
|
|
});
|
|
},
|
|
[addFile, fileMap, conversation, localize, showToast, fileConfig],
|
|
);
|
|
|
|
const filenameFilter = table.getColumn('filename')?.getFilterValue() as string;
|
|
|
|
return (
|
|
<div role="region" aria-label={localize('com_files_table')} className="mt-2 space-y-2">
|
|
<div className="relative flex items-center gap-4">
|
|
<Input
|
|
id="filename-filter"
|
|
placeholder=" "
|
|
value={filenameFilter ?? ''}
|
|
onChange={(event) => table.getColumn('filename')?.setFilterValue(event.target.value)}
|
|
aria-label={localize('com_files_filter')}
|
|
className="peer"
|
|
/>
|
|
<label
|
|
htmlFor="filename-filter"
|
|
className="pointer-events-none absolute left-3 top-1/2 -translate-y-1/2 text-sm text-text-secondary transition-all duration-200 peer-focus:top-0 peer-focus:bg-background peer-focus:px-1 peer-focus:text-xs peer-[:not(:placeholder-shown)]:top-0 peer-[:not(:placeholder-shown)]:bg-background peer-[:not(:placeholder-shown)]:px-1 peer-[:not(:placeholder-shown)]:text-xs"
|
|
>
|
|
{localize('com_files_filter')}
|
|
</label>
|
|
</div>
|
|
|
|
<div className="rounded-lg border border-border-light bg-transparent shadow-sm transition-colors">
|
|
<div className="overflow-x-auto">
|
|
<Table>
|
|
<TableHeader>
|
|
{table.getHeaderGroups().map((headerGroup) => (
|
|
<TableRow key={headerGroup.id} className="border-b border-border-light">
|
|
{headerGroup.headers.map((header, index) => (
|
|
<TableHead
|
|
key={header.id}
|
|
style={{ width: index === 0 ? '75%' : '25%' }}
|
|
className="bg-surface-secondary py-3 text-left text-sm font-medium text-text-secondary"
|
|
>
|
|
<div className="px-4">
|
|
{header.isPlaceholder
|
|
? null
|
|
: flexRender(header.column.columnDef.header, header.getContext())}
|
|
</div>
|
|
</TableHead>
|
|
))}
|
|
</TableRow>
|
|
))}
|
|
</TableHeader>
|
|
<TableBody>
|
|
{table.getRowModel().rows.length ? (
|
|
table.getRowModel().rows.map((row) => (
|
|
<TableRow
|
|
key={row.id}
|
|
data-state={row.getIsSelected() && 'selected'}
|
|
className="border-b border-border-light transition-colors hover:bg-surface-secondary [&:last-child]:border-0"
|
|
>
|
|
{row.getVisibleCells().map((cell) => {
|
|
const isFilenameCell = cell.column.id === 'filename';
|
|
|
|
return (
|
|
<TableCell
|
|
style={{
|
|
width: '150px',
|
|
maxWidth: '150px',
|
|
overflow: 'hidden',
|
|
textOverflow: 'ellipsis',
|
|
whiteSpace: 'nowrap',
|
|
}}
|
|
data-skip-refocus="true"
|
|
key={cell.id}
|
|
role={isFilenameCell ? 'button' : undefined}
|
|
tabIndex={isFilenameCell ? 0 : undefined}
|
|
onClick={(e) => {
|
|
if (isFilenameCell) {
|
|
const clickedElement = e.target as HTMLElement;
|
|
// Check if clicked element is within cell and not a button/link
|
|
if (
|
|
clickedElement.closest('td') &&
|
|
!clickedElement.closest('button, a')
|
|
) {
|
|
e.preventDefault();
|
|
e.stopPropagation();
|
|
handleFileClick(row.original as TFile);
|
|
}
|
|
}
|
|
}}
|
|
onKeyDown={(e) => {
|
|
if (isFilenameCell && (e.key === 'Enter' || e.key === ' ')) {
|
|
const clickedElement = e.target as HTMLElement;
|
|
if (
|
|
clickedElement.closest('td') &&
|
|
!clickedElement.closest('button, a')
|
|
) {
|
|
e.preventDefault();
|
|
e.stopPropagation();
|
|
handleFileClick(row.original as TFile);
|
|
}
|
|
}
|
|
}}
|
|
>
|
|
{flexRender(cell.column.columnDef.cell, cell.getContext())}
|
|
</TableCell>
|
|
);
|
|
})}
|
|
</TableRow>
|
|
))
|
|
) : (
|
|
<TableRow>
|
|
<TableCell
|
|
colSpan={columns.length}
|
|
className="h-24 text-center text-sm text-text-secondary"
|
|
>
|
|
{localize('com_files_no_results')}
|
|
</TableCell>
|
|
</TableRow>
|
|
)}
|
|
</TableBody>
|
|
</Table>
|
|
</div>
|
|
</div>
|
|
|
|
<div className="flex items-center justify-between">
|
|
<Button
|
|
variant="outline"
|
|
size="sm"
|
|
onClick={() => setShowFiles(true)}
|
|
aria-label={localize('com_sidepanel_manage_files')}
|
|
>
|
|
<ArrowUpLeft className="h-4 w-4" aria-hidden="true" />
|
|
<span className="ml-2">{localize('com_sidepanel_manage_files')}</span>
|
|
</Button>
|
|
|
|
<div className="flex items-center gap-2" role="navigation" aria-label="Pagination">
|
|
<Button
|
|
variant="outline"
|
|
size="sm"
|
|
onClick={() => table.previousPage()}
|
|
disabled={!table.getCanPreviousPage()}
|
|
aria-label={localize('com_ui_prev')}
|
|
>
|
|
{localize('com_ui_prev')}
|
|
</Button>
|
|
<div aria-live="polite" className="text-sm">
|
|
{`${pageIndex + 1} / ${table.getPageCount()}`}
|
|
</div>
|
|
<Button
|
|
variant="outline"
|
|
size="sm"
|
|
onClick={() => table.nextPage()}
|
|
disabled={!table.getCanNextPage()}
|
|
aria-label={localize('com_ui_next')}
|
|
>
|
|
{localize('com_ui_next')}
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|