Skip to content

Commit f9bbada

Browse files
committed
chore: fixed based on review feedback.
1 parent cdc0d9d commit f9bbada

File tree

10 files changed

+30
-11
lines changed

10 files changed

+30
-11
lines changed

packages/uikit-react-native/src/components/ChannelMessageList/index.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,10 @@ const useCreateMessagePressActions = <T extends SendbirdGroupChannel | SendbirdO
390390
const configs = sbOptions.uikitWithAppInfo.groupChannel.channel;
391391
const bottomSheetItem: BottomSheetItem = {
392392
sheetItems,
393-
HeaderComponent: shouldRenderReaction(channel, channel.isGroupChannel() && configs.enableReactions)
393+
HeaderComponent: shouldRenderReaction(
394+
channel,
395+
channel.isGroupChannel() && (channel.isSuper ? configs.enableReactionsSupergroup : configs.enableReactions),
396+
)
394397
? ({ onClose }) => <ReactionAddons.BottomSheet message={message} channel={channel} onClose={onClose} />
395398
: undefined,
396399
};

packages/uikit-react-native/src/components/ChannelThreadMessageList/index.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,10 @@ const useCreateMessagePressActions = <T extends SendbirdGroupChannel | SendbirdO
342342
const configs = sbOptions.uikitWithAppInfo.groupChannel.channel;
343343
const bottomSheetItem: BottomSheetItem = {
344344
sheetItems,
345-
HeaderComponent: shouldRenderReaction(channel, channel.isGroupChannel() && configs.enableReactions)
345+
HeaderComponent: shouldRenderReaction(
346+
channel,
347+
channel.isGroupChannel() && (channel.isSuper ? configs.enableReactionsSupergroup : configs.enableReactions),
348+
)
346349
? ({ onClose }) => <ReactionAddons.BottomSheet message={message} channel={channel} onClose={onClose} />
347350
: undefined,
348351
};

