Skip to content

Commit 43895d3

Browse files
authored
fix: show dialogs in thread message list (#2539)
1 parent d69b113 commit 43895d3

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

src/components/MessageList/MessageList.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,11 +221,13 @@ const MessageListWithContext = <
221221
}, [highlightedMessageId]);
222222

223223
const showEmptyStateIndicator = elements.length === 0 && !threadList;
224-
224+
const dialogManagerId = threadList
225+
? 'message-list-dialog-manager-thread'
226+
: 'message-list-dialog-manager';
225227
return (
226228
<MessageListContextProvider value={{ listElement, scrollToBottom }}>
227229
<MessageListMainPanel>
228-
<DialogManagerProvider id='message-list-dialog-manager'>
230+
<DialogManagerProvider id={dialogManagerId}>
229231
{!threadList && showUnreadMessagesNotification && (
230232
<UnreadMessagesNotification unreadCount={channelUnreadUiState?.unread_messages} />
231233
)}

src/components/MessageList/VirtualizedMessageList.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,10 +434,14 @@ const VirtualizedMessageListWithContext = <
434434

435435
if (!processedMessages) return null;
436436

437+
const dialogManagerId = threadList
438+
? 'virtualized-message-list-dialog-manager-thread'
439+
: 'virtualized-message-list-dialog-manager';
440+
437441
return (
438442
<>
439443
<MessageListMainPanel>
440-
<DialogManagerProvider id='virtualized-message-list-dialog-manager'>
444+
<DialogManagerProvider id={dialogManagerId}>
441445
{!threadList && showUnreadMessagesNotification && (
442446
<UnreadMessagesNotification unreadCount={channelUnreadUiState?.unread_messages} />
443447
)}

0 commit comments

Comments
 (0)