Skip to content

Commit ef3a2a7

Browse files
committed
fix: resolve conflicts from V7 branch
1 parent 96e9401 commit ef3a2a7

File tree

1 file changed

+31
-15
lines changed

1 file changed

+31
-15
lines changed

package/src/components/MessageList/hooks/useMessageList.ts

Lines changed: 31 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -63,21 +63,37 @@ export const useMessageList = (params: UseMessageListParams) => {
6363
userID: client.userID,
6464
});
6565

66-
const dateSeparators = getDateSeparators({
67-
deletedMessagesVisibilityType,
68-
hideDateSeparators,
69-
messages: messageList,
70-
userId: client.userID,
71-
});
72-
73-
const messageGroupStyles = getMessagesGroupStyles({
74-
dateSeparators,
75-
hideDateSeparators,
76-
maxTimeBetweenGroupedMessages,
77-
messages: messageList,
78-
noGroupByUser,
79-
userId: client.userID,
80-
});
66+
const dateSeparators = useMemo(
67+
() =>
68+
getDateSeparators({
69+
deletedMessagesVisibilityType,
70+
hideDateSeparators,
71+
messages: messageList,
72+
userId: client.userID,
73+
}),
74+
[deletedMessagesVisibilityType, hideDateSeparators, messageList, client.userID],
75+
);
76+
77+
const messageGroupStyles = useMemo(
78+
() =>
79+
getMessagesGroupStyles({
80+
dateSeparators,
81+
hideDateSeparators,
82+
maxTimeBetweenGroupedMessages,
83+
messages: messageList,
84+
noGroupByUser,
85+
userId: client.userID,
86+
}),
87+
[
88+
getMessagesGroupStyles,
89+
dateSeparators,
90+
hideDateSeparators,
91+
maxTimeBetweenGroupedMessages,
92+
messageList,
93+
noGroupByUser,
94+
client.userID,
95+
],
96+
);
8197

8298
const processedMessageList = useMemo<LocalMessage[]>(() => {
8399
const newMessageList = [];

0 commit comments

Comments
 (0)