From 7b3c8c388f243ecd917aec57aff7468b7abe5d51 Mon Sep 17 00:00:00 2001 From: Liam Cho Date: Tue, 19 Nov 2024 16:33:57 +0900 Subject: [PATCH 1/2] fix --- src/ui/MessageContent/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ui/MessageContent/index.tsx b/src/ui/MessageContent/index.tsx index 433ad1cbc..4eb674124 100644 --- a/src/ui/MessageContent/index.tsx +++ b/src/ui/MessageContent/index.tsx @@ -1,4 +1,4 @@ -import React, { ReactElement, ReactNode, useMemo, useRef, useState } from 'react'; +import React, { ReactElement, ReactNode, useRef, useState } from 'react'; import format from 'date-fns/format'; import './index.scss'; @@ -213,7 +213,7 @@ export function MessageContent(props: MessageContentProps): ReactElement { return sum; }; - const totalBottom = useMemo(() => getTotalBottom(), []); + const totalBottom = getTotalBottom(); const onCloseFeedbackForm = () => { setShowFeedbackModal(false); From 587943e91a58b74ce55ff1e0668260c6ac98b91a Mon Sep 17 00:00:00 2001 From: Liam Cho Date: Wed, 20 Nov 2024 13:02:40 +0900 Subject: [PATCH 2/2] fix --- src/ui/MessageContent/index.tsx | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/ui/MessageContent/index.tsx b/src/ui/MessageContent/index.tsx index 4eb674124..44bc6499f 100644 --- a/src/ui/MessageContent/index.tsx +++ b/src/ui/MessageContent/index.tsx @@ -202,7 +202,7 @@ export function MessageContent(props: MessageContentProps): ReactElement { const showThreadReplies = isNotSpecialMessage && displayThreadReplies; const showRightContent = isNotSpecialMessage && !isByMe && !isMobile; - const getTotalBottom = (): number => { + const getTotalBottom = (): string => { let sum = 2; if (threadRepliesRef.current) { sum += 4 + threadRepliesRef.current.clientHeight; @@ -210,11 +210,9 @@ export function MessageContent(props: MessageContentProps): ReactElement { if (feedbackButtonsRef.current) { sum += 4 + feedbackButtonsRef.current.clientHeight; } - return sum; + return sum > 0 ? sum + 'px' : ''; }; - const totalBottom = getTotalBottom(); - const onCloseFeedbackForm = () => { setShowFeedbackModal(false); }; @@ -291,7 +289,7 @@ export function MessageContent(props: MessageContentProps): ReactElement { className: 'sendbird-message-content__left__avatar', isByMe, displayThreadReplies, - bottom: totalBottom > 0 ? totalBottom + 'px' : '', + bottom: getTotalBottom(), }) } {/* outgoing menu */}