From ea74c1609a540a95270627c5c04f82f48ff8e980 Mon Sep 17 00:00:00 2001
From: Puyodead1 <puyodead@proton.me>
Date: Sun, 24 Dec 2023 12:40:18 -0500
Subject: [PATCH] open user popout on mention click

---
 src/components/floating/FloatingTrigger.tsx |  4 +-
 src/components/markdown/Mention.tsx         | 65 ++++++++-------------
 2 files changed, 27 insertions(+), 42 deletions(-)

diff --git a/src/components/floating/FloatingTrigger.tsx b/src/components/floating/FloatingTrigger.tsx
index 53eb010..88c728c 100644
--- a/src/components/floating/FloatingTrigger.tsx
+++ b/src/components/floating/FloatingTrigger.tsx
@@ -28,9 +28,9 @@ export default React.forwardRef<HTMLElement, React.HTMLProps<HTMLElement> & Popo
 		}
 
 		return (
-			<div ref={ref} data-state={context.open ? "open" : "closed"} {...context.getReferenceProps(props)}>
+			<span ref={ref} data-state={context.open ? "open" : "closed"} {...context.getReferenceProps(props)}>
 				{children}
-			</div>
+			</span>
 		);
 	},
 );
diff --git a/src/components/markdown/Mention.tsx b/src/components/markdown/Mention.tsx
index 903702d..e09ec65 100644
--- a/src/components/markdown/Mention.tsx
+++ b/src/components/markdown/Mention.tsx
@@ -6,8 +6,10 @@ import Channel from "../../stores/objects/Channel";
 import Role from "../../stores/objects/Role";
 import User from "../../stores/objects/User";
 import { hexToRGB, rgbToHsl } from "../../utils/Utils";
+import Floating from "../floating/Floating";
+import FloatingTrigger from "../floating/FloatingTrigger";
 
-const Container = styled.span<{ color?: string; withHover?: boolean }>`
+const MentionText = styled.span<{ color?: string; withHover?: boolean }>`
 	padding: 0 2px;
 	border-radius: 4px;
 	background-color: hsl(${(props) => props.color ?? "var(--primary-hsl)"} / 0.3);
@@ -28,12 +30,6 @@ interface MentionProps {
 function UserMention({ id }: MentionProps) {
 	const app = useAppStore();
 	const [user, setUser] = React.useState<User | null>(null);
-	const ref = React.useRef<HTMLDivElement>(null);
-
-	const click = (e: React.MouseEvent) => {
-		e.preventDefault();
-		e.stopPropagation();
-	};
 
 	React.useEffect(() => {
 		const getUser = async () => {
@@ -47,17 +43,20 @@ function UserMention({ id }: MentionProps) {
 
 	console.log(user);
 
-	if (!user)
-		return (
-			<Container ref={ref}>
-				<span>@{id}</span>
-			</Container>
-		);
+	if (!user) return <MentionText>@{id}</MentionText>;
 
 	return (
-		<Container onClick={click} ref={ref} withHover>
-			<span>@{user.username}</span>
-		</Container>
+		<Floating
+			type="userPopout"
+			placement="right"
+			props={{
+				user,
+			}}
+		>
+			<FloatingTrigger>
+				<MentionText withHover>@{user.username}</MentionText>
+			</FloatingTrigger>
+		</Floating>
 	);
 }
 
@@ -66,7 +65,7 @@ function ChannelMention({ id }: MentionProps) {
 	const [channel, setChannel] = React.useState<Channel | null>(null);
 	const navigate = useNavigate();
 
-	const click = () => {
+	const onClick = () => {
 		if (!channel) return;
 		if (!channel.isGuildTextChannel) return;
 		navigate(`/channels/${channel.guildId}/${channel.id}`);
@@ -77,17 +76,12 @@ function ChannelMention({ id }: MentionProps) {
 		if (channel) setChannel(channel);
 	}, [id]);
 
-	if (!channel)
-		return (
-			<Container>
-				<span>#{id}</span>
-			</Container>
-		);
+	if (!channel) return <MentionText>#{id}</MentionText>;
 
 	return (
-		<Container onClick={click} withHover>
-			<span>#{channel.name}</span>
-		</Container>
+		<MentionText withHover onClick={onClick}>
+			#{channel.name}
+		</MentionText>
 	);
 }
 
@@ -110,26 +104,17 @@ function RoleMention({ id }: MentionProps) {
 		setColor(rgbToHsl(rgb.r, rgb.g, rgb.b));
 	}, [role]);
 
-	if (!role)
-		return (
-			<Container>
-				<span>@unknown-role</span>
-			</Container>
-		);
+	if (!role) return <MentionText>@unknown-role</MentionText>;
 
 	return (
-		<Container color={color}>
-			<span>@{role.name}</span>
-		</Container>
+		<MentionText color={color} withHover>
+			@{role.name}
+		</MentionText>
 	);
 }
 
 function CustomMention({ id }: MentionProps) {
-	return (
-		<Container>
-			<span>{id}</span>
-		</Container>
-	);
+	return <MentionText>{id}</MentionText>;
 }
 
 interface Props {