mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-21 19:00:13 +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
257 lines
8.4 KiB
TypeScript
257 lines
8.4 KiB
TypeScript
import { useCallback, useEffect, useState, useMemo, memo, lazy, Suspense, useRef } from 'react';
|
|
import { useRecoilValue } from 'recoil';
|
|
import { AnimatePresence, motion } from 'framer-motion';
|
|
import { useMediaQuery } from '@librechat/client';
|
|
import { PermissionTypes, Permissions } from 'librechat-data-provider';
|
|
import type { ConversationListResponse } from 'librechat-data-provider';
|
|
import type { InfiniteQueryObserverResult } from '@tanstack/react-query';
|
|
import {
|
|
useLocalize,
|
|
useHasAccess,
|
|
useAuthContext,
|
|
useLocalStorage,
|
|
useNavScrolling,
|
|
} from '~/hooks';
|
|
import { useConversationsInfiniteQuery } from '~/data-provider';
|
|
import { Conversations } from '~/components/Conversations';
|
|
import SearchBar from './SearchBar';
|
|
import NewChat from './NewChat';
|
|
import { cn } from '~/utils';
|
|
import store from '~/store';
|
|
|
|
const BookmarkNav = lazy(() => import('./Bookmarks/BookmarkNav'));
|
|
const AccountSettings = lazy(() => import('./AccountSettings'));
|
|
const AgentMarketplaceButton = lazy(() => import('./AgentMarketplaceButton'));
|
|
|
|
const NAV_WIDTH_DESKTOP = '260px';
|
|
const NAV_WIDTH_MOBILE = '320px';
|
|
|
|
const NavMask = memo(
|
|
({ navVisible, toggleNavVisible }: { navVisible: boolean; toggleNavVisible: () => void }) => (
|
|
<div
|
|
id="mobile-nav-mask-toggle"
|
|
role="button"
|
|
tabIndex={0}
|
|
className={`nav-mask transition-opacity duration-200 ease-in-out ${navVisible ? 'active opacity-100' : 'opacity-0'}`}
|
|
onClick={toggleNavVisible}
|
|
onKeyDown={(e) => {
|
|
if (e.key === 'Enter' || e.key === ' ') {
|
|
toggleNavVisible();
|
|
}
|
|
}}
|
|
aria-label="Toggle navigation"
|
|
/>
|
|
),
|
|
);
|
|
|
|
const MemoNewChat = memo(NewChat);
|
|
|
|
const Nav = memo(
|
|
({
|
|
navVisible,
|
|
setNavVisible,
|
|
openSidebarRef,
|
|
closeSidebarRef,
|
|
}: {
|
|
navVisible: boolean;
|
|
setNavVisible: React.Dispatch<React.SetStateAction<boolean>>;
|
|
openSidebarRef?: React.RefObject<HTMLButtonElement>;
|
|
closeSidebarRef?: React.RefObject<HTMLButtonElement>;
|
|
}) => {
|
|
const localize = useLocalize();
|
|
const { isAuthenticated } = useAuthContext();
|
|
|
|
const [navWidth, setNavWidth] = useState(NAV_WIDTH_DESKTOP);
|
|
const isSmallScreen = useMediaQuery('(max-width: 768px)');
|
|
const [newUser, setNewUser] = useLocalStorage('newUser', true);
|
|
const [showLoading, setShowLoading] = useState(false);
|
|
const [tags, setTags] = useState<string[]>([]);
|
|
|
|
const hasAccessToBookmarks = useHasAccess({
|
|
permissionType: PermissionTypes.BOOKMARKS,
|
|
permission: Permissions.USE,
|
|
});
|
|
|
|
const search = useRecoilValue(store.search);
|
|
|
|
const { data, fetchNextPage, isFetchingNextPage, isLoading, isFetching, refetch } =
|
|
useConversationsInfiniteQuery(
|
|
{
|
|
tags: tags.length === 0 ? undefined : tags,
|
|
search: search.debouncedQuery || undefined,
|
|
},
|
|
{
|
|
enabled: isAuthenticated,
|
|
staleTime: 30000,
|
|
cacheTime: 300000,
|
|
},
|
|
);
|
|
|
|
const computedHasNextPage = useMemo(() => {
|
|
if (data?.pages && data.pages.length > 0) {
|
|
const lastPage: ConversationListResponse = data.pages[data.pages.length - 1];
|
|
return lastPage.nextCursor !== null;
|
|
}
|
|
return false;
|
|
}, [data?.pages]);
|
|
|
|
const outerContainerRef = useRef<HTMLDivElement>(null);
|
|
const listRef = useRef<any>(null);
|
|
|
|
const { moveToTop } = useNavScrolling<ConversationListResponse>({
|
|
setShowLoading,
|
|
fetchNextPage: async (options?) => {
|
|
if (computedHasNextPage) {
|
|
return fetchNextPage(options);
|
|
}
|
|
return Promise.resolve(
|
|
{} as InfiniteQueryObserverResult<ConversationListResponse, unknown>,
|
|
);
|
|
},
|
|
isFetchingNext: isFetchingNextPage,
|
|
});
|
|
|
|
const conversations = useMemo(() => {
|
|
return data ? data.pages.flatMap((page) => page.conversations) : [];
|
|
}, [data]);
|
|
|
|
const toggleNavVisible = useCallback(() => {
|
|
setNavVisible((prev: boolean) => {
|
|
localStorage.setItem('navVisible', JSON.stringify(!prev));
|
|
return !prev;
|
|
});
|
|
if (newUser) {
|
|
setNewUser(false);
|
|
}
|
|
}, [newUser, setNavVisible, setNewUser]);
|
|
|
|
const itemToggleNav = useCallback(() => {
|
|
if (isSmallScreen) {
|
|
toggleNavVisible();
|
|
}
|
|
}, [isSmallScreen, toggleNavVisible]);
|
|
|
|
useEffect(() => {
|
|
if (isSmallScreen) {
|
|
const savedNavVisible = localStorage.getItem('navVisible');
|
|
if (savedNavVisible === null) {
|
|
toggleNavVisible();
|
|
}
|
|
setNavWidth(NAV_WIDTH_MOBILE);
|
|
} else {
|
|
setNavWidth(NAV_WIDTH_DESKTOP);
|
|
}
|
|
}, [isSmallScreen, toggleNavVisible]);
|
|
|
|
useEffect(() => {
|
|
refetch();
|
|
}, [tags, refetch]);
|
|
|
|
const loadMoreConversations = useCallback(() => {
|
|
if (isFetchingNextPage || !computedHasNextPage) {
|
|
return;
|
|
}
|
|
|
|
fetchNextPage();
|
|
}, [isFetchingNextPage, computedHasNextPage, fetchNextPage]);
|
|
|
|
const subHeaders = useMemo(
|
|
() => search.enabled === true && <SearchBar isSmallScreen={isSmallScreen} />,
|
|
[search.enabled, isSmallScreen],
|
|
);
|
|
|
|
const headerButtons = useMemo(
|
|
() => (
|
|
<>
|
|
<Suspense fallback={null}>
|
|
<AgentMarketplaceButton isSmallScreen={isSmallScreen} toggleNav={toggleNavVisible} />
|
|
</Suspense>
|
|
{hasAccessToBookmarks && (
|
|
<>
|
|
<div className="mt-1.5" />
|
|
<Suspense fallback={null}>
|
|
<BookmarkNav tags={tags} setTags={setTags} isSmallScreen={isSmallScreen} />
|
|
</Suspense>
|
|
</>
|
|
)}
|
|
</>
|
|
),
|
|
[hasAccessToBookmarks, tags, isSmallScreen, toggleNavVisible],
|
|
);
|
|
|
|
const [isSearchLoading, setIsSearchLoading] = useState(
|
|
!!search.query && (search.isTyping || isLoading || isFetching),
|
|
);
|
|
|
|
useEffect(() => {
|
|
if (search.isTyping) {
|
|
setIsSearchLoading(true);
|
|
} else if (!isLoading && !isFetching) {
|
|
setIsSearchLoading(false);
|
|
} else if (!!search.query && (isLoading || isFetching)) {
|
|
setIsSearchLoading(true);
|
|
}
|
|
}, [search.query, search.isTyping, isLoading, isFetching]);
|
|
|
|
return (
|
|
<>
|
|
<AnimatePresence initial={false}>
|
|
{navVisible && (
|
|
<motion.div
|
|
data-testid="nav"
|
|
className={cn(
|
|
'nav active max-w-[320px] flex-shrink-0 overflow-x-hidden bg-surface-primary-alt',
|
|
'md:max-w-[260px]',
|
|
)}
|
|
initial={{ width: 0 }}
|
|
animate={{ width: navWidth }}
|
|
exit={{ width: 0 }}
|
|
transition={{ duration: 0.2 }}
|
|
key="nav"
|
|
>
|
|
<div className="h-full w-[320px] md:w-[260px]">
|
|
<div className="flex h-full flex-col">
|
|
{navVisible && (
|
|
<nav
|
|
id="chat-history-nav"
|
|
aria-label={localize('com_ui_chat_history')}
|
|
className="flex h-full flex-col px-2 pb-3.5 md:px-3"
|
|
>
|
|
<div className="flex flex-1 flex-col" ref={outerContainerRef}>
|
|
<MemoNewChat
|
|
subHeaders={subHeaders}
|
|
toggleNav={toggleNavVisible}
|
|
headerButtons={headerButtons}
|
|
isSmallScreen={isSmallScreen}
|
|
openSidebarRef={openSidebarRef}
|
|
closeSidebarRef={closeSidebarRef}
|
|
/>
|
|
<Conversations
|
|
conversations={conversations}
|
|
moveToTop={moveToTop}
|
|
toggleNav={itemToggleNav}
|
|
containerRef={listRef}
|
|
loadMoreConversations={loadMoreConversations}
|
|
isLoading={isFetchingNextPage || showLoading || isLoading}
|
|
isSearchLoading={isSearchLoading}
|
|
/>
|
|
</div>
|
|
<Suspense fallback={null}>
|
|
<AccountSettings />
|
|
</Suspense>
|
|
</nav>
|
|
)}
|
|
</div>
|
|
</div>
|
|
</motion.div>
|
|
)}
|
|
</AnimatePresence>
|
|
{isSmallScreen && <NavMask navVisible={navVisible} toggleNavVisible={toggleNavVisible} />}
|
|
</>
|
|
);
|
|
},
|
|
);
|
|
|
|
Nav.displayName = 'Nav';
|
|
|
|
export default Nav;
|