Skip to content

Commit 7d2887e

Browse files
committed
Update GroupChannelProvider.tsx
1 parent eb42316 commit 7d2887e

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/modules/GroupChannel/context/GroupChannelProvider.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,8 @@ const GroupChannelManager :React.FC<React.PropsWithChildren<GroupChannelProvider
166166

167167
const { isScrollBottomReached } = state;
168168

169+
const isAutoscrollMessageOverflowToTop = autoscrollMessageOverflowToTop ?? config.autoscrollMessageOverflowToTop ?? false;
170+
169171
// Configuration resolution
170172
const resolvedReplyType = getCaseResolvedReplyType(moduleReplyType ?? config.groupChannel.replyType).upperCase;
171173
const resolvedThreadReplySelectType = getCaseResolvedThreadReplySelectType(
@@ -227,7 +229,7 @@ const GroupChannelManager :React.FC<React.PropsWithChildren<GroupChannelProvider
227229
// even though the next messages and the current messages length are the same.
228230
// So added this condition to check if they are the same to prevent unnecessary calling scrollToBottom action
229231
&& messages.length !== state.messages.length) {
230-
if (!autoscrollMessageOverflowToTop) {
232+
if (!isAutoscrollMessageOverflowToTop) {
231233
setTimeout(async () => actions.scrollToBottom(true), 10);
232234
} else {
233235
actions.setNewMessageIds(messages.map(it => it.messageId));
@@ -347,7 +349,7 @@ const GroupChannelManager :React.FC<React.PropsWithChildren<GroupChannelProvider
347349
isReactionEnabled: resolvedIsReactionEnabled,
348350
isMessageGroupingEnabled,
349351
isMultipleFilesMessageEnabled,
350-
autoscrollMessageOverflowToTop: autoscrollMessageOverflowToTop ?? false,
352+
autoscrollMessageOverflowToTop: autoscrollMessageOverflowToTop ?? config.autoscrollMessageOverflowToTop ?? false,
351353
replyType: resolvedReplyType,
352354
threadReplySelectType: resolvedThreadReplySelectType,
353355
showSearchIcon: showSearchIcon ?? config.groupChannelSettings.enableMessageSearch,
@@ -364,6 +366,7 @@ const GroupChannelManager :React.FC<React.PropsWithChildren<GroupChannelProvider
364366
disableMarkAsRead,
365367
scrollBehavior,
366368
config.groupChannelSettings.enableMessageSearch,
369+
config.autoscrollMessageOverflowToTop,
367370
]);
368371

369372
const scrollState = useMemo(() => ({

0 commit comments

Comments
 (0)