stream-chat-react 10.7.2 → 10.7.4

package/dist/browser.full-bundle.js

@@ -46653,55 +46653,78 @@ var StreamChatReact = (function (exports, React$2, streamChat, ReactDOM) {
             }
         };
         var markReadThrottled = lodash_throttle(markRead, 500, { leading: true, trailing: true });
-        var handleEvent = function (event) {
-            var _a, _b, _c, _d, _e, _f, _g, _h;
-            if (event.message) {
-                dispatch({
-                    channel: channel,
-                    message: event.message,
-                    type: 'updateThreadOnEvent',
-                });
-            }
-            if (event.type === 'user.watching.start' || event.type === 'user.watching.stop')
-                return;
-            if (event.type === 'typing.start' || event.type === 'typing.stop') {
-                return dispatch({ channel: channel, type: 'setTyping' });
-            }
-            if (event.type === 'connection.changed' && typeof event.online === 'boolean') {
-                online.current = event.online;
-            }
-            if (event.type === 'message.new') {
-                var mainChannelUpdated = true;
-                if (((_a = event.message) === null || _a === void 0 ? void 0 : _a.parent_id) && !((_b = event.message) === null || _b === void 0 ? void 0 : _b.show_in_channel)) {
-                    mainChannelUpdated = false;
-                }
-                if (mainChannelUpdated && ((_d = (_c = event.message) === null || _c === void 0 ? void 0 : _c.user) === null || _d === void 0 ? void 0 : _d.id) !== client.userID) {
-                    if (!document.hidden) {
-                        markReadThrottled();
-                    }
-                    else if ((channelConfig === null || channelConfig === void 0 ? void 0 : channelConfig.read_events) && !channel.muteStatus().muted) {
-                        var unread = channel.countUnread(lastRead.current);
-                        if (activeUnreadHandler) {
-                            activeUnreadHandler(unread, originalTitle.current);
+        var handleEvent = function (event) { return __awaiter$1(void 0, void 0, void 0, function () {
+            var mainChannelUpdated, unread, messageDate, cid, oldestID;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+            return __generator$1(this, function (_m) {
+                switch (_m.label) {
+                    case 0:
+                        if (event.message) {
+                            dispatch({
+                                channel: channel,
+                                message: event.message,
+                                type: 'updateThreadOnEvent',
+                            });
                         }
-                        else {
-                            document.title = "(".concat(unread, ") ").concat(originalTitle.current);
+                        if (event.type === 'user.watching.start' || event.type === 'user.watching.stop')
+                            return [2 /*return*/];
+                        if (event.type === 'typing.start' || event.type === 'typing.stop') {
+                            return [2 /*return*/, dispatch({ channel: channel, type: 'setTyping' })];
                         }
-                    }
-                }
-                if (((_f = (_e = event.message) === null || _e === void 0 ? void 0 : _e.user) === null || _f === void 0 ? void 0 : _f.id) === client.userID &&
-                    ((_g = event === null || event === void 0 ? void 0 : event.message) === null || _g === void 0 ? void 0 : _g.created_at) &&
-                    ((_h = event === null || event === void 0 ? void 0 : event.message) === null || _h === void 0 ? void 0 : _h.cid)) {
-                    var messageDate = new Date(event.message.created_at);
-                    var cid = event.message.cid;
-                    if (!latestMessageDatesByChannels[cid] ||
-                        latestMessageDatesByChannels[cid].getTime() < messageDate.getTime()) {
-                        latestMessageDatesByChannels[cid] = messageDate;
-                    }
+                        if (event.type === 'connection.changed' && typeof event.online === 'boolean') {
+                            online.current = event.online;
+                        }
+                        if (event.type === 'message.new') {
+                            mainChannelUpdated = true;
+                            if (((_a = event.message) === null || _a === void 0 ? void 0 : _a.parent_id) && !((_b = event.message) === null || _b === void 0 ? void 0 : _b.show_in_channel)) {
+                                mainChannelUpdated = false;
+                            }
+                            if (mainChannelUpdated && ((_d = (_c = event.message) === null || _c === void 0 ? void 0 : _c.user) === null || _d === void 0 ? void 0 : _d.id) !== client.userID) {
+                                if (!document.hidden) {
+                                    markReadThrottled();
+                                }
+                                else if ((channelConfig === null || channelConfig === void 0 ? void 0 : channelConfig.read_events) && !channel.muteStatus().muted) {
+                                    unread = channel.countUnread(lastRead.current);
+                                    if (activeUnreadHandler) {
+                                        activeUnreadHandler(unread, originalTitle.current);
+                                    }
+                                    else {
+                                        document.title = "(".concat(unread, ") ").concat(originalTitle.current);
+                                    }
+                                }
+                            }
+                            if (((_f = (_e = event.message) === null || _e === void 0 ? void 0 : _e.user) === null || _f === void 0 ? void 0 : _f.id) === client.userID &&
+                                ((_g = event === null || event === void 0 ? void 0 : event.message) === null || _g === void 0 ? void 0 : _g.created_at) &&
+                                ((_h = event === null || event === void 0 ? void 0 : event.message) === null || _h === void 0 ? void 0 : _h.cid)) {
+                                messageDate = new Date(event.message.created_at);
+                                cid = event.message.cid;
+                                if (!latestMessageDatesByChannels[cid] ||
+                                    latestMessageDatesByChannels[cid].getTime() < messageDate.getTime()) {
+                                    latestMessageDatesByChannels[cid] = messageDate;
+                                }
+                            }
+                        }
+                        if (!(event.type === 'user.deleted')) return [3 /*break*/, 2];
+                        oldestID = (_l = (_k = (_j = channel.state) === null || _j === void 0 ? void 0 : _j.messages) === null || _k === void 0 ? void 0 : _k[0]) === null || _l === void 0 ? void 0 : _l.id;
+                        /**
+                         * As the channel state is not normalized we re-fetch the channel data. Thus we avoid having to search for user references in the channel state.
+                         */
+                        return [4 /*yield*/, channel.query({
+                                messages: { id_lt: oldestID, limit: DEFAULT_NEXT_CHANNEL_PAGE_SIZE },
+                                watchers: { limit: DEFAULT_NEXT_CHANNEL_PAGE_SIZE },
+                            })];
+                    case 1:
+                        /**
+                         * As the channel state is not normalized we re-fetch the channel data. Thus we avoid having to search for user references in the channel state.
+                         */
+                        _m.sent();
+                        _m.label = 2;
+                    case 2:
+                        throttledCopyStateFromChannel();
+                        return [2 /*return*/];
                 }
-            }
-            throttledCopyStateFromChannel();
-        };
+            });
+        }); };
         // useLayoutEffect here to prevent spinner. Use Suspense when it is available in stable release
         React$2.useLayoutEffect(function () {
             var errored = false;
@@ -48355,7 +48378,7 @@ var StreamChatReact = (function (exports, React$2, streamChat, ReactDOM) {
 
     window.StreamChat.StreamChat=StreamChat;window.StreamChat.logChatPromiseExecution=logChatPromiseExecution;window.StreamChat.Channel=Channel;window.ICAL=window.ICAL||{};
 
-    window.StreamChat.StreamChat=StreamChat;window.StreamChat.logChatPromiseExecution=logChatPromiseExecution;window.StreamChat.Channel=Channel;window.ICAL=window.ICAL||{};var version$1 = '10.7.2';
+    window.StreamChat.StreamChat=StreamChat;window.StreamChat.logChatPromiseExecution=logChatPromiseExecution;window.StreamChat.Channel=Channel;window.ICAL=window.ICAL||{};var version$1 = '10.7.4';
 
     window.StreamChat.StreamChat=StreamChat;window.StreamChat.logChatPromiseExecution=logChatPromiseExecution;window.StreamChat.Channel=Channel;window.ICAL=window.ICAL||{};var useChat = function (_a) {
         var _b, _c;
@@ -51180,13 +51203,14 @@ var StreamChatReact = (function (exports, React$2, streamChat, ReactDOM) {
         };
     }
 
-    window.StreamChat.StreamChat=StreamChat;window.StreamChat.logChatPromiseExecution=logChatPromiseExecution;window.StreamChat.Channel=Channel;window.ICAL=window.ICAL||{};function usePrependedMessagesCount(messages, hasDateSeparator) {
+    window.StreamChat.StreamChat=StreamChat;window.StreamChat.logChatPromiseExecution=logChatPromiseExecution;window.StreamChat.Channel=Channel;window.ICAL=window.ICAL||{};var STATUSES_EXCLUDED_FROM_PREPEND = ['sending', 'failed'];
+    function usePrependedMessagesCount(messages, hasDateSeparator) {
         var firstRealMessageIndex = hasDateSeparator ? 1 : 0;
         var firstMessageId = React$2.useRef();
         var earliestMessageId = React$2.useRef();
         var previousNumItemsPrepended = React$2.useRef(0);
         var numItemsPrepended = React$2.useMemo(function () {
-            var _a;
+            var _a, _b;
             if (!messages || !messages.length) {
                 previousNumItemsPrepended.current = 0;
                 return 0;
@@ -51202,13 +51226,30 @@ var StreamChatReact = (function (exports, React$2, streamChat, ReactDOM) {
             earliestMessageId.current = currentFirstMessageId;
             // if new messages were prepended, find out how many
             // start with this number because there cannot be fewer prepended items than before
+            var adjustPrependedMessageCount = 0;
             for (var i = previousNumItemsPrepended.current; i < messages.length; i += 1) {
+                // Optimistic UI update, when sending messages, can lead to a situation, when
+                // the order of the messages changes for a moment. This can happen, when a user
+                // sends multiple messages withing few milliseconds. E.g. we send a message A
+                // then message B. At first we have message array with both messages of status "sending"
+                // then response for message A is received with a new - later - created_at timestamp
+                // this leads to rearrangement of 1.B ("sending"), 2.A ("received"). Still firstMessageId.current
+                // points to message A, but now this message has index 1 => previousNumItemsPrepended.current === 1
+                // That in turn leads to incorrect index calculation in VirtualizedMessageList trying to access a message
+                // at non-existent index. Therefore, we ignore messages of status "sending" / "failed" in order they are
+                // not considered as prepended messages.
+                if (((_b = messages[i]) === null || _b === void 0 ? void 0 : _b.status) &&
+                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                    STATUSES_EXCLUDED_FROM_PREPEND.includes(messages[i].status) &&
+                    messages[i].id !== firstMessageId.current) {
+                    adjustPrependedMessageCount++;
+                }
                 if (messages[i].id === firstMessageId.current) {
-                    previousNumItemsPrepended.current = i;
-                    return i;
+                    previousNumItemsPrepended.current = i - adjustPrependedMessageCount;
+                    return previousNumItemsPrepended.current;
                 }
             }
-            // if no match has found, we have jumped - reset the prepend item count.
+            // if no match has found, we have jumped - reset the prepended item count.
             firstMessageId.current = currentFirstMessageId;
             previousNumItemsPrepended.current = 0;
             return 0;