Merge branch 'hotfixes'

# Conflicts:
#	packages/uikit-chat-hooks/src/channel/useGroupChannelMessages/useGroupChannelMessagesWithCollection.ts
#	packages/uikit-chat-hooks/src/channel/useGroupChannelMessages/useGroupChannelMessagesWithQuery.ts
#	packages/uikit-utils/src/sendbird/channel.ts
#	packages/uikit-utils/src/shared/bufferedRequest.ts

Author: bang9

CHANGELOG.md

@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.3](https://github.com/sendbird/sendbird-uikit-react-native/compare/v2.0.1...v2.0.3) (2022-12-01)
+
+
+### Improvements
+
+* optimize markAs APIs ([b0fb3aa](https://github.com/sendbird/sendbird-uikit-react-native/commit/b0fb3aa86636b03f0dcc6337eaa17c7336b5bea9))
+
+
+
 ## [2.0.1](https://github.com/sendbird/sendbird-uikit-react-native/compare/v2.0.0...v2.0.1) (2022-10-26)
 
 

lerna.json

@@ -6,7 +6,7 @@
   ],
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "2.0.1",
+  "version": "2.0.3",
   "command": {
     "publish": {
       "conventionalCommits": true,

packages/uikit-chat-hooks/CHANGELOG.md

@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.3](https://github.com/sendbird/sendbird-uikit-react-native/compare/v2.0.1...v2.0.3) (2022-12-01)
+
+
+### Improvements
+
+* optimize markAs APIs ([b0fb3aa](https://github.com/sendbird/sendbird-uikit-react-native/commit/b0fb3aa86636b03f0dcc6337eaa17c7336b5bea9))
+
+
+
 ## [2.0.1](https://github.com/sendbird/sendbird-uikit-react-native/compare/v2.0.0...v2.0.1) (2022-10-26)
 
 **Note:** Version bump only for package @sendbird/uikit-chat-hooks

packages/uikit-chat-hooks/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sendbird/uikit-chat-hooks",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "React hooks that built with SendbirdChat SDK",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -38,7 +38,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sendbird/uikit-utils": "2.0.1"
+    "@sendbird/uikit-utils": "2.0.3"
   },
   "devDependencies": {
     "@types/react": "*",

packages/uikit-chat-hooks/src/channel/useGroupChannelList/useGroupChannelListWithCollection.ts

@@ -1,7 +1,7 @@
 import { useEffect, useRef } from 'react';
 
-import { GroupChannelFilter, GroupChannelListOrder } from '@sendbird/chat/groupChannel';
-import type { SendbirdChatSDK, SendbirdGroupChannelCollection } from '@sendbird/uikit-utils';
+import { GroupChannelEventSource, GroupChannelFilter, GroupChannelListOrder } from '@sendbird/chat/groupChannel';
+import type { SendbirdBaseChannel, SendbirdChatSDK, SendbirdGroupChannelCollection } from '@sendbird/uikit-utils';
 import { confirmAndMarkAsDelivered, useAsyncEffect, useFreshCallback, useUniqId } from '@sendbird/uikit-utils';
 
 import { useAppFeatures } from '../../common/useAppFeatures';
@@ -37,11 +37,23 @@ export const useGroupChannelListWithCollection: UseGroupChannelList = (sdk, user
   const { loading, groupChannels, refreshing, setChannels, deleteChannels, updateRefreshing, updateLoading } =
     useGroupChannelListReducer();
 
-  const updateChannelsAndMarkAsDelivered = (markAsDelivered: boolean) => {
+  const updateChannelsAndMarkAsDelivered = (
+    markAsDelivered: boolean,
+    source?: GroupChannelEventSource,
+    updatedChannels?: SendbirdBaseChannel[],
+  ) => {
     const channels = collectionRef.current?.channels ?? [];
     setChannels(channels, true);
     if (markAsDelivered && deliveryReceiptEnabled) {
-      channels.forEach((channel) => confirmAndMarkAsDelivered(sdk, channel));
+      switch (source) {
+        case GroupChannelEventSource.EVENT_MESSAGE_RECEIVED:
+        case GroupChannelEventSource.EVENT_MESSAGE_SENT:
+        case GroupChannelEventSource.SYNC_CHANNEL_BACKGROUND:
+        case GroupChannelEventSource.SYNC_CHANNEL_CHANGELOGS:
+        case undefined:
+          confirmAndMarkAsDelivered(updatedChannels ?? channels);
+          break;
+      }
     }
   };
 
@@ -52,11 +64,11 @@ export const useGroupChannelListWithCollection: UseGroupChannelList = (sdk, user
       collectionRef.current = createGroupChannelListCollection(sdk, options?.collectionCreator);
 
       collectionRef.current?.setGroupChannelCollectionHandler({
-        onChannelsAdded: () => {
-          updateChannelsAndMarkAsDelivered(true);
+        onChannelsAdded: (context, channels) => {
+          updateChannelsAndMarkAsDelivered(true, context.source, channels);
         },
-        onChannelsUpdated: () => {
-          updateChannelsAndMarkAsDelivered(true);
+        onChannelsUpdated: (context, channels) => {
+          updateChannelsAndMarkAsDelivered(true, context.source, channels);
         },
         onChannelsDeleted: () => {
           updateChannelsAndMarkAsDelivered(false);

packages/uikit-chat-hooks/src/channel/useGroupChannelList/useGroupChannelListWithQuery.ts

@@ -43,7 +43,7 @@ export const useGroupChannelListWithQuery: UseGroupChannelList = (sdk, userId, o
 
   const updateChannelsAndMarkAsDelivered = (channels: SendbirdChannel[]) => {
     updateChannels(channels);
-    if (deliveryReceiptEnabled) channels.forEach((channel) => confirmAndMarkAsDelivered(sdk, channel));
+    if (deliveryReceiptEnabled) confirmAndMarkAsDelivered(channels);
   };
 
   const init = useFreshCallback(async (uid?: string) => {
@@ -55,7 +55,7 @@ export const useGroupChannelListWithQuery: UseGroupChannelList = (sdk, userId, o
         const channels = await queryRef.current.next();
 
         setChannels(channels, true);
-        if (deliveryReceiptEnabled) channels.forEach((channel) => confirmAndMarkAsDelivered(sdk, channel));
+        if (deliveryReceiptEnabled) confirmAndMarkAsDelivered(channels);
       }
     }
   });
@@ -67,21 +67,24 @@ export const useGroupChannelListWithQuery: UseGroupChannelList = (sdk, userId, o
   }, [init, userId]);
 
   useChannelHandler(sdk, HOOK_NAME, {
-    onChannelChanged: (channel) => updateChannelsAndMarkAsDelivered([channel]),
+    onChannelChanged: (channel) => updateChannels([channel]),
     onChannelFrozen: (channel) => updateChannels([channel]),
     onChannelUnfrozen: (channel) => updateChannels([channel]),
     onChannelMemberCountChanged: (channels) => updateChannels(channels),
     onChannelDeleted: (url) => deleteChannels([url]),
-    onUserJoined: (channel) => updateChannelsAndMarkAsDelivered([channel]),
+    onUserJoined: (channel) => updateChannels([channel]),
     onUserLeft: (channel, user) => {
       const isMe = user.userId === userId;
       if (isMe) deleteChannels([channel.url]);
-      else updateChannelsAndMarkAsDelivered([channel]);
+      else updateChannels([channel]);
     },
     onUserBanned(channel, user) {
       const isMe = user.userId === userId;
       if (isMe) deleteChannels([channel.url]);
-      else updateChannelsAndMarkAsDelivered([channel]);
+      else updateChannels([channel]);
+    },
+    onMessageReceived(channel) {
+      updateChannelsAndMarkAsDelivered([channel]);
     },
   });
 
@@ -95,7 +98,7 @@ export const useGroupChannelListWithQuery: UseGroupChannelList = (sdk, userId, o
     if (queryRef.current?.hasNext) {
       const channels = await queryRef.current.next();
       setChannels(channels, false);
-      if (deliveryReceiptEnabled) channels.forEach((channel) => confirmAndMarkAsDelivered(sdk, channel));
+      if (deliveryReceiptEnabled) confirmAndMarkAsDelivered(channels);
     }
   });
 

packages/uikit-chat-hooks/src/channel/useGroupChannelMessages/useGroupChannelMessagesWithCollection.ts

@@ -1,21 +1,14 @@
 import { useCallback, useEffect, useRef } from 'react';
 
-import { MessageCollectionInitPolicy, MessageFilter } from '@sendbird/chat/groupChannel';
+import { MessageCollectionInitPolicy, MessageEventSource, MessageFilter } from '@sendbird/chat/groupChannel';
 import type {
   SendbirdChannel,
   SendbirdFileMessage,
   SendbirdGroupChannel,
   SendbirdMessageCollection,
 } from '@sendbird/uikit-utils';
-import {
-  Logger,
-  confirmAndMarkAsDelivered,
-  confirmAndMarkAsRead,
-  isDifferentChannel,
-  useForceUpdate,
-} from '@sendbird/uikit-utils';
+import { Logger, confirmAndMarkAsRead, isDifferentChannel, useForceUpdate } from '@sendbird/uikit-utils';
 
-import { useAppFeatures } from '../../common/useAppFeatures';
 import { useChannelHandler } from '../../handler/useChannelHandler';
 import type { UseGroupChannelMessages, UseGroupChannelMessagesOptions } from '../../types';
 import { useGroupChannelMessagesReducer } from './reducer';
@@ -32,9 +25,7 @@ const createMessageCollection = (
 const HOOK_NAME = 'useGroupChannelMessagesWithCollection';
 
 export const useGroupChannelMessagesWithCollection: UseGroupChannelMessages = (sdk, channel, userId, options) => {
-  const { deliveryReceiptEnabled } = useAppFeatures(sdk);
   const forceUpdate = useForceUpdate();
-
   const collectionRef = useRef<SendbirdMessageCollection>();
 
   const {
@@ -53,12 +44,7 @@ export const useGroupChannelMessagesWithCollection: UseGroupChannelMessages = (s
 
   const channelMarkAs = async () => {
     try {
-      if (deliveryReceiptEnabled) await confirmAndMarkAsDelivered(sdk, channel);
-    } catch (e) {
-      Logger.warn(`[${HOOK_NAME}/channelMarkAs/Delivered]`, e);
-    }
-    try {
-      await confirmAndMarkAsRead(sdk, [channel]);
+      await confirmAndMarkAsRead([channel]);
     } catch (e) {
       Logger.warn(`[${HOOK_NAME}/channelMarkAs/Read]`, e);
     }
@@ -81,8 +67,14 @@ export const useGroupChannelMessagesWithCollection: UseGroupChannelMessages = (s
         channelMarkAs();
 
         collectionRef.current?.setMessageCollectionHandler({
-          onMessagesAdded: (_, channel, messages) => {
-            channelMarkAs();
+          onMessagesAdded: (_, __, messages) => {
+            switch (_.source) {
+              case MessageEventSource.EVENT_MESSAGE_RECEIVED:
+              case MessageEventSource.EVENT_MESSAGE_SENT_SUCCESS:
+              case MessageEventSource.SYNC_MESSAGE_FILL:
+                channelMarkAs();
+                break;
+            }
             updateNextMessages(messages, false, sdk.currentUser.userId);
             updateChannel(channel);
           },

packages/uikit-chat-hooks/src/channel/useGroupChannelMessages/useGroupChannelMessagesWithQuery.ts

@@ -7,14 +7,12 @@ import type {
 } from '@sendbird/uikit-utils';
 import {
   Logger,
-  confirmAndMarkAsDelivered,
   confirmAndMarkAsRead,
   isDifferentChannel,
   useAsyncEffect,
   useForceUpdate,
 } from '@sendbird/uikit-utils';
 
-import { useAppFeatures } from '../../common/useAppFeatures';
 import { useChannelHandler } from '../../handler/useChannelHandler';
 import type { UseGroupChannelMessages, UseGroupChannelMessagesOptions } from '../../types';
 import { useGroupChannelMessagesReducer } from './reducer';
@@ -32,8 +30,6 @@ const createMessageQuery = (
 
 const HOOK_NAME = 'useGroupChannelMessagesWithQuery';
 export const useGroupChannelMessagesWithQuery: UseGroupChannelMessages = (sdk, channel, userId, options) => {
-  const { deliveryReceiptEnabled } = useAppFeatures(sdk);
-
   const queryRef = useRef<SendbirdPreviousMessageListQuery>();
 
   const forceUpdate = useForceUpdate();
@@ -54,12 +50,7 @@ export const useGroupChannelMessagesWithQuery: UseGroupChannelMessages = (sdk, c
 
   const channelMarkAs = async () => {
     try {
-      if (deliveryReceiptEnabled) await confirmAndMarkAsDelivered(sdk, channel);
-    } catch (e) {
-      Logger.warn(`[${HOOK_NAME}/channelMarkAs/Delivered]`, e);
-    }
-    try {
-      await confirmAndMarkAsRead(sdk, [channel]);
+      await confirmAndMarkAsRead([channel]);
     } catch (e) {
       Logger.warn(`[${HOOK_NAME}/channelMarkAs/Read]`, e);
     }

packages/uikit-react-native-foundation/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.3](https://github.com/sendbird/sendbird-uikit-react-native/compare/v2.0.1...v2.0.3) (2022-12-01)
+
+**Note:** Version bump only for package @sendbird/uikit-react-native-foundation
+
+
+
+
+
 ## [2.0.1](https://github.com/sendbird/sendbird-uikit-react-native/compare/v2.0.0...v2.0.1) (2022-10-26)
 
 

packages/uikit-react-native-foundation/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sendbird/uikit-react-native-foundation",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "react-native-uikit",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -38,7 +38,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sendbird/uikit-utils": "2.0.1"
+    "@sendbird/uikit-utils": "2.0.3"
   },
   "devDependencies": {
     "@types/react": "*",