Skip to content

Update GroupChannelProvider.tsx #1380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
danney-chun wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −2
Open

Update GroupChannelProvider.tsx #1380

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/modules/GroupChannel/context/GroupChannelProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,8 @@ const GroupChannelManager :React.FC<React.PropsWithChildren<GroupChannelProvider

const { isScrollBottomReached } = state;

const isAutoscrollMessageOverflowToTop = autoscrollMessageOverflowToTop ?? config.autoscrollMessageOverflowToTop ?? false;

// Configuration resolution
const resolvedReplyType = getCaseResolvedReplyType(moduleReplyType ?? config.groupChannel.replyType).upperCase;
const resolvedThreadReplySelectType = getCaseResolvedThreadReplySelectType(
Expand Down Expand Up @@ -227,7 +229,7 @@ const GroupChannelManager :React.FC<React.PropsWithChildren<GroupChannelProvider
// even though the next messages and the current messages length are the same.
// So added this condition to check if they are the same to prevent unnecessary calling scrollToBottom action
&& messages.length !== state.messages.length) {
if (!autoscrollMessageOverflowToTop) {
if (!isAutoscrollMessageOverflowToTop) {
setTimeout(async () => actions.scrollToBottom(true), 10);
} else {
actions.setNewMessageIds(messages.map(it => it.messageId));
Expand Down Expand Up @@ -347,7 +349,7 @@ const GroupChannelManager :React.FC<React.PropsWithChildren<GroupChannelProvider
isReactionEnabled: resolvedIsReactionEnabled,
isMessageGroupingEnabled,
isMultipleFilesMessageEnabled,
autoscrollMessageOverflowToTop: autoscrollMessageOverflowToTop ?? false,
autoscrollMessageOverflowToTop: autoscrollMessageOverflowToTop ?? config.autoscrollMessageOverflowToTop ?? false,
replyType: resolvedReplyType,
threadReplySelectType: resolvedThreadReplySelectType,
showSearchIcon: showSearchIcon ?? config.groupChannelSettings.enableMessageSearch,
Expand All @@ -364,6 +366,7 @@ const GroupChannelManager :React.FC<React.PropsWithChildren<GroupChannelProvider
disableMarkAsRead,
scrollBehavior,
config.groupChannelSettings.enableMessageSearch,
config.autoscrollMessageOverflowToTop,
]);

const scrollState = useMemo(() => ({
Expand Down