packages/uikit-react-native/src/components/GroupChannelMessageRenderer/index.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,11 @@ const GroupChannelMessageRenderer: GroupChannelProps['Fragment']['renderMessage'
6767

6868
const reactionChildren = useIIFE(() => {
6969
const configs = sbOptions.uikitWithAppInfo.groupChannel.channel;
70-
if (shouldRenderReaction(channel, configs.enableReactions) && message.reactions && message.reactions.length > 0) {
70+
if (
71+
shouldRenderReaction(channel, channel.isSuper ? configs.enableReactionsSupergroup : configs.enableReactions) &&
72+
message.reactions &&
73+
message.reactions.length > 0
74+
) {
7175
return <ReactionAddons.Message channel={channel} message={message} />;
7276
}
7377
return null;

packages/uikit-react-native/src/components/ReactionBottomSheets/ReactionUserListBottomSheet.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ const ReactionUserListBottomSheet = ({
150150
{userCountDifference > 0 && (
151151
<View style={styles.pageItem}>
152152
<Text body3 color={select({ dark: palette.onBackgroundDark02, light: palette.onBackgroundLight02 })}>
153-
And {userCountDifference} others
153+
{STRINGS.REACTION.MORE_USERS(userCountDifference)}
154154
</Text>
155155
</View>
156156
)}

packages/uikit-react-native/src/components/ReactionBottomSheets/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type React from 'react';
22

3-
import { SendbirdMember, SendbirdReactedUserInfo, SendbirdUser } from '@sendbird/uikit-utils';
3+
import { SendbirdReactedUserInfo } from '@sendbird/uikit-utils';
44

55
import type { LocalizationContext } from '../../contexts/LocalizationCtx';
66
import type { ReactionContext } from '../../contexts/ReactionCtx';
@@ -13,7 +13,7 @@ export type ReactionBottomSheetProps = {
1313
visible: boolean;
1414
onDismiss: () => void;
1515
onClose: () => Promise<void>;
16-
onPressUserProfile: (user: SendbirdUser | SendbirdMember | SendbirdReactedUserInfo) => void;
16+
onPressUserProfile: (user: SendbirdReactedUserInfo) => void;
1717
chatCtx: GetFromContext<typeof SendbirdChatContext>;
1818
reactionCtx: GetFromContext<typeof ReactionContext>;
1919
localizationCtx: GetFromContext<typeof LocalizationContext>;

packages/uikit-react-native/src/containers/SendbirdUIKitContainer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ export type SendbirdUIKitContainerProps = React.PropsWithChildren<{
146146
) => SendbirdGroupChannelCreateParams | Promise<SendbirdGroupChannelCreateParams>;
147147
};
148148
reaction?: {
149-
onPressUserProfile?: (user: SendbirdUser | SendbirdMember | SendbirdReactedUserInfo) => void;
149+
onPressUserProfile?: (user: SendbirdReactedUserInfo) => void;
150150
};
151151
userMention?: Pick<Partial<MentionConfigInterface>, 'mentionLimit' | 'suggestionLimit' | 'debounceMills'>;
152152
imageCompression?: Partial<ImageCompressionConfigInterface>;

packages/uikit-react-native/src/domain/groupChannelThread/component/GroupChannelThreadParentMessageInfo.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ const GroupChannelThreadParentMessageInfo = (props: GroupChannelThreadProps['Par
9494

9595
const renderReactionAddons = () => {
9696
const configs = sbOptions.uikitWithAppInfo.groupChannel.channel;
97-
if (shouldRenderReaction(channel, configs.enableReactions)) {
97+
if (shouldRenderReaction(channel, channel.isSuper ? configs.enableReactionsSupergroup : configs.enableReactions)) {
9898
return (
9999
<View style={styles.reactionButtonContainer}>
100100
<ReactionAddons.Message
@@ -302,7 +302,10 @@ const useCreateMessagePressActions = ({
302302
const configs = sbOptions.uikitWithAppInfo.groupChannel.channel;
303303
const bottomSheetItem: BottomSheetItem = {
304304
sheetItems,
305-
HeaderComponent: shouldRenderReaction(channel, channel.isGroupChannel() && configs.enableReactions)
305+
HeaderComponent: shouldRenderReaction(
306+
channel,
307+
channel.isGroupChannel() && (channel.isSuper ? configs.enableReactionsSupergroup : configs.enableReactions),
308+
)
306309
? ({ onClose }) => <ReactionAddons.BottomSheet message={message} channel={channel} onClose={onClose} />
307310
: undefined,
308311
};

packages/uikit-react-native/src/localization/StringSet.type.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,9 @@ export interface StringSet {
324324
VOICE_MESSAGE: string;
325325
VOICE_MESSAGE_INPUT_CANCEL: string;
326326
};
327+
REACTION: {
328+
MORE_USERS: (userCountDifference: number) => string;
329+
};
327330
FILE_VIEWER: {
328331
TITLE: (message: SendbirdFileMessage) => string;
329332
SUBTITLE: (message: SendbirdFileMessage) => string;

packages/uikit-react-native/src/localization/createBaseStringSet.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,9 @@ export const createBaseStringSet = ({ dateLocale, overrides }: StringSetCreateOp
345345
VOICE_MESSAGE_INPUT_CANCEL: 'Cancel',
346346
...overrides?.LABELS,
347347
},
348+
REACTION: {
349+
MORE_USERS: (userCountDifference) => `And ${userCountDifference} others`,
350+
},
348351
FILE_VIEWER: {
349352
TITLE: (message) => message.sender?.nickname || USER_NO_NAME,
350353
SUBTITLE: (message) => getMessageTimeFormat(new Date(message.createdAt), dateLocale),

packages/uikit-utils/src/types.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,9 @@ import type {
2525
Member,
2626
MessageCollection,
2727
} from '@sendbird/chat/groupChannel';
28-
import {
28+
import type {
2929
OpenChannelCreateParams,
3030
OpenChannelUpdateParams,
31-
ReactedUserInfo,
3231
SendableMessage,
3332
} from '@sendbird/chat/lib/__definition';
3433
import type {
@@ -40,6 +39,7 @@ import type {
4039
MessageSearchQuery,
4140
MultipleFilesMessage,
4241
PreviousMessageListQuery,
42+
ReactedUserInfo,
4343
Reaction,
4444
UserMessage,
4545
UserMessageCreateParams,

0 commit comments

Comments
 (0)