mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-06-26 01:16:24 +00:00
* fix: reapply chat font size on load * refactor: streamline font size handling in localStorage * fix: update matchMedia mock to accurately reflect desktop and touchscreen capabilities * refactor: implement Jotai for font size management and initialize on app load - Replaced Recoil with Jotai for font size state management across components. - Added a new `fontSize` atom to handle font size changes and persist them in localStorage. - Implemented `initializeFontSize` function to apply saved font size on app load. - Updated relevant components to utilize the new font size atom. --------- Co-authored-by: ddooochii <ddooochii@gmail.com> Co-authored-by: Danny Avila <danny@librechat.ai>
131 lines
4.6 KiB
TypeScript
131 lines
4.6 KiB
TypeScript
import { useAtomValue } from 'jotai';
|
|
import type { TMessageProps } from '~/common';
|
|
import MinimalHoverButtons from '~/components/Chat/Messages/MinimalHoverButtons';
|
|
import MessageContent from '~/components/Chat/Messages/Content/MessageContent';
|
|
import SearchContent from '~/components/Chat/Messages/Content/SearchContent';
|
|
import SiblingSwitch from '~/components/Chat/Messages/SiblingSwitch';
|
|
import { Plugin } from '~/components/Messages/Content';
|
|
import SubRow from '~/components/Chat/Messages/SubRow';
|
|
import { fontSizeAtom } from '~/store/fontSize';
|
|
import { MessageContext } from '~/Providers';
|
|
import { useAttachments } from '~/hooks';
|
|
|
|
import MultiMessage from './MultiMessage';
|
|
import { cn } from '~/utils';
|
|
|
|
import Icon from './MessageIcon';
|
|
export default function Message(props: TMessageProps) {
|
|
const fontSize = useAtomValue(fontSizeAtom);
|
|
const {
|
|
message,
|
|
siblingIdx,
|
|
siblingCount,
|
|
conversation,
|
|
setSiblingIdx,
|
|
currentEditId,
|
|
setCurrentEditId,
|
|
} = props;
|
|
|
|
const { attachments, searchResults } = useAttachments({
|
|
messageId: message?.messageId,
|
|
attachments: message?.attachments,
|
|
});
|
|
|
|
if (!message) {
|
|
return null;
|
|
}
|
|
|
|
const {
|
|
text = '',
|
|
children,
|
|
error = false,
|
|
messageId = '',
|
|
unfinished = false,
|
|
isCreatedByUser = true,
|
|
} = message;
|
|
|
|
let messageLabel = '';
|
|
if (isCreatedByUser) {
|
|
messageLabel = 'anonymous';
|
|
} else {
|
|
messageLabel = message.sender ?? '';
|
|
}
|
|
|
|
return (
|
|
<>
|
|
<div className="text-token-text-primary w-full border-0 bg-transparent dark:border-0 dark:bg-transparent">
|
|
<div className="m-auto justify-center p-4 py-2 md:gap-6">
|
|
<div className="final-completion group mx-auto flex flex-1 gap-3 md:max-w-[47rem] md:px-5 lg:px-1 xl:max-w-[55rem] xl:px-5">
|
|
<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={message} conversation={conversation} />
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div
|
|
className={cn('relative flex w-11/12 flex-col', isCreatedByUser ? '' : 'agent-turn')}
|
|
>
|
|
<div className={cn('select-none font-semibold', fontSize)}>{messageLabel}</div>
|
|
<div className="flex-col gap-1 md:gap-3">
|
|
<div className="flex max-w-full flex-grow flex-col gap-0">
|
|
<MessageContext.Provider
|
|
value={{
|
|
messageId,
|
|
isExpanded: false,
|
|
conversationId: conversation?.conversationId,
|
|
isSubmitting: false, // Share view is always read-only
|
|
isLatestMessage: false, // No concept of latest message in share view
|
|
}}
|
|
>
|
|
{/* Legacy Plugins */}
|
|
{message.plugin && <Plugin plugin={message.plugin} />}
|
|
{message.content ? (
|
|
<SearchContent
|
|
message={message}
|
|
attachments={attachments}
|
|
searchResults={searchResults}
|
|
/>
|
|
) : (
|
|
<MessageContent
|
|
edit={false}
|
|
error={error}
|
|
isLast={false}
|
|
ask={() => ({})}
|
|
text={text || ''}
|
|
message={message}
|
|
isSubmitting={false}
|
|
enterEdit={() => ({})}
|
|
unfinished={unfinished}
|
|
siblingIdx={siblingIdx ?? 0}
|
|
isCreatedByUser={isCreatedByUser}
|
|
setSiblingIdx={setSiblingIdx ?? (() => ({}))}
|
|
/>
|
|
)}
|
|
</MessageContext.Provider>
|
|
</div>
|
|
</div>
|
|
<SubRow classes="text-xs">
|
|
<SiblingSwitch
|
|
siblingIdx={siblingIdx}
|
|
siblingCount={siblingCount}
|
|
setSiblingIdx={setSiblingIdx}
|
|
/>
|
|
<MinimalHoverButtons message={message} searchResults={searchResults} />
|
|
</SubRow>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<MultiMessage
|
|
key={messageId}
|
|
messageId={messageId}
|
|
messagesTree={children ?? []}
|
|
currentEditId={currentEditId}
|
|
setCurrentEditId={setCurrentEditId}
|
|
/>
|
|
</>
|
|
);
|
|
}
|