Skip to content

Commit cd3f10f

Browse files
authored
Merge branch 'main' into release/v3.15.11
2 parents 1068190 + 146ba9c commit cd3f10f

File tree

1 file changed

+8
-1
lines changed
  • src/modules/GroupChannel/components/MessageList

1 file changed

+8
-1
lines changed

src/modules/GroupChannel/components/MessageList/index.tsx

+8-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { GroupChannelUIBasicProps } from '../GroupChannelUI/GroupChannelUIView';
1919
import { deleteNullish } from '../../../../utils/utils';
2020
import { getMessagePartsInfo } from './getMessagePartsInfo';
2121
import { MessageProvider } from '../../../Message/context/MessageProvider';
22-
import { getComponentKeyFromMessage } from '../../context/utils';
22+
import { getComponentKeyFromMessage, isContextMenuClosed } from '../../context/utils';
2323
import { InfiniteList } from './InfiniteList';
2424

2525
export interface GroupChannelMessageListProps {
@@ -225,13 +225,20 @@ export const MessageList = (props: GroupChannelMessageListProps) => {
225225

226226
const TypingIndicatorBubbleWrapper = (props: { handleScroll: () => void; channelUrl: string }) => {
227227
const { stores } = useSendbirdStateContext();
228+
const { isScrollBottomReached, scrollPubSub } = useGroupChannelContext();
228229
const [typingMembers, setTypingMembers] = useState<Member[]>([]);
229230

230231
useGroupChannelHandler(stores.sdkStore.sdk, {
231232
onTypingStatusUpdated(channel) {
232233
if (channel.url === props.channelUrl) {
233234
setTypingMembers(channel.getTypingUsers());
234235
}
236+
237+
if (isScrollBottomReached && isContextMenuClosed()) {
238+
setTimeout(() => {
239+
scrollPubSub.publish('scrollToBottom', {});
240+
}, 10);
241+
}
235242
},
236243
});
237244

0 commit comments

Comments
 (0)