From 01d57deea1c53544ff1809d755df0e7f9b559e9f Mon Sep 17 00:00:00 2001
From: Ajay Bura <32841439+ajbura@users.noreply.github.com>
Date: Sun, 31 Aug 2025 08:18:10 +0530
Subject: [PATCH] Add arrow to message bubbles and improve spacing

---
 src/app/components/message/layout/Bubble.tsx  | 35 ++++++++++++-----
 .../components/message/layout/layout.css.ts   | 39 ++++++++++++++++++-
 src/app/features/room/message/Message.tsx     |  7 +++-
 src/app/features/room/message/styles.css.ts   |  3 ++
 4 files changed, 72 insertions(+), 12 deletions(-)

diff --git a/src/app/components/message/layout/Bubble.tsx b/src/app/components/message/layout/Bubble.tsx
index 6f8e70da..3e0a68dc 100644
--- a/src/app/components/message/layout/Bubble.tsx
+++ b/src/app/components/message/layout/Bubble.tsx
@@ -1,18 +1,35 @@
 import React, { ReactNode } from 'react';
+import classNames from 'classnames';
 import { Box, as } from 'folds';
 import * as css from './layout.css';
 
 type BubbleLayoutProps = {
+  self?: boolean;
   before?: ReactNode;
 };
 
-export const BubbleLayout = as<'div', BubbleLayoutProps>(({ before, children, ...props }, ref) => (
-  <Box gap="300" {...props} ref={ref}>
-    <Box className={css.BubbleBefore} shrink="No">
-      {before}
+export const BubbleLayout = as<'div', BubbleLayoutProps>(
+  ({ self, before, children, ...props }, ref) => (
+    <Box direction={self ? 'RowReverse' : 'Row'} gap="300" {...props} ref={ref}>
+      <Box className={css.BubbleBefore} shrink="No">
+        {before}
+      </Box>
+      <Box
+        className={classNames(
+          css.BubbleContent,
+          css.BubbleContentArrow,
+          self
+            ? {
+                [css.BubbleContentArrowRight]: !!before,
+              }
+            : {
+                [css.BubbleContentArrowLeft]: !!before,
+              }
+        )}
+        direction="Column"
+      >
+        {children}
+      </Box>
     </Box>
-    <Box className={css.BubbleContent} direction="Column">
-      {children}
-    </Box>
-  </Box>
-));
+  )
+);
diff --git a/src/app/components/message/layout/layout.css.ts b/src/app/components/message/layout/layout.css.ts
index 43949cef..89343d41 100644
--- a/src/app/components/message/layout/layout.css.ts
+++ b/src/app/components/message/layout/layout.css.ts
@@ -140,7 +140,44 @@ export const BubbleContent = style({
   padding: config.space.S200,
   backgroundColor: color.SurfaceVariant.Container,
   color: color.SurfaceVariant.OnContainer,
-  borderRadius: config.radii.R400,
+  borderRadius: config.radii.R500,
+  position: 'relative',
+});
+
+export const BubbleContentArrow = style({
+  selectors: {
+    '&::before': {
+      content: '',
+      display: 'inline-block',
+      background: 'inherit',
+      width: toRem(8),
+      height: toRem(8),
+      position: 'absolute',
+      transform: 'rotateZ(45deg)',
+    },
+  },
+});
+
+export const BubbleContentArrowLeft = style({
+  selectors: {
+    '&::before': {
+      left: toRem(-4),
+      top: config.radii.R500,
+      zIndex: 1,
+      borderBottomLeftRadius: toRem(2),
+    },
+  },
+});
+
+export const BubbleContentArrowRight = style({
+  selectors: {
+    '&::before': {
+      right: toRem(-4),
+      top: config.radii.R500,
+      zIndex: 1,
+      borderTopRightRadius: toRem(2),
+    },
+  },
 });
 
 export const Username = style({
diff --git a/src/app/features/room/message/Message.tsx b/src/app/features/room/message/Message.tsx
index fbe35770..a1556261 100644
--- a/src/app/features/room/message/Message.tsx
+++ b/src/app/features/room/message/Message.tsx
@@ -723,6 +723,7 @@ export const Message = as<'div', MessageProps>(
     const mx = useMatrixClient();
     const useAuthentication = useMediaAuthentication();
     const senderId = mEvent.getSender() ?? '';
+
     const [hover, setHover] = useState(false);
     const { hoverProps } = useHover({ onHoverChange: setHover });
     const { focusWithinProps } = useFocusWithin({ onFocusWithinChange: setHover });
@@ -746,7 +747,7 @@ export const Message = as<'div', MessageProps>(
       <Box
         gap="300"
         direction={messageLayout === MessageLayout.Compact ? 'RowReverse' : 'Row'}
-        justifyContent="SpaceBetween"
+        justifyContent={messageLayout === MessageLayout.Bubble ? undefined : 'SpaceBetween'}
         alignItems="Baseline"
         grow="Yes"
       >
@@ -875,7 +876,9 @@ export const Message = as<'div', MessageProps>(
 
     return (
       <MessageBase
-        className={classNames(css.MessageBase, className)}
+        className={classNames(css.MessageBase, className, {
+          [css.MessageBaseBubbleCollapsed]: messageLayout === MessageLayout.Bubble && collapse,
+        })}
         tabIndex={0}
         space={messageSpacing}
         collapse={collapse}
diff --git a/src/app/features/room/message/styles.css.ts b/src/app/features/room/message/styles.css.ts
index b87cb505..cd3c3bb7 100644
--- a/src/app/features/room/message/styles.css.ts
+++ b/src/app/features/room/message/styles.css.ts
@@ -4,6 +4,9 @@ import { DefaultReset, config, toRem } from 'folds';
 export const MessageBase = style({
   position: 'relative',
 });
+export const MessageBaseBubbleCollapsed = style({
+  paddingTop: 0,
+});
 
 export const MessageOptionsBase = style([
   DefaultReset,