@sendbird/uikit-chat-hooks 3.0.4 → 3.1.1

package/lib/commonjs/channel/useChannelMessagesReducer.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useChannelMessagesReducer = void 0;
 var _react = require("react");
+var _message = require("@sendbird/chat/message");
 var _uikitUtils = require("@sendbird/uikit-utils");
 const defaultReducer = (_ref, action) => {
   let {
@@ -23,26 +24,42 @@ const defaultReducer = (_ref, action) => {
       }
     case 'update_messages':
       {
+        const userId = action.value.currentUserId;
         if (action.value.clearBeforeAction) {
-          draft['messageMap'] = (0, _uikitUtils.arrayToMapWithGetter)(action.value.messages, _uikitUtils.getMessageUniqId);
+          draft['messageMap'] = messagesToObject(action.value.messages);
         } else {
-          // Remove existing messages before update for prevent duplicate display
-          const messageKeys = action.value.messages.map(it => (0, _uikitUtils.isSendableMessage)(it) ? [it.messageId, it.reqId] : [it.messageId]).flat();
-          messageKeys.forEach(key => delete draft['messageMap'][key]);
+          // Filtering meaningless message updates
+          const nextMessages = action.value.messages.filter(next => {
+            if ((0, _uikitUtils.isMyMessage)(next, userId)) {
+              const prev = draft['messageMap'][next.reqId] ?? draft['messageMap'][next.messageId];
+              if ((0, _uikitUtils.isMyMessage)(prev, userId)) {
+                const shouldUpdate = shouldUpdateMessage(prev, next);
+                if (shouldUpdate) {
+                  // Remove existing messages before update to prevent duplicate display
+                  delete draft['messageMap'][prev.reqId];
+                  delete draft['messageMap'][prev.messageId];
+                }
+                return shouldUpdate;
+              }
+            }
+            return true;
+          });
+          const obj = messagesToObject(nextMessages);
           draft['messageMap'] = {
             ...draft['messageMap'],
-            ...(0, _uikitUtils.arrayToMapWithGetter)(action.value.messages, _uikitUtils.getMessageUniqId)
+            ...obj
           };
         }
         return draft;
       }
     case 'update_new_messages':
       {
-        const newMessages = action.value.messages.filter(it => (0, _uikitUtils.isNewMessage)(it, action.value.currentUserId));
+        const userId = action.value.currentUserId;
+        const newMessages = action.value.messages.filter(it => (0, _uikitUtils.isNewMessage)(it, userId));
         if (action.value.clearBeforeAction) {
           draft['newMessageMap'] = (0, _uikitUtils.arrayToMapWithGetter)(newMessages, _uikitUtils.getMessageUniqId);
         } else {
-          // Remove existing messages before update for prevent duplicate display
+          // Remove existing messages before update to prevent duplicate display
           const messageKeys = newMessages.map(it => it.messageId);
           messageKeys.forEach(key => delete draft['newMessageMap'][key]);
           draft['newMessageMap'] = {
@@ -59,12 +76,44 @@ const defaultReducer = (_ref, action) => {
         draft[key] = {
           ...draft[key]
         };
-        action.value.messageIds.forEach(msgId => delete draft[key][msgId]);
-        action.value.reqIds.forEach(reqId => delete draft[key][reqId]);
+        action.value.messageIds.forEach(msgId => {
+          const message = draft[key][msgId];
+          if (message) {
+            if ((0, _uikitUtils.isSendableMessage)(message)) delete draft[key][message.reqId];
+            delete draft[key][message.messageId];
+          }
+        });
+        action.value.reqIds.forEach(reqId => {
+          const message = draft[key][reqId];
+          if (message) {
+            if ((0, _uikitUtils.isSendableMessage)(message)) delete draft[key][message.reqId];
+            delete draft[key][message.messageId];
+          }
+        });
         return draft;
       }
   }
 };
+const messagesToObject = messages => {
+  return messages.reduce((accum, curr) => {
+    if ((0, _uikitUtils.isSendableMessage)(curr)) {
+      accum[curr.reqId] = curr;
+      if (curr.sendingStatus === _message.SendingStatus.SUCCEEDED) {
+        accum[curr.messageId] = curr;
+      }
+    } else {
+      accum[curr.messageId] = curr;
+    }
+    return accum;
+  }, {});
+};
+const shouldUpdateMessage = (prev, next) => {
+  // message data update (e.g. reactions)
+  if (prev.sendingStatus === _message.SendingStatus.SUCCEEDED) return next.sendingStatus === _message.SendingStatus.SUCCEEDED;
+
+  // message sending status update
+  return prev.sendingStatus !== next.sendingStatus;
+};
 const useChannelMessagesReducer = sortComparator => {
   const [{
     loading,
@@ -132,8 +181,8 @@ const useChannelMessagesReducer = sortComparator => {
     });
   };
   const messages = (0, _uikitUtils.useIIFE)(() => {
-    if (sortComparator) return Object.values(messageMap).sort(sortComparator);
-    return Object.values(messageMap);
+    if (sortComparator) return Array.from(new Set(Object.values(messageMap))).sort(sortComparator);
+    return Array.from(new Set(Object.values(messageMap)));
   });
   const newMessages = Object.values(newMessageMap);
   return {

package/lib/commonjs/channel/useChannelMessagesReducer.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_uikitUtils","defaultReducer","_ref","action","draft","type","value","status","clearBeforeAction","arrayToMapWithGetter","messages","getMessageUniqId","messageKeys","map","it","isSendableMessage","messageId","reqId","flat","forEach","key","newMessages","filter","isNewMessage","currentUserId","messageIds","msgId","reqIds","useChannelMessagesReducer","sortComparator","loading","refreshing","messageMap","newMessageMap","dispatch","useReducer","updateMessages","deleteMessages","updateNewMessages","deleteNewMessages","updateLoading","updateRefreshing","useIIFE","Object","values","sort","exports"],"sources":["useChannelMessagesReducer.ts"],"sourcesContent":["import { useReducer } from 'react';\n\nimport type { SendbirdBaseMessage } from '@sendbird/uikit-utils';\nimport {\n  SendbirdMessage,\n  arrayToMapWithGetter,\n  getMessageUniqId,\n  isNewMessage,\n  isSendableMessage,\n  useIIFE,\n} from '@sendbird/uikit-utils';\n\ntype Options = {\n  sortComparator?: (a: SendbirdMessage, b: SendbirdMessage) => number;\n};\n\ntype Action =\n  | {\n      type: 'update_loading' | 'update_refreshing';\n      value: { status: boolean };\n    }\n  | {\n      type: 'update_messages' | 'update_new_messages';\n      value: { messages: SendbirdBaseMessage[]; clearBeforeAction: boolean; currentUserId?: string };\n    }\n  | {\n      type: 'delete_messages' | 'delete_new_messages';\n      value: { messageIds: number[]; reqIds: string[] };\n    };\n\ntype State = {\n  loading: boolean;\n  refreshing: boolean;\n  messageMap: Record<string, SendbirdBaseMessage>;\n  newMessageMap: Record<string, SendbirdBaseMessage>;\n};\n\nconst defaultReducer = ({ ...draft }: State, action: Action) => {\n  switch (action.type) {\n    case 'update_refreshing': {\n      draft['refreshing'] = action.value.status;\n      return draft;\n    }\n    case 'update_loading': {\n      draft['loading'] = action.value.status;\n      return draft;\n    }\n    case 'update_messages': {\n      if (action.value.clearBeforeAction) {\n        draft['messageMap'] = arrayToMapWithGetter(action.value.messages, getMessageUniqId);\n      } else {\n        // Remove existing messages before update for prevent duplicate display\n        const messageKeys = action.value.messages\n          .map((it) => (isSendableMessage(it) ? [it.messageId, it.reqId] : [it.messageId]))\n          .flat();\n        messageKeys.forEach((key) => delete draft['messageMap'][key]);\n\n        draft['messageMap'] = {\n          ...draft['messageMap'],\n          ...arrayToMapWithGetter(action.value.messages, getMessageUniqId),\n        };\n      }\n\n      return draft;\n    }\n    case 'update_new_messages': {\n      const newMessages = action.value.messages.filter((it) => isNewMessage(it, action.value.currentUserId));\n\n      if (action.value.clearBeforeAction) {\n        draft['newMessageMap'] = arrayToMapWithGetter(newMessages, getMessageUniqId);\n      } else {\n        // Remove existing messages before update for prevent duplicate display\n        const messageKeys = newMessages.map((it) => it.messageId);\n        messageKeys.forEach((key) => delete draft['newMessageMap'][key]);\n\n        draft['newMessageMap'] = {\n          ...draft['newMessageMap'],\n          ...arrayToMapWithGetter(newMessages, getMessageUniqId),\n        };\n      }\n\n      return draft;\n    }\n    case 'delete_messages':\n    case 'delete_new_messages': {\n      const key = action.type === 'delete_messages' ? 'messageMap' : 'newMessageMap';\n      draft[key] = { ...draft[key] };\n      action.value.messageIds.forEach((msgId) => delete draft[key][msgId]);\n      action.value.reqIds.forEach((reqId) => delete draft[key][reqId]);\n\n      return draft;\n    }\n  }\n};\n\nexport const useChannelMessagesReducer = (sortComparator?: Options['sortComparator']) => {\n  const [{ loading, refreshing, messageMap, newMessageMap }, dispatch] = useReducer(defaultReducer, {\n    loading: true,\n    refreshing: false,\n    messageMap: {},\n    newMessageMap: {},\n  });\n\n  const updateMessages = (messages: SendbirdBaseMessage[], clearBeforeAction: boolean, currentUserId?: string) => {\n    dispatch({ type: 'update_messages', value: { messages, clearBeforeAction, currentUserId } });\n  };\n  const deleteMessages = (messageIds: number[], reqIds: string[]) => {\n    dispatch({ type: 'delete_messages', value: { messageIds, reqIds } });\n  };\n  const updateNewMessages = (messages: SendbirdBaseMessage[], clearBeforeAction: boolean, currentUserId?: string) => {\n    dispatch({ type: 'update_new_messages', value: { messages, clearBeforeAction, currentUserId } });\n  };\n  const deleteNewMessages = (messageIds: number[], reqIds: string[]) => {\n    dispatch({ type: 'delete_new_messages', value: { messageIds, reqIds } });\n  };\n  const updateLoading = (status: boolean) => {\n    dispatch({ type: 'update_loading', value: { status } });\n  };\n  const updateRefreshing = (status: boolean) => {\n    dispatch({ type: 'update_refreshing', value: { status } });\n  };\n\n  const messages = useIIFE(() => {\n    if (sortComparator) return Object.values(messageMap).sort(sortComparator);\n    return Object.values(messageMap);\n  });\n  const newMessages = Object.values(newMessageMap);\n\n  return {\n    updateLoading,\n    updateRefreshing,\n    updateMessages,\n    deleteMessages,\n\n    loading,\n    refreshing,\n    messages,\n\n    newMessages,\n    updateNewMessages,\n    deleteNewMessages,\n  };\n};\n"],"mappings":"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"}
+{"version":3,"names":["_react","require","_message","_uikitUtils","defaultReducer","_ref","action","draft","type","value","status","userId","currentUserId","clearBeforeAction","messagesToObject","messages","nextMessages","filter","next","isMyMessage","prev","reqId","messageId","shouldUpdate","shouldUpdateMessage","obj","newMessages","it","isNewMessage","arrayToMapWithGetter","getMessageUniqId","messageKeys","map","forEach","key","messageIds","msgId","message","isSendableMessage","reqIds","reduce","accum","curr","sendingStatus","SendingStatus","SUCCEEDED","useChannelMessagesReducer","sortComparator","loading","refreshing","messageMap","newMessageMap","dispatch","useReducer","updateMessages","deleteMessages","updateNewMessages","deleteNewMessages","updateLoading","updateRefreshing","useIIFE","Array","from","Set","Object","values","sort","exports"],"sources":["useChannelMessagesReducer.ts"],"sourcesContent":["import { useReducer } from 'react';\n\nimport { SendableMessage } from '@sendbird/chat/lib/__definition';\nimport { SendingStatus } from '@sendbird/chat/message';\nimport type { SendbirdBaseMessage } from '@sendbird/uikit-utils';\nimport {\n  SendbirdMessage,\n  arrayToMapWithGetter,\n  getMessageUniqId,\n  isMyMessage,\n  isNewMessage,\n  isSendableMessage,\n  useIIFE,\n} from '@sendbird/uikit-utils';\n\ntype Options = {\n  sortComparator?: (a: SendbirdMessage, b: SendbirdMessage) => number;\n};\n\ntype Action =\n  | {\n      type: 'update_loading' | 'update_refreshing';\n      value: { status: boolean };\n    }\n  | {\n      type: 'update_messages' | 'update_new_messages';\n      value: { messages: SendbirdBaseMessage[]; clearBeforeAction: boolean; currentUserId?: string };\n    }\n  | {\n      type: 'delete_messages' | 'delete_new_messages';\n      value: { messageIds: number[]; reqIds: string[] };\n    };\n\ntype State = {\n  loading: boolean;\n  refreshing: boolean;\n  messageMap: Record<string, SendbirdBaseMessage>;\n  newMessageMap: Record<string, SendbirdBaseMessage>;\n};\n\nconst defaultReducer = ({ ...draft }: State, action: Action) => {\n  switch (action.type) {\n    case 'update_refreshing': {\n      draft['refreshing'] = action.value.status;\n      return draft;\n    }\n    case 'update_loading': {\n      draft['loading'] = action.value.status;\n      return draft;\n    }\n    case 'update_messages': {\n      const userId = action.value.currentUserId;\n\n      if (action.value.clearBeforeAction) {\n        draft['messageMap'] = messagesToObject(action.value.messages);\n      } else {\n        // Filtering meaningless message updates\n        const nextMessages = action.value.messages.filter((next) => {\n          if (isMyMessage(next, userId)) {\n            const prev = draft['messageMap'][next.reqId] ?? draft['messageMap'][next.messageId];\n            if (isMyMessage(prev, userId)) {\n              const shouldUpdate = shouldUpdateMessage(prev, next);\n              if (shouldUpdate) {\n                // Remove existing messages before update to prevent duplicate display\n                delete draft['messageMap'][prev.reqId];\n                delete draft['messageMap'][prev.messageId];\n              }\n              return shouldUpdate;\n            }\n          }\n          return true;\n        });\n\n        const obj = messagesToObject(nextMessages);\n        draft['messageMap'] = { ...draft['messageMap'], ...obj };\n      }\n\n      return draft;\n    }\n    case 'update_new_messages': {\n      const userId = action.value.currentUserId;\n      const newMessages = action.value.messages.filter((it) => isNewMessage(it, userId));\n\n      if (action.value.clearBeforeAction) {\n        draft['newMessageMap'] = arrayToMapWithGetter(newMessages, getMessageUniqId);\n      } else {\n        // Remove existing messages before update to prevent duplicate display\n        const messageKeys = newMessages.map((it) => it.messageId);\n        messageKeys.forEach((key) => delete draft['newMessageMap'][key]);\n\n        draft['newMessageMap'] = {\n          ...draft['newMessageMap'],\n          ...arrayToMapWithGetter(newMessages, getMessageUniqId),\n        };\n      }\n\n      return draft;\n    }\n    case 'delete_messages':\n    case 'delete_new_messages': {\n      const key = action.type === 'delete_messages' ? 'messageMap' : 'newMessageMap';\n      draft[key] = { ...draft[key] };\n      action.value.messageIds.forEach((msgId) => {\n        const message = draft[key][msgId];\n        if (message) {\n          if (isSendableMessage(message)) delete draft[key][message.reqId];\n          delete draft[key][message.messageId];\n        }\n      });\n      action.value.reqIds.forEach((reqId) => {\n        const message = draft[key][reqId];\n        if (message) {\n          if (isSendableMessage(message)) delete draft[key][message.reqId];\n          delete draft[key][message.messageId];\n        }\n      });\n\n      return draft;\n    }\n  }\n};\n\nconst messagesToObject = (messages: SendbirdBaseMessage[]) => {\n  return messages.reduce((accum, curr) => {\n    if (isSendableMessage(curr)) {\n      accum[curr.reqId] = curr;\n      if (curr.sendingStatus === SendingStatus.SUCCEEDED) {\n        accum[curr.messageId] = curr;\n      }\n    } else {\n      accum[curr.messageId] = curr;\n    }\n    return accum;\n  }, {} as Record<string, SendbirdBaseMessage>);\n};\n\nconst shouldUpdateMessage = (prev: SendableMessage, next: SendableMessage) => {\n  // message data update (e.g. reactions)\n  if (prev.sendingStatus === SendingStatus.SUCCEEDED) return next.sendingStatus === SendingStatus.SUCCEEDED;\n\n  // message sending status update\n  return prev.sendingStatus !== next.sendingStatus;\n};\n\nexport const useChannelMessagesReducer = (sortComparator?: Options['sortComparator']) => {\n  const [{ loading, refreshing, messageMap, newMessageMap }, dispatch] = useReducer(defaultReducer, {\n    loading: true,\n    refreshing: false,\n    messageMap: {},\n    newMessageMap: {},\n  });\n\n  const updateMessages = (messages: SendbirdBaseMessage[], clearBeforeAction: boolean, currentUserId?: string) => {\n    dispatch({ type: 'update_messages', value: { messages, clearBeforeAction, currentUserId } });\n  };\n  const deleteMessages = (messageIds: number[], reqIds: string[]) => {\n    dispatch({ type: 'delete_messages', value: { messageIds, reqIds } });\n  };\n  const updateNewMessages = (messages: SendbirdBaseMessage[], clearBeforeAction: boolean, currentUserId?: string) => {\n    dispatch({ type: 'update_new_messages', value: { messages, clearBeforeAction, currentUserId } });\n  };\n  const deleteNewMessages = (messageIds: number[], reqIds: string[]) => {\n    dispatch({ type: 'delete_new_messages', value: { messageIds, reqIds } });\n  };\n  const updateLoading = (status: boolean) => {\n    dispatch({ type: 'update_loading', value: { status } });\n  };\n  const updateRefreshing = (status: boolean) => {\n    dispatch({ type: 'update_refreshing', value: { status } });\n  };\n\n  const messages = useIIFE(() => {\n    if (sortComparator) return Array.from(new Set(Object.values(messageMap))).sort(sortComparator);\n    return Array.from(new Set(Object.values(messageMap)));\n  });\n  const newMessages = Object.values(newMessageMap);\n\n  return {\n    updateLoading,\n    updateRefreshing,\n    updateMessages,\n    deleteMessages,\n\n    loading,\n    refreshing,\n    messages,\n\n    newMessages,\n    updateNewMessages,\n    deleteNewMessages,\n  };\n};\n"],"mappings":"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"}

package/lib/commonjs/channel/useGroupChannelMessages/useGroupChannelMessagesWithCollection.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useGroupChannelMessagesWithCollection = void 0;
 var _react = require("react");
+var _chat = require("@sendbird/chat");
 var _groupChannel = require("@sendbird/chat/groupChannel");
 var _uikitUtils = require("@sendbird/uikit-utils");
 var _useChannelHandler = require("../../handler/useChannelHandler");
@@ -29,9 +30,12 @@ function isNotEmpty(arr) {
   if (!arr) return false;
   return arr.length !== 0;
 }
+function shouldUseSearchLimit(startingPoint) {
+  return startingPoint < Date.now();
+}
 const useGroupChannelMessagesWithCollection = (sdk, channel, userId, options) => {
   const initialStartingPoint = (options === null || options === void 0 ? void 0 : options.startingPoint) ?? Number.MAX_SAFE_INTEGER;
-  const initialLimit = typeof (options === null || options === void 0 ? void 0 : options.startingPoint) === 'number' ? MESSAGE_LIMIT.SEARCH : MESSAGE_LIMIT.DEFAULT;
+  const initialLimit = shouldUseSearchLimit(initialStartingPoint) ? MESSAGE_LIMIT.SEARCH : MESSAGE_LIMIT.DEFAULT;
   const forceUpdate = (0, _uikitUtils.useForceUpdate)();
   const collectionRef = (0, _react.useRef)();
   const collectionInitializedRef = (0, _react.useRef)(false);
@@ -51,9 +55,9 @@ const useGroupChannelMessagesWithCollection = (sdk, channel, userId, options) =>
   const channelMarkAsRead = async source => {
     try {
       switch (source) {
-        case _groupChannel.MessageEventSource.EVENT_MESSAGE_RECEIVED:
-        case _groupChannel.MessageEventSource.EVENT_MESSAGE_SENT_SUCCESS:
-        case _groupChannel.MessageEventSource.SYNC_MESSAGE_FILL:
+        case _chat.CollectionEventSource.EVENT_MESSAGE_RECEIVED:
+        case _chat.CollectionEventSource.EVENT_MESSAGE_SENT_SUCCESS:
+        case _chat.CollectionEventSource.SYNC_MESSAGE_FILL:
         case undefined:
           await (0, _uikitUtils.confirmAndMarkAsRead)([channel]);
           break;
@@ -62,77 +66,66 @@ const useGroupChannelMessagesWithCollection = (sdk, channel, userId, options) =>
       _uikitUtils.Logger.warn('[useGroupChannelMessagesWithCollection/channelMarkAsRead]', e);
     }
   };
-  const updateUnsendMessages = () => {
+  const updateNewMessagesReceived = (source, messages) => {
+    const incomingMessages = messages.filter(it => {
+      var _sdk$currentUser;
+      return !(0, _uikitUtils.isMyMessage)(it, (_sdk$currentUser = sdk.currentUser) === null || _sdk$currentUser === void 0 ? void 0 : _sdk$currentUser.userId);
+    });
+    if (incomingMessages.length > 0) {
+      switch (source) {
+        case _chat.CollectionEventSource.EVENT_MESSAGE_RECEIVED:
+        case _chat.CollectionEventSource.SYNC_MESSAGE_FILL:
+          {
+            var _options$shouldCountN, _sdk$currentUser2, _options$onMessagesRe;
+            if (options !== null && options !== void 0 && (_options$shouldCountN = options.shouldCountNewMessages) !== null && _options$shouldCountN !== void 0 && _options$shouldCountN.call(options)) updateNewMessages(incomingMessages, false, (_sdk$currentUser2 = sdk.currentUser) === null || _sdk$currentUser2 === void 0 ? void 0 : _sdk$currentUser2.userId);
+            options === null || options === void 0 ? void 0 : (_options$onMessagesRe = options.onMessagesReceived) === null || _options$onMessagesRe === void 0 ? void 0 : _options$onMessagesRe.call(options, incomingMessages);
+            break;
+          }
+      }
+    }
+  };
+  const updateUnsentMessages = () => {
+    var _sdk$currentUser3, _sdk$currentUser4;
     const {
       pendingMessages,
       failedMessages
     } = collectionRef.current ?? {};
-    if (isNotEmpty(pendingMessages)) updateMessages(pendingMessages, false, sdk.currentUser.userId);
-    if (isNotEmpty(failedMessages)) updateMessages(failedMessages, false, sdk.currentUser.userId);
+    if (isNotEmpty(pendingMessages)) updateMessages(pendingMessages, false, (_sdk$currentUser3 = sdk.currentUser) === null || _sdk$currentUser3 === void 0 ? void 0 : _sdk$currentUser3.userId);
+    if (isNotEmpty(failedMessages)) updateMessages(failedMessages, false, (_sdk$currentUser4 = sdk.currentUser) === null || _sdk$currentUser4 === void 0 ? void 0 : _sdk$currentUser4.userId);
   };
   const init = (0, _uikitUtils.useFreshCallback)(async (startingPoint, limit, callback) => {
-    var _collectionRef$curren, _collectionRef$curren2;
+    var _collectionRef$curren, _sdk$currentUser5, _collectionRef$curren2;
     if (collectionRef.current) (_collectionRef$curren = collectionRef.current) === null || _collectionRef$curren === void 0 ? void 0 : _collectionRef$curren.dispose();
     channelMarkAsRead();
-    updateNewMessages([], true, sdk.currentUser.userId);
+    updateNewMessages([], true, (_sdk$currentUser5 = sdk.currentUser) === null || _sdk$currentUser5 === void 0 ? void 0 : _sdk$currentUser5.userId);
     collectionInitializedRef.current = false;
     collectionRef.current = createMessageCollection(channel, limit, {
       ...options,
       startingPoint
     });
     (_collectionRef$curren2 = collectionRef.current) === null || _collectionRef$curren2 === void 0 ? void 0 : _collectionRef$curren2.setMessageCollectionHandler({
-      onMessagesAdded: (_, __, messages) => {
-        channelMarkAsRead(_.source);
-        const incomingMessages = messages.filter(it => {
-          switch (_.source) {
-            case _groupChannel.MessageEventSource.EVENT_MESSAGE_SENT_PENDING:
-            case _groupChannel.MessageEventSource.EVENT_MESSAGE_SENT_SUCCESS:
-            case _groupChannel.MessageEventSource.EVENT_MESSAGE_SENT_FAILED:
-              return !(0, _uikitUtils.isMyMessage)(it, sdk.currentUser.userId);
-            default:
-              return true;
-          }
-        });
-        if (incomingMessages.length > 0) {
-          var _options$shouldCountN;
-          updateMessages(incomingMessages, false, sdk.currentUser.userId);
-          if (options !== null && options !== void 0 && (_options$shouldCountN = options.shouldCountNewMessages) !== null && _options$shouldCountN !== void 0 && _options$shouldCountN.call(options)) {
-            updateNewMessages(incomingMessages, false, sdk.currentUser.userId);
-          }
-          switch (_.source) {
-            case _groupChannel.MessageEventSource.EVENT_MESSAGE_RECEIVED:
-            case _groupChannel.MessageEventSource.SYNC_MESSAGE_FILL:
-              {
-                var _options$onMessagesRe;
-                options === null || options === void 0 ? void 0 : (_options$onMessagesRe = options.onMessagesReceived) === null || _options$onMessagesRe === void 0 ? void 0 : _options$onMessagesRe.call(options, incomingMessages);
-              }
-          }
-        }
+      onMessagesAdded: (ctx, __, messages) => {
+        var _sdk$currentUser6;
+        channelMarkAsRead(ctx.source);
+        updateNewMessagesReceived(ctx.source, messages);
+        updateMessages(messages, false, (_sdk$currentUser6 = sdk.currentUser) === null || _sdk$currentUser6 === void 0 ? void 0 : _sdk$currentUser6.userId);
       },
-      onMessagesUpdated: (_, __, messages) => {
-        channelMarkAsRead(_.source);
-        const incomingMessages = messages.filter(it => {
-          switch (_.source) {
-            case _groupChannel.MessageEventSource.EVENT_MESSAGE_UPDATED:
-              return !(0, _uikitUtils.isMyMessage)(it, sdk.currentUser.userId);
-            default:
-              return true;
-          }
-        });
-        if (incomingMessages.length > 0) {
-          var _options$shouldCountN2;
-          // NOTE: admin message is not added via onMessagesAdded handler, not checked yet is this a bug.
-          updateMessages(messages, false, sdk.currentUser.userId);
-          if (options !== null && options !== void 0 && (_options$shouldCountN2 = options.shouldCountNewMessages) !== null && _options$shouldCountN2 !== void 0 && _options$shouldCountN2.call(options)) {
-            if (_.source === _groupChannel.MessageEventSource.EVENT_MESSAGE_RECEIVED) {
-              updateNewMessages(messages, false, sdk.currentUser.userId);
-            }
-          }
+      onMessagesUpdated: (ctx, __, messages) => {
+        var _sdk$currentUser7;
+        channelMarkAsRead(ctx.source);
+        updateNewMessagesReceived(ctx.source, messages); // NOTE: admin message is not added via onMessagesAdded handler, not checked yet is this a bug.
+
+        updateMessages(messages, false, (_sdk$currentUser7 = sdk.currentUser) === null || _sdk$currentUser7 === void 0 ? void 0 : _sdk$currentUser7.userId);
+        if (ctx.source === _chat.CollectionEventSource.EVENT_MESSAGE_UPDATED) {
+          var _options$onMessagesUp;
+          options === null || options === void 0 ? void 0 : (_options$onMessagesUp = options.onMessagesUpdated) === null || _options$onMessagesUp === void 0 ? void 0 : _options$onMessagesUp.call(options, messages);
         }
       },
-      onMessagesDeleted: (_, __, messageIds) => {
-        deleteMessages(messageIds, []);
-        deleteNewMessages(messageIds, []);
+      onMessagesDeleted: (_, __, ___, messages) => {
+        const msgIds = messages.map(it => it.messageId);
+        const reqIds = messages.filter(_uikitUtils.isSendableMessage).map(it => it.reqId);
+        deleteMessages(msgIds, reqIds);
+        deleteNewMessages(msgIds, reqIds);
       },
       onChannelDeleted: () => {
         var _options$onChannelDel;
@@ -148,19 +141,20 @@ const useGroupChannelMessagesWithCollection = (sdk, channel, userId, options) =>
       }
     });
     collectionRef.current.initialize(_groupChannel.MessageCollectionInitPolicy.CACHE_AND_REPLACE_BY_API).onCacheResult((err, messages) => {
-      if (err) sdk.isCacheEnabled && _uikitUtils.Logger.error('[useGroupChannelMessagesWithCollection/onCacheResult]', err);else {
+      if (err) sdk.isCacheEnabled && _uikitUtils.Logger.error('[useGroupChannelMessagesWithCollection/onCacheResult]', err);else if (messages) {
+        var _sdk$currentUser8;
         _uikitUtils.Logger.debug('[useGroupChannelMessagesWithCollection/onCacheResult]', 'message length:', messages.length);
-        updateMessages(messages, true, sdk.currentUser.userId);
-        updateUnsendMessages();
+        updateMessages(messages, true, (_sdk$currentUser8 = sdk.currentUser) === null || _sdk$currentUser8 === void 0 ? void 0 : _sdk$currentUser8.userId);
+        updateUnsentMessages();
       }
       callback === null || callback === void 0 ? void 0 : callback();
     }).onApiResult((err, messages) => {
-      if (err) _uikitUtils.Logger.warn('[useGroupChannelMessagesWithCollection/onApiResult]', err);else {
-        var _options$onMessagesRe2;
+      if (err) _uikitUtils.Logger.warn('[useGroupChannelMessagesWithCollection/onApiResult]', err);else if (messages) {
+        var _sdk$currentUser9, _options$onMessagesRe2;
         _uikitUtils.Logger.debug('[useGroupChannelMessagesWithCollection/onApiResult]', 'message length:', messages.length);
-        updateMessages(messages, true, sdk.currentUser.userId);
+        updateMessages(messages, true, (_sdk$currentUser9 = sdk.currentUser) === null || _sdk$currentUser9 === void 0 ? void 0 : _sdk$currentUser9.userId);
         if (!(options !== null && options !== void 0 && options.startingPoint)) options === null || options === void 0 ? void 0 : (_options$onMessagesRe2 = options.onMessagesReceived) === null || _options$onMessagesRe2 === void 0 ? void 0 : _options$onMessagesRe2.call(options, messages);
-        if (sdk.isCacheEnabled) updateUnsendMessages();
+        if (sdk.isCacheEnabled) updateUnsentMessages();
       }
       collectionInitializedRef.current = true;
       callback === null || callback === void 0 ? void 0 : callback();
@@ -169,7 +163,8 @@ const useGroupChannelMessagesWithCollection = (sdk, channel, userId, options) =>
   (0, _useChannelHandler.useChannelHandler)(sdk, handlerId, {
     onUserBanned(channel, bannedUser) {
       if (channel.isGroupChannel() && !(0, _uikitUtils.isDifferentChannel)(channel, channel)) {
-        if (bannedUser.userId === sdk.currentUser.userId) {
+        var _sdk$currentUser10;
+        if (bannedUser.userId === ((_sdk$currentUser10 = sdk.currentUser) === null || _sdk$currentUser10 === void 0 ? void 0 : _sdk$currentUser10.userId)) {
           var _options$onChannelDel2;
           options === null || options === void 0 ? void 0 : (_options$onChannelDel2 = options.onChannelDeleted) === null || _options$onChannelDel2 === void 0 ? void 0 : _options$onChannelDel2.call(options);
         } else {
@@ -184,7 +179,7 @@ const useGroupChannelMessagesWithCollection = (sdk, channel, userId, options) =>
       updateLoading(true);
       init(initialStartingPoint, initialLimit, () => updateLoading(false));
     }, 0);
-  }, [channel.url, userId]);
+  }, [channel.url, userId, options === null || options === void 0 ? void 0 : options.replyType]);
   (0, _react.useEffect)(() => {
     return () => {
       var _collectionRef$curren3;
@@ -199,9 +194,9 @@ const useGroupChannelMessagesWithCollection = (sdk, channel, userId, options) =>
     var _collectionRef$curren4;
     if (collectionRef.current && (_collectionRef$curren4 = collectionRef.current) !== null && _collectionRef$curren4 !== void 0 && _collectionRef$curren4.hasPrevious) {
       try {
-        var _collectionRef$curren5;
+        var _collectionRef$curren5, _sdk$currentUser11;
         const list = await ((_collectionRef$curren5 = collectionRef.current) === null || _collectionRef$curren5 === void 0 ? void 0 : _collectionRef$curren5.loadPrevious());
-        updateMessages(list, false, sdk.currentUser.userId);
+        updateMessages(list, false, (_sdk$currentUser11 = sdk.currentUser) === null || _sdk$currentUser11 === void 0 ? void 0 : _sdk$currentUser11.userId);
       } catch {}
     }
   });
@@ -216,9 +211,9 @@ const useGroupChannelMessagesWithCollection = (sdk, channel, userId, options) =>
     var _collectionRef$curren6;
     if (collectionRef.current && (_collectionRef$curren6 = collectionRef.current) !== null && _collectionRef$curren6 !== void 0 && _collectionRef$curren6.hasNext) {
       try {
-        var _collectionRef$curren7;
+        var _collectionRef$curren7, _sdk$currentUser12;
         const fetchedList = await ((_collectionRef$curren7 = collectionRef.current) === null || _collectionRef$curren7 === void 0 ? void 0 : _collectionRef$curren7.loadNext());
-        updateMessages(fetchedList, false, sdk.currentUser.userId);
+        updateMessages(fetchedList, false, (_sdk$currentUser12 = sdk.currentUser) === null || _sdk$currentUser12 === void 0 ? void 0 : _sdk$currentUser12.userId);
       } catch {}
     }
   });
@@ -233,16 +228,21 @@ const useGroupChannelMessagesWithCollection = (sdk, channel, userId, options) =>
     return new Promise((resolve, reject) => {
       channel.sendUserMessage(params).onPending(pendingMessage => {
         if (pendingMessage.isUserMessage()) {
+          var _sdk$currentUser13;
           onPending === null || onPending === void 0 ? void 0 : onPending(pendingMessage);
-          updateMessages([pendingMessage], false, sdk.currentUser.userId);
+          updateMessages([pendingMessage], false, (_sdk$currentUser13 = sdk.currentUser) === null || _sdk$currentUser13 === void 0 ? void 0 : _sdk$currentUser13.userId);
         }
       }).onSucceeded(sentMessage => {
         if (sentMessage.isUserMessage()) {
-          updateMessages([sentMessage], false, sdk.currentUser.userId);
+          var _sdk$currentUser14;
+          updateMessages([sentMessage], false, (_sdk$currentUser14 = sdk.currentUser) === null || _sdk$currentUser14 === void 0 ? void 0 : _sdk$currentUser14.userId);
           resolve(sentMessage);
         }
       }).onFailed((err, failedMessage) => {
-        updateMessages([failedMessage], false, sdk.currentUser.userId);
+        if (failedMessage) {
+          var _sdk$currentUser15;
+          updateMessages([failedMessage], false, (_sdk$currentUser15 = sdk.currentUser) === null || _sdk$currentUser15 === void 0 ? void 0 : _sdk$currentUser15.userId);
+        }
         reject(err);
       });
     });
@@ -251,37 +251,45 @@ const useGroupChannelMessagesWithCollection = (sdk, channel, userId, options) =>
     return new Promise((resolve, reject) => {
       channel.sendFileMessage(params).onPending(pendingMessage => {
         if (pendingMessage.isFileMessage()) {
-          updateMessages([pendingMessage], false, sdk.currentUser.userId);
+          var _sdk$currentUser16;
+          updateMessages([pendingMessage], false, (_sdk$currentUser16 = sdk.currentUser) === null || _sdk$currentUser16 === void 0 ? void 0 : _sdk$currentUser16.userId);
           onPending === null || onPending === void 0 ? void 0 : onPending(pendingMessage);
         }
       }).onSucceeded(sentMessage => {
         if (sentMessage.isFileMessage()) {
-          updateMessages([sentMessage], false, sdk.currentUser.userId);
+          var _sdk$currentUser17;
+          updateMessages([sentMessage], false, (_sdk$currentUser17 = sdk.currentUser) === null || _sdk$currentUser17 === void 0 ? void 0 : _sdk$currentUser17.userId);
           resolve(sentMessage);
         }
       }).onFailed((err, failedMessage) => {
-        updateMessages([failedMessage], false, sdk.currentUser.userId);
+        if (failedMessage) {
+          var _sdk$currentUser18;
+          updateMessages([failedMessage], false, (_sdk$currentUser18 = sdk.currentUser) === null || _sdk$currentUser18 === void 0 ? void 0 : _sdk$currentUser18.userId);
+        }
         reject(err);
       });
     });
   });
   const updateUserMessage = (0, _uikitUtils.useFreshCallback)(async (messageId, params) => {
+    var _sdk$currentUser19;
     const updatedMessage = await channel.updateUserMessage(messageId, params);
-    updateMessages([updatedMessage], false, sdk.currentUser.userId);
+    updateMessages([updatedMessage], false, (_sdk$currentUser19 = sdk.currentUser) === null || _sdk$currentUser19 === void 0 ? void 0 : _sdk$currentUser19.userId);
     return updatedMessage;
   });
   const updateFileMessage = (0, _uikitUtils.useFreshCallback)(async (messageId, params) => {
+    var _sdk$currentUser20;
     const updatedMessage = await channel.updateFileMessage(messageId, params);
-    updateMessages([updatedMessage], false, sdk.currentUser.userId);
+    updateMessages([updatedMessage], false, (_sdk$currentUser20 = sdk.currentUser) === null || _sdk$currentUser20 === void 0 ? void 0 : _sdk$currentUser20.userId);
     return updatedMessage;
   });
   const resendMessage = (0, _uikitUtils.useFreshCallback)(async failedMessage => {
+    var _sdk$currentUser21;
     const resentMessage = await (() => {
       if (failedMessage.isUserMessage()) return channel.resendUserMessage(failedMessage);
       if (failedMessage.isFileMessage()) return channel.resendFileMessage(failedMessage);
       return null;
     })();
-    if (resentMessage) updateMessages([resentMessage], false, sdk.currentUser.userId);
+    if (resentMessage) updateMessages([resentMessage], false, (_sdk$currentUser21 = sdk.currentUser) === null || _sdk$currentUser21 === void 0 ? void 0 : _sdk$currentUser21.userId);
   });
   const deleteMessage = (0, _uikitUtils.useFreshCallback)(async message => {
     if (message.sendingStatus === 'succeeded') {
@@ -297,12 +305,15 @@ const useGroupChannelMessagesWithCollection = (sdk, channel, userId, options) =>
     }
   });
   const resetNewMessages = (0, _uikitUtils.useFreshCallback)(() => {
-    updateNewMessages([], true, sdk.currentUser.userId);
+    var _sdk$currentUser22;
+    updateNewMessages([], true, (_sdk$currentUser22 = sdk.currentUser) === null || _sdk$currentUser22 === void 0 ? void 0 : _sdk$currentUser22.userId);
   });
   const resetWithStartingPoint = (0, _uikitUtils.useFreshCallback)((startingPoint, callback) => {
+    var _sdk$currentUser23;
+    const limit = shouldUseSearchLimit(startingPoint) ? MESSAGE_LIMIT.SEARCH : MESSAGE_LIMIT.DEFAULT;
     updateLoading(true);
-    updateMessages([], true, sdk.currentUser.userId);
-    init(startingPoint, MESSAGE_LIMIT.DEFAULT, () => {
+    updateMessages([], true, (_sdk$currentUser23 = sdk.currentUser) === null || _sdk$currentUser23 === void 0 ? void 0 : _sdk$currentUser23.userId);
+    init(startingPoint, limit, () => {
       updateLoading(false);
       callback === null || callback === void 0 ? void 0 : callback();
     });