Skip to content
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

Jump to bottom

Update Avatar to new design spec #56

Merged
merged 5 commits into from
Aug 9, 2023
Merged

Update Avatar to new design spec #56

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
293fcfd
Update avatar to new design spec
Aug 9, 2023
9513bca
Make avatar component use forward ref
Aug 9, 2023
1760a85
Allow all span props onto the avatar component
Aug 9, 2023
0bdae8f
Expose onError callback
Aug 9, 2023
4948c8b
Adjust font weight and font size
Aug 9, 2023
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
41 changes: 18 additions & 23 deletions src/components/Avatar/Avatar.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,80 +16,75 @@ limitations under the License.

.avatar {
display: inline-block;
aspect-ratio: 1 / 1;
width: var(--cpd-avatar-size);
box-sizing: border-box;
line-height: var(--cpd-avatar-size);
text-align: center;
font-size: min(calc(var(--cpd-avatar-size) * 0.75), 60px);
border-radius: var(--cpd-avatar-radius);
text-transform: uppercase;
speak: none;
pointer-events: none;
font-weight: normal;
overflow: hidden;
user-select: none;
}

img.avatar {
.avatar,
.image {
aspect-ratio: 1 / 1;
width: var(--cpd-avatar-size);
border-radius: var(--cpd-avatar-radius);
}

.image {
object-fit: cover;
overflow: hidden;
}

.avatar:not([src]) {
.avatar:not(:has(.image)) {
/* In the future we'd prefer to pass the HEX code as the data attr
and use `attr(data-color)` to avoid the style declaration from below
but this is currently not supported in all browsers */
background: var(--cpd-avatar-bg);
border: 1px solid var(--cpd-avatar-border);
color: var(--cpd-avatar-color);
}

.avatar[data-color] {
--cpd-avatar-bg: var(--cpd-color-blue-300);
--cpd-avatar-border: var(--cpd-color-blue-400);
--cpd-avatar-color: var(--cpd-color-blue-900);
--cpd-avatar-color: var(--cpd-color-blue-1200);
}

.avatar[data-color="2"] {
--cpd-avatar-bg: var(--cpd-color-fuchsia-300);
--cpd-avatar-border: var(--cpd-color-fuchsia-400);
--cpd-avatar-color: var(--cpd-color-fuchsia-900);
--cpd-avatar-color: var(--cpd-color-fuchsia-1200);
}

.avatar[data-color="3"] {
--cpd-avatar-bg: var(--cpd-color-green-300);
--cpd-avatar-border: var(--cpd-color-green-400);
--cpd-avatar-color: var(--cpd-color-green-900);
--cpd-avatar-color: var(--cpd-color-green-1200);
}

.avatar[data-color="4"] {
--cpd-avatar-bg: var(--cpd-color-pink-300);
--cpd-avatar-border: var(--cpd-color-pink-400);
--cpd-avatar-color: var(--cpd-color-pink-900);
--cpd-avatar-color: var(--cpd-color-pink-1200);
}

.avatar[data-color="5"] {
--cpd-avatar-bg: var(--cpd-color-orange-300);
--cpd-avatar-border: var(--cpd-color-orange-400);
--cpd-avatar-color: var(--cpd-color-orange-900);
--cpd-avatar-color: var(--cpd-color-orange-1200);
}

.avatar[data-color="6"] {
--cpd-avatar-bg: var(--cpd-color-cyan-300);
--cpd-avatar-border: var(--cpd-color-cyan-400);
--cpd-avatar-color: var(--cpd-color-cyan-900);
--cpd-avatar-color: var(--cpd-color-cyan-1200);
}

.avatar[data-color="7"] {
--cpd-avatar-bg: var(--cpd-color-purple-300);
--cpd-avatar-border: var(--cpd-color-purple-400);
--cpd-avatar-color: var(--cpd-color-purple-900);
--cpd-avatar-color: var(--cpd-color-purple-1200);
}

.avatar[data-color="8"] {
--cpd-avatar-bg: var(--cpd-color-lime-300);
--cpd-avatar-border: var(--cpd-color-lime-400);
--cpd-avatar-color: var(--cpd-color-lime-900);
--cpd-avatar-color: var(--cpd-color-lime-1200);
}

.avatar[data-type="round"] {
Expand Down
59 changes: 28 additions & 31 deletions src/components/Avatar/Avatar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,60 +15,57 @@ limitations under the License.
*/

import classnames from "classnames";
import React, { Suspense } from "react";
import React, { Suspense, forwardRef } from "react";
import { getInitialLetter } from "../../utils/string";
import { SuspenseImg } from "../../utils/SuspenseImg";
import styles from "./Avatar.module.css";
import { useIdColorHash } from "./useIdColorHash";

type AvatarProps = {
type AvatarProps = JSX.IntrinsicElements["span"] & {
src?: string;
id: string;
name: string;
type?: "square" | "round";
className?: string;
size?: CSSStyleDeclaration["height"];
};

export const Avatar: React.FC<AvatarProps> = ({
src,
id,
name = "",
type = "round",
className = "",
size,
}) => {
export const Avatar = forwardRef<HTMLSpanElement, AvatarProps>(function Avatar(
{ src, id, name = "", type = "round", className = "", size, ...props },
ref,
) {
const hash = useIdColorHash(id);
const style = {
"--cpd-avatar-size": size,
} as React.CSSProperties;
const imagelessAvatar = (
const fallbackInitial = <>{getInitialLetter(name)}</>;

return (
<span
ref={ref}
role="img"
title={id}
{...props}
aria-label=""
data-type={type}
data-color={hash}
className={classnames(styles.avatar, className)}
style={style}
title={id}
>
{getInitialLetter(name)}
{!src ? (
fallbackInitial
) : (
<Suspense fallback={fallbackInitial}>
<SuspenseImg
src={src}
className={classnames(styles.image, className)}
data-type={type}
style={style}
width={size}
height={size}
title={id}
/>
</Suspense>
)}
</span>
);

return !src ? (
imagelessAvatar
) : (
<Suspense fallback={imagelessAvatar}>
<SuspenseImg
src={src}
className={classnames(styles.avatar, className)}
data-type={type}
style={style}
width={size}
height={size}
title={id}
/>
</Suspense>
);
};
});