diff --git a/app/components/Facepile.tsx b/app/components/Facepile.tsx index 1085559872..f684f78fd9 100644 --- a/app/components/Facepile.tsx +++ b/app/components/Facepile.tsx @@ -16,11 +16,11 @@ type Props = { /** The maximum number of users to display, defaults to 8 */ limit?: number; /** A component to render the avatar, defaults to Avatar. */ - renderAvatar?: ( - props: React.ComponentProps & { + renderAvatar?: React.ComponentType< + React.ComponentProps & { model: User; } - ) => React.ReactNode; + >; }; function Facepile({ @@ -32,6 +32,7 @@ function Facepile({ ...rest }: Props) { const filtered = users.filter(Boolean).slice(-limit); + const Component = renderAvatar; return ( @@ -43,16 +44,21 @@ function Facepile({ )} {filtered.map((model, index) => { const lastChild = index === 0 && overflow <= 0; - return renderAvatar({ - model, - size, - style: { - marginRight: lastChild ? 0 : -4, - ...(lastChild || filtered.length === 1 - ? {} - : { clipPath: `url(#${clipPathId(size)})` }), - }, - }); + return ( + + ); })} diff --git a/app/scenes/Collection/components/MembershipPreview.tsx b/app/scenes/Collection/components/MembershipPreview.tsx index 6811c72319..6bbedbab6c 100644 --- a/app/scenes/Collection/components/MembershipPreview.tsx +++ b/app/scenes/Collection/components/MembershipPreview.tsx @@ -44,10 +44,10 @@ const MembershipPreview = ({ collection, limit = 8 }: Props) => { groupMemberships.fetchPage(options), ]); if (users[PAGINATION_SYMBOL]) { - setUsersCount(users[PAGINATION_SYMBOL].total); + setUsersCount(users[PAGINATION_SYMBOL].total ?? 0); } if (groups[PAGINATION_SYMBOL]) { - setGroupsCount(groups[PAGINATION_SYMBOL].total); + setGroupsCount(groups[PAGINATION_SYMBOL].total ?? 0); } } finally { setIsLoading(false);