Skip to content

feat(ListItemAvatar): support Avatar props #2560

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −4
Open

feat(ListItemAvatar): support Avatar props #2560

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 14 additions & 4 deletions packages/core/src/components/ListItemAvatar/ListItemAvatar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import React, { forwardRef, useRef } from "react";
import cx from "classnames";
import useMergeRef from "../../hooks/useMergeRef";
import { VibeComponent, VibeComponentProps, withStaticProps } from "../../types";
import Avatar from "../Avatar/Avatar";
import { VibeComponent, withStaticProps } from "../../types";
import Avatar, { AvatarProps } from "../Avatar/Avatar";
import { ListItemComponentType } from "../ListItem/ListItemConstants";
import styles from "./ListItemAvatar.module.scss";

export interface ListItemAvatarProps extends VibeComponentProps {
export interface ListItemAvatarProps extends AvatarProps {
/**
* the ListItem component [li, div, a]
*/
Expand All @@ -16,7 +16,16 @@ export interface ListItemAvatarProps extends VibeComponentProps {
}

const ListItemAvatar: VibeComponent<ListItemAvatarProps> & { components?: typeof ListItemComponentType } = forwardRef(
({ className, id, src, avatarClassName, component: Component = ListItemAvatar.components.DIV }, ref) => {
(props, ref) => {
const {
className,
id,
src,
avatarClassName,
component: Component = ListItemAvatar.components.DIV,
...avatarProps
} = props;

const componentRef = useRef(null);
const mergedRef = useMergeRef(ref, componentRef);

Expand All @@ -27,6 +36,7 @@ const ListItemAvatar: VibeComponent<ListItemAvatarProps> & { components?: typeof
type={Avatar.types.IMG}
size={Avatar.sizes.SMALL}
className={cx(styles.avatar, avatarClassName)}
{...avatarProps}
Copy link
Contributor Author

@naorpeled naorpeled Oct 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should I omit className and id as they're applied to the Component?

Copy link
Member

@talkor talkor Oct 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They are already omitted while spreading the props so no need

Copy link
Contributor Author

@naorpeled naorpeled Oct 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, you're absolutely right, my bad 🤦

/>
</Component>
);
Expand Down