Skip to content

Commit 94cbb3c

Browse files
authored
Merge pull request #236 from sendbird/feat/integrate-chat-sdk-4.16.4
[CLNP-6663] fix: improve message validation related to mentionedMessageTemplate
2 parents 6fcbc23 + 4ed0b24 commit 94cbb3c

File tree

4 files changed

+13
-9
lines changed

4 files changed

+13
-9
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
]
9999
},
100100
"resolutions": {
101-
"@sendbird/chat": "4.16.0",
101+
"@sendbird/chat": "4.16.5",
102102
"@types/react": "^18"
103103
}
104104
}

packages/uikit-react-native/src/hooks/useMentionTextInput.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ const useMentionTextInput = (params: { messageToEdit?: SendbirdUserMessage | Sen
2626
)
2727
) {
2828
const result = mentionManager.templateToTextAndMentionedUsers(
29-
params.messageToEdit?.mentionedMessageTemplate ?? '',
29+
params.messageToEdit && 'mentionedMessageTemplate' in params.messageToEdit
30+
? params.messageToEdit.mentionedMessageTemplate ?? ''
31+
: '',
3032
params.messageToEdit?.mentionedUsers ?? [],
3133
);
3234

packages/uikit-react-native/src/libs/MentionManager.tsx

+5-3
Original file line numberDiff line numberDiff line change
@@ -246,9 +246,11 @@ class MentionManager {
246246
): boolean => {
247247
return Boolean(
248248
mentionEnabled &&
249-
message?.mentionedMessageTemplate &&
250-
message?.mentionedUsers &&
251-
message?.mentionedUsers.length > 0,
249+
message &&
250+
'mentionedMessageTemplate' in message &&
251+
message.mentionedMessageTemplate &&
252+
message.mentionedUsers &&
253+
message.mentionedUsers.length > 0,
252254
);
253255
};
254256
}

yarn.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -3703,10 +3703,10 @@
37033703
mkdirp "^1.0.4"
37043704
rimraf "^3.0.2"
37053705

3706-
"@sendbird/[email protected].0", "@sendbird/chat@^4.16.0":
3707-
version "4.16.0"
3708-
resolved "https://registry.yarnpkg.com/@sendbird/chat/-/chat-4.16.0.tgz#3a133fb415735261fa5f6ef3fb646af99394c76e"
3709-
integrity sha512-Fe6CkQpviXhWjvrglq8ZVNfaFFVkh8wrKSErecbPz7nThqw6JzAx1nD1i1efpu0+ARid9dyuxmxYLAPWw4OAIg==
3706+
"@sendbird/[email protected].5", "@sendbird/chat@^4.16.0":
3707+
version "4.16.5"
3708+
resolved "https://registry.yarnpkg.com/@sendbird/chat/-/chat-4.16.5.tgz#ece60f33fed480028da79a142a75a3a5cef9a91a"
3709+
integrity sha512-fB3SgfF5mxpqOMD6Ah0anWN7wlgHyWVcGacVcX5K0pEj8K81wHCubmRNH622VDmuTnXWAU97mMZTXsEfO3YqXA==
37103710

37113711
"@sendbird/[email protected]":
37123712
version "0.0.1-alpha.77"

0 commit comments

Comments
 (0)