Skip to content

Fix/149/Avatar #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cksrlcks merged 2 commits into from
Feb 15, 2025
Merged

Fix/149/Avatar #150

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19c7721
🐛 fix : avatar 컴포넌트 개선
cksrlcks Feb 15, 2025
239f661
🐛 fix : default value 추가
cksrlcks Feb 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions src/components/ui/Avatar/Avatar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
'use client';

import { DEFAULT_COLORS } from '@/constants/colors';
import { cn, getColorByString } from '@/utils/helper';
import { cva, VariantProps } from 'class-variance-authority';
import Image from 'next/image';
import { HTMLAttributes, useState } from 'react';
import Image from 'next/image';
import { cva, VariantProps } from 'class-variance-authority';
import { cn, getColorByString } from '@/utils/helper';
import { DEFAULT_COLORS } from '@/constants/colors';
import { User } from '@/apis/users/types';

/**
* 커스터마이징 가능한 기본 공용 Avatar 컴포넌트입니다.
Expand Down Expand Up @@ -44,22 +45,20 @@ const avatarVariants = cva(
},
);

interface AvatarProps extends HTMLAttributes<HTMLDivElement>, VariantProps<typeof avatarVariants> {
email: string;
profileImageUrl?: string | null;
}
type AvatarProps = HTMLAttributes<HTMLDivElement> & VariantProps<typeof avatarVariants> & Partial<Pick<User, 'email' | 'nickname' | 'profileImageUrl'>>;

export default function Avatar({ email, profileImageUrl, size, className, ...props }: AvatarProps) {
export default function Avatar({ email, nickname, profileImageUrl, size, className, ...props }: AvatarProps) {
const [imgError, setImgError] = useState(false);
const colorCode = getColorByString(email, DEFAULT_COLORS);
const firstChar = email.charAt(0);
const fallback = email || nickname || 'user';
const colorCode = fallback ? getColorByString(fallback, DEFAULT_COLORS) : DEFAULT_COLORS[0];
const firstChar = fallback.charAt(0);

const isFallback = !profileImageUrl || imgError;

return (
<figure className={cn(avatarVariants({ size, className }))} {...props}>
{!isFallback ? (
<Image src={profileImageUrl} alt={email} fill onError={() => setImgError(true)} className='object-cover' />
<Image src={profileImageUrl} alt={fallback} fill onError={() => setImgError(true)} className='object-cover' />
) : (
<span className='flex aspect-square w-full items-center justify-center font-semibold uppercase text-white' style={{ backgroundColor: colorCode }}>
{firstChar}
Expand Down