From 6517a4b185c46fd4e7fc544bd3cf2b8ac3521bf7 Mon Sep 17 00:00:00 2001
From: Eric85710 <ericchen87887@gmail.com>
Date: Sat, 6 Jun 2026 16:15:11 +0800
Subject: [PATCH] dm-86

---
 .../Message/UI/Detail/Message_Messaging.kt     | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/example/login_v3/home/Message/UI/Detail/Message_Messaging.kt b/app/src/main/java/com/example/login_v3/home/Message/UI/Detail/Message_Messaging.kt
index c013d49..83bd5b4 100644
--- a/app/src/main/java/com/example/login_v3/home/Message/UI/Detail/Message_Messaging.kt
+++ b/app/src/main/java/com/example/login_v3/home/Message/UI/Detail/Message_Messaging.kt
@@ -426,11 +426,7 @@ fun MessageRow(
         modifier = Modifier
             .fillMaxWidth()
             .then(if (isHighlight) Modifier.background(Color(0x33FF9800), RoundedCornerShape(12.dp)) else Modifier)
-            // 💡 讓使用者長按整條訊息就能觸發回覆
-            .combinedClickable(
-                onLongClick = { onReplyClick(message) }, // 長按 -> 喚起 ActionMenu
-                onClick = { onRowClick(message) }       // 單擊 -> 喚起 EmojiMenu
-            ),
+        ,
         horizontalArrangement = if (isMe) Arrangement.End else Arrangement.Start
     ) {
         if (!isMe) {
@@ -446,14 +442,20 @@ fun MessageRow(
             Box(
                 modifier = Modifier
                     .widthIn(max = 280.dp)
-                    .background(
-                        color = bubbleColor, // 💡 使用動態計算的背景色
-                        shape = RoundedCornerShape(
+                    // 💡 重點修正：將點擊/長按事件移到這裡，範圍只侷限在氣泡內
+                    // 注意：剪裁形狀（clip）建議放在點擊事件前或與形狀同步，確保點擊時的水波紋（Indication）不會超出圓角
+                    .clip(
+                        RoundedCornerShape(
                             topStart = 12.dp, topEnd = 12.dp,
                             bottomStart = if (isMe) 12.dp else 0.dp,
                             bottomEnd = if (isMe) 0.dp else 12.dp
                         )
                     )
+                    .combinedClickable(
+                        onLongClick = { onReplyClick(message) },
+                        onClick = { onRowClick(message) }
+                    )
+                    .background(color = bubbleColor)
                     .padding(horizontal = 12.dp, vertical = 8.dp)
             ) {
                 Column {