mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-01-06 02:28:51 +01:00
🎭 refactor: Avatar Loading UX and Fix Initials Rendering Bugs (#9261)
Co-authored-by: Danny Avila <danny@librechat.ai>
This commit is contained in:
parent
e559f0f4dc
commit
94426a3cae
9 changed files with 562 additions and 31 deletions
102
packages/client/src/components/Avatar.tsx
Normal file
102
packages/client/src/components/Avatar.tsx
Normal file
|
|
@ -0,0 +1,102 @@
|
|||
import React, { useState, useMemo, useCallback } from 'react';
|
||||
import type { TUser } from 'librechat-data-provider';
|
||||
import { Skeleton } from './Skeleton';
|
||||
import { useAvatar } from '~/hooks';
|
||||
import { UserIcon } from '~/svgs';
|
||||
|
||||
export interface AvatarProps {
|
||||
user?: TUser;
|
||||
size?: number;
|
||||
className?: string;
|
||||
alt?: string;
|
||||
showDefaultWhenEmpty?: boolean;
|
||||
}
|
||||
|
||||
const Avatar: React.FC<AvatarProps> = ({
|
||||
user,
|
||||
size = 32,
|
||||
className = '',
|
||||
alt,
|
||||
showDefaultWhenEmpty = true,
|
||||
}) => {
|
||||
const avatarSrc = useAvatar(user);
|
||||
const [imageLoaded, setImageLoaded] = useState(false);
|
||||
const [imageError, setImageError] = useState(false);
|
||||
|
||||
const avatarSeed = useMemo(
|
||||
() => user?.avatar || user?.username || user?.email || '',
|
||||
[user?.avatar, user?.username, user?.email],
|
||||
);
|
||||
|
||||
const altText = useMemo(
|
||||
() => alt || `${user?.name || user?.username || user?.email || ''}'s avatar`,
|
||||
[alt, user?.name, user?.username, user?.email],
|
||||
);
|
||||
|
||||
const imageSrc = useMemo(() => {
|
||||
if (!avatarSeed || imageError) return '';
|
||||
return (user?.avatar ?? '') || avatarSrc || '';
|
||||
}, [user?.avatar, avatarSrc, avatarSeed, imageError]);
|
||||
|
||||
const handleImageLoad = useCallback(() => {
|
||||
setImageLoaded(true);
|
||||
}, []);
|
||||
|
||||
const handleImageError = useCallback(() => {
|
||||
setImageError(true);
|
||||
setImageLoaded(false);
|
||||
}, []);
|
||||
|
||||
const DefaultAvatar = useCallback(
|
||||
() => (
|
||||
<div
|
||||
style={{
|
||||
backgroundColor: 'rgb(121, 137, 255)',
|
||||
width: `${size}px`,
|
||||
height: `${size}px`,
|
||||
boxShadow: 'rgba(240, 246, 252, 0.1) 0px 0px 0px 1px',
|
||||
}}
|
||||
className={`relative flex items-center justify-center rounded-full p-1 text-text-primary ${className}`}
|
||||
aria-hidden="true"
|
||||
>
|
||||
<UserIcon />
|
||||
</div>
|
||||
),
|
||||
[size, className],
|
||||
);
|
||||
|
||||
if (avatarSeed.length === 0 && showDefaultWhenEmpty) {
|
||||
return <DefaultAvatar />;
|
||||
}
|
||||
|
||||
if (avatarSeed.length > 0 && !imageError) {
|
||||
return (
|
||||
<div className="relative" style={{ width: `${size}px`, height: `${size}px` }}>
|
||||
{!imageLoaded && (
|
||||
<Skeleton className="rounded-full" style={{ width: `${size}px`, height: `${size}px` }} />
|
||||
)}
|
||||
|
||||
<img
|
||||
style={{
|
||||
width: `${size}px`,
|
||||
height: `${size}px`,
|
||||
display: imageLoaded ? 'block' : 'none',
|
||||
}}
|
||||
className={`rounded-full ${className}`}
|
||||
src={imageSrc}
|
||||
alt={altText}
|
||||
onLoad={handleImageLoad}
|
||||
onError={handleImageError}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
if (imageError && showDefaultWhenEmpty) {
|
||||
return <DefaultAvatar />;
|
||||
}
|
||||
|
||||
return null;
|
||||
};
|
||||
|
||||
export default Avatar;
|
||||
|
|
@ -33,6 +33,7 @@ export * from './Resizable';
|
|||
export * from './Select';
|
||||
export { default as Radio } from './Radio';
|
||||
export { default as Badge } from './Badge';
|
||||
export { default as Avatar } from './Avatar';
|
||||
export { default as Combobox } from './Combobox';
|
||||
export { default as Dropdown } from './Dropdown';
|
||||
export { default as SplitText } from './SplitText';
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue