@@ -5,13 +5,11 @@ import type { ItemProps, ListItem } from 'react-virtuoso';
55
66import { EmptyStateIndicator as DefaultEmptyStateIndicator } from '../EmptyStateIndicator' ;
77import { LoadingIndicator as DefaultLoadingIndicator } from '../Loading' ;
8- import { isMessageEdited , Message } from '../Message' ;
8+ import { Message } from '../Message' ;
99
1010import { useComponentContext } from '../../context' ;
11- import { getIsFirstUnreadMessage , isDateSeparatorMessage , isIntroMessage } from './utils' ;
12-
13- import type { LocalMessage } from 'stream-chat' ;
1411import type { GroupStyle , RenderedMessage } from './utils' ;
12+ import { getIsFirstUnreadMessage , isDateSeparatorMessage , isIntroMessage } from './utils' ;
1513import type { VirtuosoContext } from './VirtualizedMessageList' ;
1614import type { UnknownType } from '../../types/types' ;
1715
@@ -131,7 +129,6 @@ export const messageRenderer = (
131129 reactionDetailsSort,
132130 renderText,
133131 returnAllReadData,
134- shouldGroupByUser,
135132 showAvatar,
136133 sortReactionDetails,
137134 sortReactions,
@@ -161,27 +158,6 @@ export const messageRenderer = (
161158 return MessageSystem ? < MessageSystem message = { message } /> : null ;
162159 }
163160
164- const maybePrevMessage = messageList [ streamMessageIndex - 1 ] as
165- | LocalMessage
166- | undefined ;
167- const maybeNextMessage = messageList [ streamMessageIndex + 1 ] as
168- | LocalMessage
169- | undefined ;
170- const groupedByUser =
171- shouldGroupByUser &&
172- streamMessageIndex > 0 &&
173- message . user ?. id === maybePrevMessage ?. user ?. id ;
174-
175- // FIXME: firstOfGroup & endOfGroup should be derived from groupStyles which apply a more complex logic
176- const firstOfGroup =
177- shouldGroupByUser &&
178- ( message . user ?. id !== maybePrevMessage ?. user ?. id ||
179- ( maybePrevMessage && isMessageEdited ( maybePrevMessage ) ) ) ;
180-
181- const endOfGroup =
182- shouldGroupByUser &&
183- ( message . user ?. id !== maybeNextMessage ?. user ?. id || isMessageEdited ( message ) ) ;
184-
185161 const isFirstUnreadMessage = getIsFirstUnreadMessage ( {
186162 firstUnreadMessageId,
187163 isFirstMessage : streamMessageIndex === 0 ,
@@ -204,10 +180,7 @@ export const messageRenderer = (
204180 autoscrollToBottom = { virtuosoRef . current ?. autoscrollToBottom }
205181 closeReactionSelectorOnClick = { closeReactionSelectorOnClick }
206182 deliveredTo = { ownMessagesDeliveredToOthers [ message . id ] || [ ] }
207- endOfGroup = { endOfGroup }
208- firstOfGroup = { firstOfGroup }
209183 formatDate = { formatDate }
210- groupedByUser = { groupedByUser }
211184 groupStyles = { [ messageGroupStyles [ message . id ] ?? '' ] }
212185 lastOwnMessage = { lastOwnMessage }
213186 lastReceivedId = { lastReceivedMessageId }
0 commit comments