From f7bd603978b4d7981b4f0095bd3532a4ffc39d5a Mon Sep 17 00:00:00 2001
From: Arjun Mahanti <arjun@squareup.com>
Date: Thu, 10 Sep 2026 10:32:50 -0700
Subject: [PATCH] Preserve bubble layout and pointer handling after main update

Signed-off-by: Arjun Mahanti <arjun@squareup.com>
---
 desktop/src/features/messages/ui/MessageActionBar.tsx  |  2 +-
 .../src/features/messages/ui/MessageBubbleLayout.tsx   |  2 +-
 desktop/src/features/messages/ui/MessageRow.tsx        | 10 +++++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/desktop/src/features/messages/ui/MessageActionBar.tsx b/desktop/src/features/messages/ui/MessageActionBar.tsx
index 082cb0b126..d754c0d55e 100644
--- a/desktop/src/features/messages/ui/MessageActionBar.tsx
+++ b/desktop/src/features/messages/ui/MessageActionBar.tsx
@@ -510,7 +510,7 @@ export const MessageActionBar = React.memo(function MessageActionBar({
     <div
       className={cn(
         "-m-1 p-1 transition-opacity duration-150 ease-out",
-        "opacity-100 sm:pointer-events-none sm:opacity-0",
+        "pointer-events-auto opacity-100 sm:pointer-events-none sm:opacity-0",
         "sm:group-hover/message:pointer-events-auto sm:group-hover/message:opacity-100",
         "sm:group-focus-within/message:pointer-events-auto sm:group-focus-within/message:opacity-100",
         isReactionPickerOpen || isDropdownOpen
diff --git a/desktop/src/features/messages/ui/MessageBubbleLayout.tsx b/desktop/src/features/messages/ui/MessageBubbleLayout.tsx
index 2178bf36bf..e0bfc65e40 100644
--- a/desktop/src/features/messages/ui/MessageBubbleLayout.tsx
+++ b/desktop/src/features/messages/ui/MessageBubbleLayout.tsx
@@ -117,7 +117,7 @@ export function MessageBubbleLayout({
               style={{ right: -8 - actionShift }}
               data-testid="bubble-actions-anchor"
               className={cn(
-                "absolute -right-2 bottom-full z-20",
+                "pointer-events-none absolute -right-2 bottom-full z-20",
                 reactions ? "mb-5" : "translate-y-[4px]",
               )}
             >
diff --git a/desktop/src/features/messages/ui/MessageRow.tsx b/desktop/src/features/messages/ui/MessageRow.tsx
index 1850ac8660..09718e4aed 100644
--- a/desktop/src/features/messages/ui/MessageRow.tsx
+++ b/desktop/src/features/messages/ui/MessageRow.tsx
@@ -681,9 +681,13 @@ export const MessageRow = React.memo(
       ) : null;
 
     const headerNode = isDisplayedAsContinuation ? null : (
-      // pe reserves the measured action-rail footprint (0px until measured) so
-      // header content ends before the rail's left edge in every rail state.
-      <MessageHeaderRow className="pe-[var(--message-action-rail-width,0px)]">
+      // Standard rows reserve the action rail's width. Bubble controls sit
+      // above the bubble, so their headers do not need that reservation.
+      <MessageHeaderRow
+        className={
+          bubbleLayout ? undefined : "pe-[var(--message-action-rail-width,0px)]"
+        }
+      >
         {message.pubkey ? (
           <MessageAuthorWithIndicators
             authorName={message.author}