Skip to content
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
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
8 changes: 7 additions & 1 deletion apps/testing/src/pages/PlaygroundPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,11 @@ import { defaultProps } from '../libs/const.ts';

export function PlaygroundPage() {
const props = useConfigParams(defaultProps);
return <GroupChannelApp {...props} breakpoint={/iPhone|iPad|iPod|Android/i.test(navigator.userAgent)} config={{ logLevel: 'all' }} />;
return <GroupChannelApp {...props} breakpoint={/iPhone|iPad|iPod|Android/i.test(navigator.userAgent)} config={{ logLevel: 'all' }}
uikitOptions={{
groupChannel: {
replyType: 'thread',
}
}}
/>;
}
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@
"react-dom": "^16.8.6 || ^17.0.0 || ^18.0.0 || ^19.0.0"
},
"dependencies": {
"@sendbird/chat": "^4.18.0",
"@sendbird/react-uikit-message-template-view": "^0.0.10",
"@sendbird/uikit-tools": "^0.0.10",
"@sendbird/chat": "^4.20.0",
"@sendbird/react-uikit-message-template-view": "^0.0.18",
"@sendbird/uikit-tools": "^0.0.18",
"css-vars-ponyfill": "^2.3.2",
"date-fns": "^2.16.1",
"dompurify": "^3.2.4"
Expand Down
13 changes: 7 additions & 6 deletions src/modules/Channel/context/hooks/useHandleChannelEvents.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ function useHandleChannelEvents({
},
onUserMarkedUnread: (channel, userIds) => {
logger.info('Channel | useHandleChannelEvents: onUserMarkedUnread', channel, userIds);
// TODO:: MADOKA 이 부분에 대해서 명확하게 확인해야 함.
if (compareIds(channel?.url, channelUrl)) {
messagesDispatcher({
type: messageActions.MARK_AS_UNREAD,
Expand Down Expand Up @@ -169,11 +168,13 @@ function useHandleChannelEvents({
});
},
onReactionUpdated: (channel, reactionEvent) => {
logger.info('Channel | useHandleChannelEvents: onReactionUpdated', { channel, reactionEvent });
messagesDispatcher({
type: messageActions.ON_REACTION_UPDATED,
payload: reactionEvent,
});
if (channel.isGroupChannel() && compareIds(channel?.url, channelUrl)) {
logger.info('Channel | useHandleChannelEvents: onReactionUpdated', { channel, reactionEvent });
messagesDispatcher({
type: messageActions.ON_REACTION_UPDATED,
payload: reactionEvent,
});
}
},
onChannelChanged: (channel) => {
if (channel.isGroupChannel() && compareIds(channel?.url, channelUrl)) {
Expand Down
2 changes: 1 addition & 1 deletion src/modules/GroupChannel/components/MessageList/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ export const MessageList = (props: GroupChannelMessageListProps) => {

// Find the first unread message
const firstUnreadMessage = useMemo(() => {
if (!enableMarkAsUnread || !isInitializedRef.current || messages.length === 0 || readState === 'read') {
if (!enableMarkAsUnread || !isInitializedRef.current || messages.length === 0 || readState === 'read' || !currentChannel?.myLastRead) {
return undefined;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,7 @@ export default function ThreadListItemContent(props: ThreadListItemContentProps)
toggleReaction,
isOpenedFromThread: true,
deleteMessage,
resendMessage,
onDownloadClick: async (e) => {
if (!onBeforeDownloadFileMessage) return;

Expand Down
1 change: 1 addition & 0 deletions src/modules/Thread/context/hooks/useThreadFetchers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ function getThreadMessageListParams(params?: Partial<ThreadedMessageListParams>)
prevResultSize: PREV_THREADS_FETCH_SIZE,
nextResultSize: NEXT_THREADS_FETCH_SIZE,
includeMetaArray: true,
isInclusive: true,
...params,
};
}
Expand Down
50 changes: 38 additions & 12 deletions src/modules/Thread/context/useThread.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
BaseMessage,
MultipleFilesMessage,
ReactionEvent,
SendingStatus,
UserMessage,
} from '@sendbird/chat/message';
import { NEXT_THREADS_FETCH_SIZE, PREV_THREADS_FETCH_SIZE } from '../consts';
Expand All @@ -26,6 +27,8 @@ import useUpdateMessageCallback from './hooks/useUpdateMessageCallback';
import useDeleteMessageCallback from './hooks/useDeleteMessageCallback';
import { useThreadFetchers } from './hooks/useThreadFetchers';

import { cloneDeep } from 'lodash';

function hasReqId<T extends object>(
message: T,
): message is T & { reqId: string } {
Expand Down Expand Up @@ -56,6 +59,10 @@ const useThread = () => {

const sendMessageStatusActions = {
sendMessageStart: useCallback((message: SendableMessageType) => store.setState(state => {
if ('sendingStatus' in message) {
(message as SendableMessageType).sendingStatus = SendingStatus.PENDING;
}

return {
...state,
localThreadMessages: [
Expand All @@ -66,6 +73,10 @@ const useThread = () => {
}), [store]),

sendMessageSuccess: useCallback((message: SendableMessageType) => store.setState(state => {
if ('sendingStatus' in message) {
(message as SendableMessageType).sendingStatus = SendingStatus.SUCCEEDED;
}

return {
...state,
allThreadMessages: [
Expand All @@ -81,6 +92,10 @@ const useThread = () => {
}), [store]),

sendMessageFailure: useCallback((message: SendableMessageType) => store.setState(state => {
if ('sendingStatus' in message) {
(message as SendableMessageType).sendingStatus = SendingStatus.FAILED;
}

return {
...state,
localThreadMessages: state.localThreadMessages.map((m) => (
Expand All @@ -92,6 +107,10 @@ const useThread = () => {
}), [store]),

resendMessageStart: useCallback((message: SendableMessageType) => store.setState(state => {
if ('sendingStatus' in message) {
(message as SendableMessageType).sendingStatus = SendingStatus.PENDING;
}

return {
...state,
localThreadMessages: state.localThreadMessages.map((m) => (
Expand Down Expand Up @@ -235,16 +254,16 @@ const useThread = () => {

initializeThreadListSuccess: useCallback((parentMessage: BaseMessage, anchorMessage: SendableMessageType, threadedMessages: BaseMessage[]) => store.setState(state => {
const anchorMessageCreatedAt = (!anchorMessage?.messageId) ? parentMessage?.createdAt : anchorMessage?.createdAt;
const anchorIndex = threadedMessages.findIndex((message) => message?.createdAt > anchorMessageCreatedAt);
const anchorIndex = threadedMessages.findIndex((message) => message?.createdAt === anchorMessageCreatedAt);
const prevThreadMessages = anchorIndex > -1 ? threadedMessages.slice(0, anchorIndex) : threadedMessages;
const anchorThreadMessage = anchorMessage?.messageId ? [anchorMessage] : [];
const nextThreadMessages = anchorIndex > -1 ? threadedMessages.slice(anchorIndex) : [];

return {
...state,
threadListState: ThreadListStateTypes.INITIALIZED,
hasMorePrev: anchorIndex === -1 || anchorIndex === PREV_THREADS_FETCH_SIZE,
hasMoreNext: threadedMessages.length - anchorIndex === NEXT_THREADS_FETCH_SIZE,
allThreadMessages: [prevThreadMessages, anchorThreadMessage, nextThreadMessages].flat() as CoreMessageType[],
allThreadMessages: [...prevThreadMessages, ...nextThreadMessages] as CoreMessageType[],
};
}), [store]),

Expand Down Expand Up @@ -397,18 +416,25 @@ const useThread = () => {
}), [store]),

onReactionUpdated: useCallback((reactionEvent: ReactionEvent) => store.setState(state => {
if (state?.parentMessage?.messageId === reactionEvent?.messageId) {
state.parentMessage?.applyReactionEvent?.(reactionEvent);
let updatedParentMessage = state.parentMessage;
if (state.parentMessage?.messageId === reactionEvent?.messageId) {
updatedParentMessage = cloneDeep(state.parentMessage as SendableMessageType);
updatedParentMessage.applyReactionEvent(reactionEvent);
}

const updatedMessages = state.allThreadMessages.map((m) => {
if (reactionEvent?.messageId === m?.messageId) {
const updatedMessage = cloneDeep(m as CoreMessageType);
updatedMessage.applyReactionEvent(reactionEvent);
return updatedMessage;
}
return m;
});

return {
...state,
allThreadMessages: state.allThreadMessages.map((m) => {
if (reactionEvent?.messageId === m?.messageId) {
m?.applyReactionEvent?.(reactionEvent);
return m;
}
return m;
}),
parentMessage: updatedParentMessage,
allThreadMessages: [...updatedMessages], // Create new array reference to trigger re-render
};
}), [store]),

Expand Down
2 changes: 1 addition & 1 deletion src/ui/Checkbox/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,4 @@
transform: rotate(45deg);
}
}
/**rtl:end:ignore**/
/*rtl:end:ignore*/
1 change: 1 addition & 0 deletions src/utils/storeManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export function hasStateChanged<T>(prevState: T, updates: Partial<T>): boolean {
*/
return false;
}

return !isEqual(prevState[key as keyof T], value);
});
}
Expand Down
41 changes: 20 additions & 21 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2747,9 +2747,9 @@ __metadata:
languageName: node
linkType: hard

"@sendbird/chat@npm:^4.18.0":
version: 4.19.5
resolution: "@sendbird/chat@npm:4.19.5"
"@sendbird/chat@npm:^4.19.2":
version: 4.20.0
resolution: "@sendbird/chat@npm:4.20.0"
peerDependencies:
"@react-native-async-storage/async-storage": ^1.17.6
react-native-mmkv: ">=2.0.0"
Expand All @@ -2758,29 +2758,28 @@ __metadata:
optional: true
react-native-mmkv:
optional: true
checksum: b67d3b9413ae1b61c4261ef540f7b31b21fec925950a2805ac2cb0eac2c981ec001f8d066bce8fc294d6a104a4ad2a0481c1e907e59fa9bcc8a0081411b729c6
checksum: ad614ef86f382aab8c41b333e02f6eab87409650c44d3aad9fab8f67ff3b2ffb331b38c84b3d70cc95cc9cd5f47b0ee568fc50257fa6b3aecd118ac304d7c494
languageName: node
linkType: hard

"@sendbird/react-uikit-message-template-view@npm:^0.0.10":
version: 0.0.10
resolution: "@sendbird/react-uikit-message-template-view@npm:0.0.10"
"@sendbird/react-uikit-message-template-view@npm:^0.0.17":
version: 0.0.17
resolution: "@sendbird/react-uikit-message-template-view@npm:0.0.17"
dependencies:
"@sendbird/uikit-message-template": ^0.0.10
"@sendbird/uikit-message-template": ^0.0.17
peerDependencies:
"@sendbird/chat": ">=4.3.0 <5"
react: ">=16.8.6"
react-dom: ">=16.8.6"
checksum: aac92fb0b963c4ee3f31eea05839cd49c5ad8561c427b5778731fdf61bcbc18076b329ab2866f12b776e77e9b2a9bfbba12263bcf25d4949a34ab80120548d2f
checksum: cbfe00b7b0a9eba17350ee31b61167f3811ca4168b304ff7d81281568e1b7ff34e22b6d8e3ab323448148d44724a89d1431aefab58fb49a1a46e9c599ee38205
languageName: node
linkType: hard

"@sendbird/uikit-message-template@npm:^0.0.10":
version: 0.0.10
resolution: "@sendbird/uikit-message-template@npm:0.0.10"
"@sendbird/uikit-message-template@npm:^0.0.17":
version: 0.0.17
resolution: "@sendbird/uikit-message-template@npm:0.0.17"
peerDependencies:
react: ">=16.8.6"
checksum: 18dfce8f7c83d37a94bc3cbca0f561d7ed10c4367bcb2d2bf9c9192fce8fa06cfd87e8f968c6f3ae6d464a5119338ee5167b1a055b777bd906664a225c7e486f
checksum: 6622974d07dbbcda09745db2fb03957b759081e33a294a3b90a4e1f95fa7317f7e26954abd79c761fe958efd8332fba6eeb2df72e383f4db468212a869ff83d6
languageName: node
linkType: hard

Expand All @@ -2803,9 +2802,9 @@ __metadata:
"@rollup/plugin-node-resolve": ^15.2.3
"@rollup/plugin-replace": ^5.0.4
"@rollup/plugin-typescript": ^11.1.5
"@sendbird/chat": ^4.18.0
"@sendbird/react-uikit-message-template-view": ^0.0.10
"@sendbird/uikit-tools": ^0.0.10
"@sendbird/chat": ^4.19.2
"@sendbird/react-uikit-message-template-view": ^0.0.17
"@sendbird/uikit-tools": ^0.0.17
"@storybook/addon-essentials": ^8.5.0
"@storybook/manager-api": ^8.5.0
"@storybook/react-vite": ^8.5.0
Expand Down Expand Up @@ -2870,13 +2869,13 @@ __metadata:
languageName: unknown
linkType: soft

"@sendbird/uikit-tools@npm:^0.0.10":
version: 0.0.10
resolution: "@sendbird/uikit-tools@npm:0.0.10"
"@sendbird/uikit-tools@npm:^0.0.17":
version: 0.0.17
resolution: "@sendbird/uikit-tools@npm:0.0.17"
peerDependencies:
"@sendbird/chat": ">=4.10.5 <5"
react: ">=16.8.6"
checksum: 1b92fe4a5caced7efff4397fdf87912bc958b45f5eae1f986f78961759b18687901cc28bbc6f797a6fb0e1552e56ef5e04a16da0125883f18b00e99fbee5f44b
checksum: 5ae44750a1c497b95d3ee125efc74cfde1fee60a6a3dac1f0cafa03131816c4a49d4ed9b41393c699556a9f77c527beb7af913bd333576a22a7384ef23072a75
languageName: node
linkType: hard

Expand Down