Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active
TypeScript aianthropicartifactsawsazurechatgptchatgpt-cloneclaudeclonedeepseekgeminigooglegpt-5librechatmcpo1openairesponses-apivisionwebui
🗝️ fix: React Key Props and Minor UI Fixes from a11y Updates (#10954)
Danny Avila06719794f66f
diff --git a/client/src/components/Chat/Menus/Endpoints/components/EndpointItem.tsx b/client/src/components/Chat/Menus/Endpoints/components/EndpointItem.tsxindex c21c3a8e4e..1679d0285a 100644--- a/client/src/components/Chat/Menus/Endpoints/components/EndpointItem.tsx+++ b/client/src/components/Chat/Menus/Endpoints/components/EndpointItem.tsx@@ -14,6 +14,7 @@ import { cn } from '~/utils';interface EndpointItemProps {endpoint: Endpoint;+ endpointIndex: number;}const SettingsButton = ({@@ -54,7 +55,7 @@ const SettingsButton = ({);};-export function EndpointItem({ endpoint }: EndpointItemProps) {+export function EndpointItem({ endpoint, endpointIndex }: EndpointItemProps) {const localize = useLocalize();const {agentsMap,@@ -153,8 +154,21 @@ export function EndpointItem({ endpoint }: EndpointItemProps) {))}{/* Render endpoint models */}{filteredModels- ? renderEndpointModels(endpoint, endpoint.models || [], selectedModel, filteredModels)- : endpoint.models && renderEndpointModels(endpoint, endpoint.models, selectedModel)}+ ? renderEndpointModels(+ endpoint,+ endpoint.models || [],+ selectedModel,+ filteredModels,+ endpointIndex,+ )+ : endpoint.models &&+ renderEndpointModels(+ endpoint,+ endpoint.models,+ selectedModel,+ undefined,+ endpointIndex,+ )}</>)}</Menu>@@ -198,7 +212,11 @@ export function EndpointItem({ endpoint }: EndpointItemProps) {}export function renderEndpoints(mappedEndpoints: Endpoint[]) {- return mappedEndpoints.map((endpoint) => (- <EndpointItem endpoint={endpoint} key={`endpoint-${endpoint.value}-item`} />+ return mappedEndpoints.map((endpoint, index) => (+ <EndpointItem+ endpoint={endpoint}+ endpointIndex={index}+ key={`endpoint-${endpoint.value}-${index}`}+ />));}diff --git a/client/src/components/Chat/Menus/Endpoints/components/EndpointModelItem.tsx b/client/src/components/Chat/Menus/Endpoints/components/EndpointModelItem.tsxindex aab5b5889f..cb9d24eb61 100644--- a/client/src/components/Chat/Menus/Endpoints/components/EndpointModelItem.tsx+++ b/client/src/components/Chat/Menus/Endpoints/components/EndpointModelItem.tsx@@ -109,7 +109,6 @@ export function EndpointModelItem({ modelId, endpoint, isSelected }: EndpointModreturn (<MenuItemref={itemRef}- key={modelId}onClick={() => handleSelectModel(endpoint, modelId ?? '')}className="group flex w-full cursor-pointer items-center justify-between rounded-lg px-2 text-sm">@@ -161,14 +160,16 @@ export function renderEndpointModels(models: Array<{ name: string; isGlobal?: boolean }>,selectedModel: string | null,filteredModels?: string[],+ endpointIndex?: number,) {const modelsToRender = filteredModels || models.map((model) => model.name);+ const indexSuffix = endpointIndex != null ? `-${endpointIndex}` : '';return modelsToRender.map(- (modelId) =>+ (modelId, modelIndex) =>endpoint && (<EndpointModelItem- key={modelId}+ key={`${endpoint.value}${indexSuffix}-${modelId}-${modelIndex}`}modelId={modelId}endpoint={endpoint}isSelected={selectedModel === modelId}diff --git a/client/src/components/Chat/Messages/MessagesView.tsx b/client/src/components/Chat/Messages/MessagesView.tsxindex bea6554ff1..c6d0a7e84f 100644--- a/client/src/components/Chat/Messages/MessagesView.tsx+++ b/client/src/components/Chat/Messages/MessagesView.tsx@@ -1,4 +1,4 @@-import { useState } from 'react';+import { useState, useRef } from 'react';import { useAtomValue } from 'jotai';import { useRecoilValue } from 'recoil';import { CSSTransition } from 'react-transition-group';@@ -21,6 +21,7 @@ function MessagesViewContent({const { screenshotTargetRef } = useScreenshot();const scrollButtonPreference = useRecoilValue(store.showScrollButton);const [currentEditId, setCurrentEditId] = useState<number | string | null>(-1);+ const scrollToBottomRef = useRef<HTMLButtonElement>(null);const {conversation,@@ -87,8 +88,9 @@ function MessagesViewContent({classNames="scroll-animation"unmountOnExit={true}appear={true}+ nodeRef={scrollToBottomRef}>- <ScrollToBottom scrollHandler={handleSmoothToRef} />+ <ScrollToBottom ref={scrollToBottomRef} scrollHandler={handleSmoothToRef} /></CSSTransition></div></div>diff --git a/client/src/components/Conversations/Conversations.tsx b/client/src/components/Conversations/Conversations.tsxindex 63ee52ee9b..64b804b2d6 100644--- a/client/src/components/Conversations/Conversations.tsx+++ b/client/src/components/Conversations/Conversations.tsx@@ -250,7 +250,7 @@ const Conversations: FC<ConversationsProps> = ({if (item.type === 'loading') {return (- <MeasuredRow {...rowProps}>+ <MeasuredRow key={key} {...rowProps}><LoadingSpinner /></MeasuredRow>);@@ -258,7 +258,7 @@ const Conversations: FC<ConversationsProps> = ({if (item.type === 'favorites') {return (- <MeasuredRow {...rowProps}>+ <MeasuredRow key={key} {...rowProps}><FavoritesListisSmallScreen={isSmallScreen}toggleNav={toggleNav}@@ -270,7 +270,7 @@ const Conversations: FC<ConversationsProps> = ({if (item.type === 'chats-header') {return (- <MeasuredRow {...rowProps}>+ <MeasuredRow key={key} {...rowProps}><ChatsHeaderisExpanded={isChatsExpanded}onToggle={() => setIsChatsExpanded(!isChatsExpanded)}@@ -285,7 +285,7 @@ const Conversations: FC<ConversationsProps> = ({// Without favorites: [chats-header, first-header] → index 1const firstHeaderIndex = shouldShowFavorites ? 2 : 1;return (- <MeasuredRow {...rowProps}>+ <MeasuredRow key={key} {...rowProps}><DateLabel groupName={item.groupName} isFirst={index === firstHeaderIndex} /></MeasuredRow>);@@ -293,7 +293,7 @@ const Conversations: FC<ConversationsProps> = ({if (item.type === 'convo') {return (- <MeasuredRow {...rowProps}>+ <MeasuredRow key={key} {...rowProps}><MemoizedConvo conversation={item.convo} retainView={moveToTop} toggleNav={toggleNav} /></MeasuredRow>);diff --git a/client/src/components/Messages/ScrollToBottom.tsx b/client/src/components/Messages/ScrollToBottom.tsxindex bb67cfe3df..0b99df0a61 100644--- a/client/src/components/Messages/ScrollToBottom.tsx+++ b/client/src/components/Messages/ScrollToBottom.tsx@@ -1,12 +1,13 @@-import React from 'react';+import { forwardRef } from 'react';type Props = {scrollHandler: React.MouseEventHandler<HTMLButtonElement>;};-export default function ScrollToBottom({ scrollHandler }: Props) {+const ScrollToBottom = forwardRef<HTMLButtonElement, Props>(({ scrollHandler }, ref) => {return (<button+ ref={ref}onClick={scrollHandler}className="premium-scroll-button absolute bottom-5 right-1/2 cursor-pointer border border-border-light bg-surface-secondary"aria-label="Scroll to bottom"@@ -22,4 +23,8 @@ export default function ScrollToBottom({ scrollHandler }: Props) {</svg></button>);-}+});++ScrollToBottom.displayName = 'ScrollToBottom';++export default ScrollToBottom;diff --git a/client/src/components/Nav/Favorites/FavoritesList.tsx b/client/src/components/Nav/Favorites/FavoritesList.tsxindex b8af6a99b1..84c0283602 100644--- a/client/src/components/Nav/Favorites/FavoritesList.tsx+++ b/client/src/components/Nav/Favorites/FavoritesList.tsx@@ -4,14 +4,13 @@ import { LayoutGrid } from 'lucide-react';import { useDrag, useDrop } from 'react-dnd';import { Skeleton } from '@librechat/client';import { useNavigate } from 'react-router-dom';+import { useQueries } from '@tanstack/react-query';import { QueryKeys, dataService } from 'librechat-data-provider';-import { useQueries, useQueryClient } from '@tanstack/react-query';-import type { InfiniteData } from '@tanstack/react-query';import type t from 'librechat-data-provider';import { useFavorites, useLocalize, useShowMarketplace, useNewConvo } from '~/hooks';+import { useAssistantsMapContext, useAgentsMapContext } from '~/Providers';import useSelectMention from '~/hooks/Input/useSelectMention';import { useGetEndpointsQuery } from '~/data-provider';-import { useAssistantsMapContext } from '~/Providers';import FavoriteItem from './FavoriteItem';import store from '~/store';@@ -121,13 +120,13 @@ export default function FavoritesList({}) {const navigate = useNavigate();const localize = useLocalize();- const queryClient = useQueryClient();const search = useRecoilValue(store.search);const { favorites, reorderFavorites, isLoading: isFavoritesLoading } = useFavorites();const showAgentMarketplace = useShowMarketplace();const { newConversation } = useNewConvo();const assistantsMap = useAssistantsMapContext();+ const agentsMap = useAgentsMapContext();const conversation = useRecoilValue(store.conversationByIndex(0));const { data: endpointsConfig = {} as t.TEndpointsConfig } = useGetEndpointsQuery();@@ -168,59 +167,56 @@ export default function FavoritesList({newChatButton?.focus();}, []);- // Ensure favorites is always an array (could be corrupted in localStorage)const safeFavorites = useMemo(() => (Array.isArray(favorites) ? favorites : []), [favorites]);- const agentIds = safeFavorites.map((f) => f.agentId).filter(Boolean) as string[];+ const allAgentIds = useMemo(+ () => safeFavorites.map((f) => f.agentId).filter(Boolean) as string[],+ [safeFavorites],+ );++ const missingAgentIds = useMemo(() => {+ if (agentsMap === undefined) {+ return [];+ }+ return allAgentIds.filter((id) => !agentsMap[id]);+ }, [allAgentIds, agentsMap]);- const agentQueries = useQueries({- queries: agentIds.map((agentId) => ({+ const missingAgentQueries = useQueries({+ queries: missingAgentIds.map((agentId) => ({queryKey: [QueryKeys.agent, agentId],queryFn: () => dataService.getAgentById({ agent_id: agentId }),staleTime: 1000 * 60 * 5,+ enabled: missingAgentIds.length > 0,})),});- const isAgentsLoading = agentIds.length > 0 && agentQueries.some((q) => q.isLoading);-- useEffect(() => {- if (!isAgentsLoading && onHeightChange) {- onHeightChange();+ const combinedAgentsMap = useMemo(() => {+ if (agentsMap === undefined) {+ return undefined;}- }, [isAgentsLoading, onHeightChange]);- const agentsMap = useMemo(() => {- const map: Record<string, t.Agent> = {};-- const addToMap = (agent: t.Agent) => {- if (agent && agent.id && !map[agent.id]) {- map[agent.id] = agent;+ const combined: Record<string, t.Agent> = {};+ for (const [key, value] of Object.entries(agentsMap)) {+ if (value) {+ combined[key] = value;}- };-- const marketplaceData = queryClient.getQueriesData<InfiniteData<t.AgentListResponse>>([- QueryKeys.marketplaceAgents,- ]);- marketplaceData.forEach(([_, data]) => {- data?.pages.forEach((page) => {- page.data.forEach(addToMap);- });- });-- const agentsListData = queryClient.getQueriesData<t.AgentListResponse>([QueryKeys.agents]);- agentsListData.forEach(([_, data]) => {- if (data && Array.isArray(data.data)) {- data.data.forEach(addToMap);- }- });-- agentQueries.forEach((query) => {+ }+ missingAgentQueries.forEach((query) => {if (query.data) {- map[query.data.id] = query.data;+ combined[query.data.id] = query.data;}});+ return combined;+ }, [agentsMap, missingAgentQueries]);++ const isAgentsLoading =+ (allAgentIds.length > 0 && agentsMap === undefined) ||+ (missingAgentIds.length > 0 && missingAgentQueries.some((q) => q.isLoading));- return map;- }, [agentQueries, queryClient]);+ useEffect(() => {+ if (!isAgentsLoading && onHeightChange) {+ onHeightChange();+ }+ }, [isAgentsLoading, onHeightChange]);const draggedFavoritesRef = useRef(safeFavorites);@@ -306,7 +302,7 @@ export default function FavoritesList({)}{safeFavorites.map((fav, index) => {if (fav.agentId) {- const agent = agentsMap[fav.agentId];+ const agent = combinedAgentsMap?.[fav.agentId];if (!agent) {return null;}diff --git a/client/src/utils/logger.ts b/client/src/utils/logger.tsindex 6bc1d21db6..b025f4926c 100644--- a/client/src/utils/logger.ts+++ b/client/src/utils/logger.ts@@ -9,7 +9,7 @@ const createLogFunction = (type?: 'log' | 'warn' | 'error' | 'info' | 'debug' | 'dir',): LogFunction => {return (...args: unknown[]) => {- if (isDevelopment || isLoggerEnabled) {+ if (isLoggerEnabled || (import.meta.env.VITE_ENABLE_LOGGER == null && isDevelopment)) {const tag = typeof args[0] === 'string' ? args[0] : '';if (shouldLog(tag)) {if (tag && typeof args[1] === 'string' && type === 'error') {