cetirizine

commit 8400f0f66fe8136508e917f3869d9c88be6732b2
parent a5cae6abaa70e5fa12e31734450af097e38250ab
Author: MTRNord <mtrnord1@gmail.com>
Date:   Fri,  5 May 2023 02:01:27 +0200

Fix message rendering

Diffstat:
M
src/components/events/messageEvent.tsx
 | 
10
+++++-----
M
src/pages/MainPage.tsx
 | 
2
+-

2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/components/events/messageEvent.tsx b/src/components/events/messageEvent.tsx
@@ -98,15 +98,15 @@ const MessageEvent: FC<MessageEventProps> = memo(({ event, roomID, hasPreviousEv
                 )
             } else {
                 return (
-                    <div className="flex flex-row gap-4 p-2 hover:bg-gray-200 rounded-md duration-200 ease-in-out items-start">
-                        <Avatar
+                    <div className={!hasPreviousEvent ? "flex flex-row gap-4 p-2 pb-1 hover:bg-gray-200 rounded-md duration-200 ease-in-out items-start" : "flex flex-row p-2 pt-0 hover:bg-gray-200 rounded-md duration-200 ease-in-out"}>
+                        {!hasPreviousEvent && <Avatar
                             displayname={room?.getMemberName(event.sender) || ""}
                             avatarUrl={room?.getMemberAvatar(event.sender)}
                             online={room?.isOnline() || false}
                             dm={room?.isDM() || false}
-                        />
-                        <div className="flex flex-col gap-2">
-                            <h2 className="text-sm font-medium text-red-500 whitespace-normal">{room?.getMemberName(event.sender)}</h2>
+                        />}
+                        <div className={!hasPreviousEvent ? "flex flex-col gap-1" : "ml-[3.7rem]"}>
+                            {!hasPreviousEvent && <h2 className="text-sm font-medium text-red-500 whitespace-normal">{room?.getMemberName(event.sender)}</h2>}
                             <Linkify options={linkifyOptions} as='p' className="whitespace-normal text-black text-base font-normal">{event.content.body}</Linkify>
                         </div>
                     </div>
diff --git a/src/pages/MainPage.tsx b/src/pages/MainPage.tsx
@@ -59,7 +59,7 @@ const ChatView: FC<ChatViewProps> = memo(({ roomID, scrollRef }) => {
 
     // Map events to components but also tell components if the previous event was from the same sender and which type it was
     const renderedEvents = dedupedEvents?.filter(event => event.type !== "m.reaction").map((event, index) => {
-        const previousEvent = dedupedEvents[index - 1];
+        const previousEvent = dedupedEvents?.filter(event => event.type !== "m.reaction")[index - 1];
         const previousEventIsFromSameSender = previousEvent?.sender === event.sender;
         const previousEventType = previousEvent?.type;