From 876b09b878a5bf1d8c8b5f14978c205b57394522 Mon Sep 17 00:00:00 2001
From: Puyodead1 <puyodead@proton.me>
Date: Sat, 9 Dec 2023 20:03:38 -0500
Subject: [PATCH] member list: add avatar

---
 src/components/MemberList/MemberList.tsx     | 10 ----
 src/components/MemberList/MemberListItem.tsx | 49 ++++++++++++++++----
 2 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/src/components/MemberList/MemberList.tsx b/src/components/MemberList/MemberList.tsx
index fefd085..6053968 100644
--- a/src/components/MemberList/MemberList.tsx
+++ b/src/components/MemberList/MemberList.tsx
@@ -19,13 +19,6 @@ const Container = styled.div`
 	}
 `;
 
-const Wrapper = styled.aside`
-	justify-content: center;
-	min-width: 240px;
-	max-height: 100%;
-	display: flex;
-`;
-
 const List = styled.ul`
 	padding: 0;
 	margin: 0;
@@ -62,9 +55,6 @@ function MemberList() {
 							<ListSection
 								key={i}
 								name={category.name}
-								// items={
-								// 	category.items.map((x) => x.nick ?? x.user?.username).filter((x) => x) as string[]
-								// }
 								items={category.items.map((x) => (
 									<MemberListItem item={x} />
 								))}
diff --git a/src/components/MemberList/MemberListItem.tsx b/src/components/MemberList/MemberListItem.tsx
index 68ed778..cb53f71 100644
--- a/src/components/MemberList/MemberListItem.tsx
+++ b/src/components/MemberList/MemberListItem.tsx
@@ -5,6 +5,7 @@ import { PopoutContext } from "../../contexts/PopoutContext";
 import { useAppStore } from "../../stores/AppStore";
 import GuildMember from "../../stores/objects/GuildMember";
 import ContextMenus from "../../utils/ContextMenus";
+import Avatar from "../Avatar";
 import { IContextMenuItem } from "../ContextMenuItem";
 import UserProfilePopout from "../UserProfilePopout";
 
@@ -13,14 +14,20 @@ const ListItem = styled.div<{ isCategory?: boolean }>`
 	cursor: pointer;
 `;
 
-const Wrapper = styled.div`
-	margin-left: 8px;
-	height: 33px;
-	border-radius: 4px;
-	align-items: center;
-	display: flex;
-	padding: 0 8px;
+const Container = styled.div`
+	max-width: 224px;
 	background-color: transparent;
+	box-sizing: border-box;
+	padding: 1px 0;
+	border-radius: 4px;
+`;
+
+const Wrapper = styled.div`
+	display: flex;
+	align-items: center;
+	border-radius: 4px;
+	height: 42px;
+	padding: 0 8px;
 
 	&:hover {
 		background-color: var(--background-primary-alt);
@@ -34,6 +41,21 @@ const Text = styled.span<{ color?: string }>`
 	color: ${(props) => props.color ?? "var(--text-secondary)"};
 `;
 
+const TextWrapper = styled.div`
+	min-width: 0;
+	flex: 1;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+`;
+
+const AvatarWrapper = styled.div`
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin-right: 12px;
+`;
+
 interface Props {
 	item: GuildMember;
 }
@@ -62,9 +84,16 @@ function MemberListItem({ item }: Props) {
 				});
 			}}
 		>
-			<Wrapper>
-				<Text color={item.roleColor}>{item.nick ?? item.user?.username}</Text>
-			</Wrapper>
+			<Container>
+				<Wrapper>
+					<AvatarWrapper>
+						<Avatar user={item.user!} size={32} />
+					</AvatarWrapper>
+					<TextWrapper>
+						<Text color={item.roleColor}>{item.nick ?? item.user?.username}</Text>
+					</TextWrapper>
+				</Wrapper>
+			</Container>
 		</ListItem>
 	);
 }