Skip to content

Commit d45d7b8

Browse files
authored
fix: mentionTemplate should be passed when mapped to sendMessage (#971)
## Description `mentionedMessageTemplate ` should be passed to `sendMessage` ticket: [CLNP-2261] [CLNP-2261]: https://sendbird.atlassian.net/browse/CLNP-2261?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
1 parent a2447fa commit d45d7b8

File tree

2 files changed

+22
-18
lines changed
  • src/modules
    • Channel/components/MessageInputWrapper
    • GroupChannel/components/MessageInputWrapper

2 files changed

+22
-18
lines changed

src/modules/Channel/components/MessageInputWrapper/index.tsx

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import React from 'react';
2-
import type { FileMessageCreateParams } from '@sendbird/chat/message';
32

4-
import { getSuggestedReplies, SendableMessageType } from '../../../../utils';
3+
import { getSuggestedReplies } from '../../../../utils';
54
import MessageInputWrapperView from '../../../GroupChannel/components/MessageInputWrapper/MessageInputWrapperView';
65
import { useChannelContext } from '../../context/ChannelProvider';
76
import useSendbirdStateContext from '../../../../hooks/useSendbirdStateContext';
@@ -19,8 +18,9 @@ export const MessageInputWrapper = (props: MessageInputWrapperProps) => {
1918
const { config } = useSendbirdStateContext();
2019
const context = useChannelContext();
2120
const {
22-
currentGroupChannel,
21+
quoteMessage,
2322
localMessages,
23+
currentGroupChannel,
2424
sendMessage,
2525
sendFileMessage,
2626
sendVoiceMessage,
@@ -37,22 +37,26 @@ export const MessageInputWrapper = (props: MessageInputWrapperProps) => {
3737
return (
3838
<MessageInputWrapperView
3939
{...props}
40-
disabled={disableMessageInput}
4140
{...context}
41+
disabled={disableMessageInput}
4242
currentChannel={currentGroupChannel}
43-
quoteMessage={context.quoteMessage}
44-
sendUserMessage={(params) => (
45-
sendMessage({ ...params, quoteMessage: { messageId: params.parentMessageId } as SendableMessageType })
46-
)}
47-
sendFileMessage={(params: FileMessageCreateParams) => (
48-
sendFileMessage(params.file as File, { messageId: params.parentMessageId } as SendableMessageType)
49-
)}
50-
sendVoiceMessage={({ file, parentMessageId }: FileMessageCreateParams, duration: number) => (
51-
sendVoiceMessage(file as File, duration, { parentMessageId } as SendableMessageType)
52-
)}
53-
sendMultipleFilesMessage={({ fileInfoList, parentMessageId }) => (
54-
sendMultipleFilesMessage(fileInfoList.map((fileInfo) => fileInfo.file) as File[], { parentMessageId } as SendableMessageType)
55-
)}
43+
sendUserMessage={(params) => {
44+
return sendMessage({
45+
message: params.message,
46+
mentionTemplate: params.mentionedMessageTemplate,
47+
mentionedUsers: params.mentionedUsers,
48+
quoteMessage,
49+
});
50+
}}
51+
sendFileMessage={(params) => {
52+
return sendFileMessage(params.file as File, quoteMessage);
53+
}}
54+
sendVoiceMessage={({ file }, duration) => {
55+
return sendVoiceMessage(file as File, duration, quoteMessage);
56+
}}
57+
sendMultipleFilesMessage={({ fileInfoList }) => {
58+
return sendMultipleFilesMessage(fileInfoList.map((fileInfo) => fileInfo.file) as File[], quoteMessage);
59+
}}
5660
/>
5761
);
5862
};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ export const MessageInputWrapper = (props: MessageInputWrapperProps) => {
3535
return (
3636
<MessageInputWrapperView
3737
{...props}
38-
disabled={disableMessageInput}
3938
{...context}
39+
disabled={disableMessageInput}
4040
/>
4141
);
4242
};

0 commit comments

Comments
 (0)