From 0915ef92835a99d620bc4d919f681851fdb6b615 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=8B=AC=EC=9E=AC=EC=97=BD?= <jysim0326@ajou.ac.kr>
Date: Mon, 9 Dec 2024 23:11:12 +0900
Subject: [PATCH] =?UTF-8?q?refactor:=20=EC=8B=9C=EA=B0=84=20=ED=91=9C?=
=?UTF-8?q?=EC=8B=9C=20=EB=A1=9C=EC=A7=81=20/=20=EB=B6=84=20=EB=8B=A8?=
=?UTF-8?q?=EC=9C=84=20=EA=B5=AC=EB=B6=84=20=EB=A1=9C=EC=A7=81=20=EC=88=98?=
=?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/ChattingDetail.jsx | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/components/ChattingDetail.jsx b/src/components/ChattingDetail.jsx
index ec503bb..973f1d4 100644
--- a/src/components/ChattingDetail.jsx
+++ b/src/components/ChattingDetail.jsx
@@ -945,14 +945,15 @@ function ChattingDetail() {
}
);
- // const prevMessageTime =
- // prevMessage &&
- // new Date(prevMessage.timestamp).toLocaleTimeString([], {
- // hour: "2-digit",
- // minute: "2-digit",
- // });
-
- // const isNewMinute = !prevMessage || messageTime !== prevMessageTime;
+ const prevMessageTime =
+ prevMessage &&
+ new Date(prevMessage.timestamp).toLocaleTimeString([], {
+ hour: "2-digit",
+ minute: "2-digit",
+ });
+
+ // 새로운 분 단위 메시지인지 확인
+ const isNewMinute = !prevMessage || messageTime !== prevMessageTime;
const isLastMessageInGroup = !sameSenderAsNext;
const isDifferentUserFromPrev = !sameSenderAsPrev;
@@ -966,6 +967,7 @@ function ChattingDetail() {
return (
<div key={index}>
+ {/* 이전 사용자와 다르거나 분이 달라지면 이름 표시 */}
{isDifferentUserFromPrev && !isMine && (
<strong
style={{
@@ -1021,8 +1023,8 @@ function ChattingDetail() {
{unreadCountValue > 0 && `${unreadCountValue}`}
</span>
</div>
-
- {isLastMessageInGroup && (
+ {/* 분 단위가 다르면 시간 표시 */}
+ {(isNewMinute || isLastMessageInGroup) && (
<MessageTimestamp isMine={isMine}>
{messageTime}
</MessageTimestamp>
--
GitLab