Skip to content

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

🔧 refactor: Reduce Complexity of Initial Load Effect & Message Styling (#3213)

Danny Avilaed5ee1f86f8d
diff --git a/client/src/components/Chat/Messages/Message.tsx b/client/src/components/Chat/Messages/Message.tsx
index fc52a89584..fb8babdd34 100644
--- a/client/src/components/Chat/Messages/Message.tsx
+++ b/client/src/components/Chat/Messages/Message.tsx
@@ -1,16 +1,9 @@
-import React, { useCallback, useMemo } from 'react';
-import { useMessageProcess, useMessageActions } from '~/hooks';
-import type { TMessage } from 'librechat-data-provider';
+import React from 'react';
+import { useMessageProcess } from '~/hooks';
import type { TMessageProps } from '~/common';
-import Icon from '~/components/Chat/Messages/MessageIcon';
-import { Plugin } from '~/components/Messages/Content';
-import MessageContent from './Content/MessageContent';
-import SiblingSwitch from './SiblingSwitch';
+import MessageRender from './ui/MessageRender';
// eslint-disable-next-line import/no-cycle
import MultiMessage from './MultiMessage';
-import HoverButtons from './HoverButtons';
-import SubRow from './SubRow';
-import { cn } from '~/utils';
const MessageContainer = React.memo(
({ handleScroll, children }: { handleScroll: () => void; children: React.ReactNode }) => {
@@ -26,155 +19,6 @@ const MessageContainer = React.memo(
},
);
-const PlaceholderRow = React.memo(({ isLast, isCard }: { isLast: boolean; isCard?: boolean }) => {
- if (!isCard) {
- return null;
- }
- if (!isLast) {
- return null;
- }
- return <div className="mt-1 h-[27px] bg-transparent" />;
-});
-
-type MessageRenderProps = {
- message?: TMessage;
- isCard?: boolean;
- isMultiMessage?: boolean;
- isSubmittingFamily?: boolean;
-} & Pick<
- TMessageProps,
- 'currentEditId' | 'setCurrentEditId' | 'siblingIdx' | 'setSiblingIdx' | 'siblingCount'
->;
-
-const MessageRender = React.memo(
- ({
- isCard,
- siblingIdx,
- siblingCount,
- message: msg,
- setSiblingIdx,
- currentEditId,
- isMultiMessage,
- setCurrentEditId,
- isSubmittingFamily,
- }: MessageRenderProps) => {
- const {
- ask,
- edit,
- index,
- assistant,
- enterEdit,
- conversation,
- messageLabel,
- isSubmitting,
- latestMessage,
- handleContinue,
- copyToClipboard,
- setLatestMessage,
- regenerateMessage,
- } = useMessageActions({
- message: msg,
- currentEditId,
- isMultiMessage,
- setCurrentEditId,
- });
-
- const handleRegenerateMessage = useCallback(() => regenerateMessage(), [regenerateMessage]);
- const { isCreatedByUser, error, unfinished } = msg ?? {};
- const isLast = useMemo(
- () => !msg?.children?.length && (msg?.depth === latestMessage?.depth || msg?.depth === -1),
- [msg?.children, msg?.depth, latestMessage?.depth],
- );
-
- if (!msg) {
- return null;
- }
-
- const isLatest = isCard && !isSubmittingFamily && msg.messageId === latestMessage?.messageId;
- const clickHandler =
- isLast && isCard && !isSubmittingFamily && msg.messageId !== latestMessage?.messageId
- ? () => setLatestMessage(msg)
- : undefined;
-
- return (
- <div
- className={cn(
- 'final-completion group mx-auto flex flex-1 gap-3 text-base',
- isCard
- ? 'relative w-full gap-1 rounded-lg border border-border-medium bg-surface-primary-alt p-2 md:w-1/2 md:gap-3 md:p-4'
- : 'md:max-w-3xl lg:max-w-[40rem] xl:max-w-[48rem]',
- isLatest ? 'bg-surface-secondary' : '',
- isLast && !isSubmittingFamily && isCard
- ? 'cursor-pointer transition-colors duration-300'
- : '',
- )}
- onClick={clickHandler}
- >
- {isLatest && (
- <div className="absolute right-0 top-0 m-2 h-3 w-3 rounded-full bg-text-primary"></div>
- )}
- <div className="relative flex flex-shrink-0 flex-col items-end">
- <div>
- <div className="pt-0.5">
- <div className="flex h-6 w-6 items-center justify-center overflow-hidden rounded-full">
- <Icon message={msg} conversation={conversation} assistant={assistant} />
- </div>
- </div>
- </div>
- </div>
- <div
- className={cn('relative flex w-11/12 flex-col', msg?.isCreatedByUser ? '' : 'agent-turn')}
- >
- <div className="select-none font-semibold">{messageLabel}</div>
- <div className="flex-col gap-1 md:gap-3">
- <div className="flex max-w-full flex-grow flex-col gap-0">
- {msg?.plugin && <Plugin plugin={msg?.plugin} />}
- <MessageContent
- ask={ask}
- edit={edit}
- isLast={isLast}
- text={msg.text ?? ''}
- message={msg}
- enterEdit={enterEdit}
- error={!!error}
- isSubmitting={isSubmitting}
- unfinished={unfinished ?? false}
- isCreatedByUser={isCreatedByUser ?? true}
- siblingIdx={siblingIdx ?? 0}
- setSiblingIdx={setSiblingIdx ?? (() => ({}))}
- />
- </div>
- </div>
- {!msg?.children?.length && (isSubmittingFamily || isSubmitting) ? (
- <PlaceholderRow isLast={isLast} isCard={isCard} />
- ) : (
- <SubRow classes="text-xs">
- <SiblingSwitch
- siblingIdx={siblingIdx}
- siblingCount={siblingCount}
- setSiblingIdx={setSiblingIdx}
- />
- <HoverButtons
- index={index}
- isEditing={edit}
- message={msg}
- enterEdit={enterEdit}
- isSubmitting={isSubmitting}
- conversation={conversation ?? null}
- regenerate={handleRegenerateMessage}
- copyToClipboard={copyToClipboard}
- handleContinue={handleContinue}
- latestMessage={latestMessage}
- isLast={isLast}
- />
- </SubRow>
- )}
- </div>
- </div>
- );
- },
-);
-
export default function Message(props: TMessageProps) {
const {
showSibling,
diff --git a/client/src/components/Chat/Messages/ui/MessageRender.tsx b/client/src/components/Chat/Messages/ui/MessageRender.tsx
new file mode 100644
index 0000000000..c78066c53d
--- /dev/null
+++ b/client/src/components/Chat/Messages/ui/MessageRender.tsx
@@ -0,0 +1,154 @@
+import React, { useCallback, useMemo } from 'react';
+import { useMessageActions } from '~/hooks';
+import type { TMessage } from 'librechat-data-provider';
+import type { TMessageProps } from '~/common';
+import MessageContent from '~/components/Chat/Messages/Content/MessageContent';
+import PlaceholderRow from '~/components/Chat/Messages/ui/PlaceholderRow';
+import SiblingSwitch from '~/components/Chat/Messages/SiblingSwitch';
+import HoverButtons from '~/components/Chat/Messages/HoverButtons';
+import Icon from '~/components/Chat/Messages/MessageIcon';
+import { Plugin } from '~/components/Messages/Content';
+import SubRow from '~/components/Chat/Messages/SubRow';
+import { cn } from '~/utils';
+
+type MessageRenderProps = {
+ message?: TMessage;
+ isCard?: boolean;
+ isMultiMessage?: boolean;
+ isSubmittingFamily?: boolean;
+} & Pick<
+ TMessageProps,
+ 'currentEditId' | 'setCurrentEditId' | 'siblingIdx' | 'setSiblingIdx' | 'siblingCount'
+>;
+
+const MessageRender = React.memo(
+ ({
+ isCard,
+ siblingIdx,
+ siblingCount,
+ message: msg,
+ setSiblingIdx,
+ currentEditId,
+ isMultiMessage,
+ setCurrentEditId,
+ isSubmittingFamily,
+ }: MessageRenderProps) => {
+ const {
+ ask,
+ edit,
+ index,
+ assistant,
+ enterEdit,
+ conversation,
+ messageLabel,
+ isSubmitting,
+ latestMessage,
+ handleContinue,
+ copyToClipboard,
+ setLatestMessage,
+ regenerateMessage,
+ } = useMessageActions({
+ message: msg,
+ currentEditId,
+ isMultiMessage,
+ setCurrentEditId,
+ });
+
+ const handleRegenerateMessage = useCallback(() => regenerateMessage(), [regenerateMessage]);
+ const { isCreatedByUser, error, unfinished } = msg ?? {};
+ const isLast = useMemo(
+ () => !msg?.children?.length && (msg?.depth === latestMessage?.depth || msg?.depth === -1),
+ [msg?.children, msg?.depth, latestMessage?.depth],
+ );
+
+ if (!msg) {
+ return null;
+ }
+
+ const isLatestCard =
+ isCard && !isSubmittingFamily && msg.messageId === latestMessage?.messageId;
+ const clickHandler =
+ isLast && isCard && !isSubmittingFamily && msg.messageId !== latestMessage?.messageId
+ ? () => setLatestMessage(msg)
+ : undefined;
+
+ return (
+ <div
+ className={cn(
+ 'final-completion group mx-auto flex flex-1 gap-3 text-base',
+ isCard
+ ? 'relative w-full gap-1 rounded-lg border border-border-medium bg-surface-primary-alt p-2 md:w-1/2 md:gap-3 md:p-4'
+ : 'md:max-w-3xl md:px-5 lg:max-w-[40rem] lg:px-1 xl:max-w-[48rem] xl:px-5',
+ isLatestCard ? 'bg-surface-secondary' : '',
+ isLast && !isSubmittingFamily && isCard
+ ? 'cursor-pointer transition-colors duration-300'
+ : '',
+ )}
+ onClick={clickHandler}
+ >
+ {isLatestCard && (
+ <div className="absolute right-0 top-0 m-2 h-3 w-3 rounded-full bg-text-primary"></div>
+ )}
+ <div className="relative flex flex-shrink-0 flex-col items-end">
+ <div>
+ <div className="pt-0.5">
+ <div className="flex h-6 w-6 items-center justify-center overflow-hidden rounded-full">
+ <Icon message={msg} conversation={conversation} assistant={assistant} />
+ </div>
+ </div>
+ </div>
+ </div>
+ <div
+ className={cn('relative flex w-11/12 flex-col', msg?.isCreatedByUser ? '' : 'agent-turn')}
+ >
+ <div className="select-none font-semibold">{messageLabel}</div>
+ <div className="flex-col gap-1 md:gap-3">
+ <div className="flex max-w-full flex-grow flex-col gap-0">
+ {msg?.plugin && <Plugin plugin={msg?.plugin} />}
+ <MessageContent
+ ask={ask}
+ edit={edit}
+ isLast={isLast}
+ text={msg.text ?? ''}
+ message={msg}
+ enterEdit={enterEdit}
+ error={!!error}
+ isSubmitting={isSubmitting}
+ unfinished={unfinished ?? false}
+ isCreatedByUser={isCreatedByUser ?? true}
+ siblingIdx={siblingIdx ?? 0}
+ setSiblingIdx={setSiblingIdx ?? (() => ({}))}
+ />
+ </div>
+ </div>
+ {!msg?.children?.length && (isSubmittingFamily || isSubmitting) ? (
+ <PlaceholderRow isLast={isLast} isCard={isCard} />
+ ) : (
+ <SubRow classes="text-xs">
+ <SiblingSwitch
+ siblingIdx={siblingIdx}
+ siblingCount={siblingCount}
+ setSiblingIdx={setSiblingIdx}
+ />
+ <HoverButtons
+ index={index}
+ isEditing={edit}
+ message={msg}
+ enterEdit={enterEdit}
+ isSubmitting={isSubmitting}
+ conversation={conversation ?? null}
+ regenerate={handleRegenerateMessage}
+ copyToClipboard={copyToClipboard}
+ handleContinue={handleContinue}
+ latestMessage={latestMessage}
+ isLast={isLast}
+ />
+ </SubRow>
+ )}
+ </div>
+ </div>
+ );
+ },
+);
+
+export default MessageRender;
diff --git a/client/src/components/Chat/Messages/ui/PlaceholderRow.tsx b/client/src/components/Chat/Messages/ui/PlaceholderRow.tsx
new file mode 100644
index 0000000000..1c3d17de81
--- /dev/null
+++ b/client/src/components/Chat/Messages/ui/PlaceholderRow.tsx
@@ -0,0 +1,13 @@
+import { memo } from 'react';
+
+const PlaceholderRow = memo(({ isLast, isCard }: { isLast: boolean; isCard?: boolean }) => {
+ if (!isCard) {
+ return null;
+ }
+ if (!isLast) {
+ return null;
+ }
+ return <div className="mt-1 h-[27px] bg-transparent" />;
+});
+
+export default PlaceholderRow;
diff --git a/client/src/routes/ChatRoute.tsx b/client/src/routes/ChatRoute.tsx
index 3f9e0a5024..ad933efd61 100644
--- a/client/src/routes/ChatRoute.tsx
+++ b/client/src/routes/ChatRoute.tsx
@@ -38,14 +38,14 @@ export default function ChatRoute() {
const assistantListMap = useAssistantListMap();
useEffect(() => {
- if (
- startupConfig &&
- conversationId === 'new' &&
- endpointsQuery.data &&
- modelsQuery.data &&
- !modelsQuery.data?.initial &&
- !hasSetConversation.current
- ) {
+ const shouldSetConvo =
+ startupConfig && !hasSetConversation.current && !modelsQuery.data?.initial;
+ /* Early exit if startupConfig is not loaded and conversation is already set and only initial models have loaded */
+ if (!shouldSetConvo) {
+ return;
+ }
+
+ if (conversationId === 'new' && endpointsQuery.data && modelsQuery.data) {
const spec = getDefaultModelSpec(startupConfig.modelSpecs?.list);
newConversation({
@@ -63,14 +63,7 @@ export default function ChatRoute() {
});
hasSetConversation.current = true;
- } else if (
- startupConfig &&
- initialConvoQuery.data &&
- endpointsQuery.data &&
- modelsQuery.data &&
- !modelsQuery.data?.initial &&
- !hasSetConversation.current
- ) {
+ } else if (initialConvoQuery.data && endpointsQuery.data && modelsQuery.data) {
newConversation({
template: initialConvoQuery.data,
/* this is necessary to load all existing settings */
@@ -80,9 +73,6 @@ export default function ChatRoute() {
});
hasSetConversation.current = true;
} else if (
- startupConfig &&
- !hasSetConversation.current &&
- !modelsQuery.data?.initial &&
conversationId === 'new' &&
assistantListMap[EModelEndpoint.assistants] &&
assistantListMap[EModelEndpoint.azureAssistants]
@@ -103,9 +93,6 @@ export default function ChatRoute() {
});
hasSetConversation.current = true;
} else if (
- startupConfig &&
- !hasSetConversation.current &&
- !modelsQuery.data?.initial &&
assistantListMap[EModelEndpoint.assistants] &&
assistantListMap[EModelEndpoint.azureAssistants]
) {