stream-chat-react 10.22.0 → 10.22.1

package/dist/components/MessageList/hooks/VirtualizedMessageList/usePrependMessagesCount.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usePrependMessagesCount.d.ts","sourceRoot":"","sources":["../../../../../src/components/MessageList/hooks/VirtualizedMessageList/usePrependMessagesCount.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAE7E,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAIzE,wBAAgB,yBAAyB,CACvC,kBAAkB,SAAS,yBAAyB,GAAG,yBAAyB,EAChF,QAAQ,EAAE,aAAa,CAAC,kBAAkB,CAAC,EAAE,EAAE,gBAAgB,EAAE,OAAO,UA2DzE"}
+{"version":3,"file":"usePrependMessagesCount.d.ts","sourceRoot":"","sources":["../../../../../src/components/MessageList/hooks/VirtualizedMessageList/usePrependMessagesCount.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAE7E,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAOzE,wBAAgB,yBAAyB,CACvC,kBAAkB,SAAS,yBAAyB,GAAG,yBAAyB,EAChF,QAAQ,EAAE,aAAa,CAAC,kBAAkB,CAAC,EAAE,EAAE,gBAAgB,EAAE,OAAO,UAgEzE"}

package/dist/components/MessageList/hooks/VirtualizedMessageList/usePrependMessagesCount.js

@@ -1,9 +1,12 @@
 import { useMemo, useRef } from 'react';
-var STATUSES_EXCLUDED_FROM_PREPEND = ['sending', 'failed'];
+var STATUSES_EXCLUDED_FROM_PREPEND = {
+    failed: true,
+    sending: true,
+};
 export function usePrependedMessagesCount(messages, hasDateSeparator) {
     var firstRealMessageIndex = hasDateSeparator ? 1 : 0;
-    var firstMessageId = useRef();
-    var earliestMessageId = useRef();
+    var firstMessageOnFirstLoadedPage = useRef();
+    var previousFirstMessageOnFirstLoadedPage = useRef();
     var previousNumItemsPrepended = useRef(0);
     var numItemsPrepended = useMemo(function () {
         var _a, _b;
@@ -11,46 +14,42 @@ export function usePrependedMessagesCount(messages, hasDateSeparator) {
             previousNumItemsPrepended.current = 0;
             return 0;
         }
-        var currentFirstMessageId = (_a = messages === null || messages === void 0 ? void 0 : messages[firstRealMessageIndex]) === null || _a === void 0 ? void 0 : _a.id;
-        // if no new messages were prepended, return early (same amount as before)
-        if (currentFirstMessageId === earliestMessageId.current) {
+        var currentFirstMessage = messages === null || messages === void 0 ? void 0 : messages[firstRealMessageIndex];
+        var noNewMessages = (currentFirstMessage === null || currentFirstMessage === void 0 ? void 0 : currentFirstMessage.id) === ((_a = previousFirstMessageOnFirstLoadedPage.current) === null || _a === void 0 ? void 0 : _a.id);
+        // This is possible only, when sending messages very quickly (basically single char messages submitted like a crazy) in empty channel (first page)
+        // 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 firstMessageOnFirstLoadedPage.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.
+        var firstMsgMovedAfterMessagesInExcludedStatus = (currentFirstMessage === null || currentFirstMessage === void 0 ? void 0 : currentFirstMessage.status) && STATUSES_EXCLUDED_FROM_PREPEND[currentFirstMessage.status];
+        if (noNewMessages || firstMsgMovedAfterMessagesInExcludedStatus) {
             return previousNumItemsPrepended.current;
         }
-        if (!firstMessageId.current) {
-            firstMessageId.current = currentFirstMessageId;
+        if (!firstMessageOnFirstLoadedPage.current) {
+            firstMessageOnFirstLoadedPage.current = currentFirstMessage;
         }
-        earliestMessageId.current = currentFirstMessageId;
+        previousFirstMessageOnFirstLoadedPage.current = currentFirstMessage;
         // 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 - adjustPrependedMessageCount;
-                return previousNumItemsPrepended.current;
+        for (var prependedMessageCount = previousNumItemsPrepended.current; prependedMessageCount < messages.length; prependedMessageCount += 1) {
+            var messageIsFirstOnFirstLoadedPage = messages[prependedMessageCount].id === ((_b = firstMessageOnFirstLoadedPage.current) === null || _b === void 0 ? void 0 : _b.id);
+            if (messageIsFirstOnFirstLoadedPage) {
+                previousNumItemsPrepended.current = prependedMessageCount;
+                return prependedMessageCount;
             }
         }
         // if no match has found, we have jumped - reset the prepended item count.
-        firstMessageId.current = currentFirstMessageId;
+        firstMessageOnFirstLoadedPage.current = currentFirstMessage;
         previousNumItemsPrepended.current = 0;
         return 0;
         // TODO: there's a bug here, the messages prop is the same array instance (something mutates it)
         // that's why the second dependency is necessary
-    }, [messages, messages === null || messages === void 0 ? void 0 : messages.length]);
+    }, [firstRealMessageIndex, messages, messages === null || messages === void 0 ? void 0 : messages.length]);
     return numItemsPrepended;
 }

package/dist/index.cjs.js

@@ -35160,7 +35160,7 @@ var UnMemoizedChannelList = function (props) {
  */
 var ChannelList = React__default["default"].memo(UnMemoizedChannelList);
 
-var version = '10.22.0';
+var version = '10.22.1';
 
 var useChat = function (_a) {
     var _b, _c;
@@ -36730,11 +36730,14 @@ function useNewMessageNotification(messages, currentUserId, hasMoreNewer) {
     };
 }
 
-var STATUSES_EXCLUDED_FROM_PREPEND = ['sending', 'failed'];
+var STATUSES_EXCLUDED_FROM_PREPEND = {
+    failed: true,
+    sending: true,
+};
 function usePrependedMessagesCount(messages, hasDateSeparator) {
     var firstRealMessageIndex = hasDateSeparator ? 1 : 0;
-    var firstMessageId = React.useRef();
-    var earliestMessageId = React.useRef();
+    var firstMessageOnFirstLoadedPage = React.useRef();
+    var previousFirstMessageOnFirstLoadedPage = React.useRef();
     var previousNumItemsPrepended = React.useRef(0);
     var numItemsPrepended = React.useMemo(function () {
         var _a, _b;
@@ -36742,47 +36745,43 @@ function usePrependedMessagesCount(messages, hasDateSeparator) {
             previousNumItemsPrepended.current = 0;
             return 0;
         }
-        var currentFirstMessageId = (_a = messages === null || messages === void 0 ? void 0 : messages[firstRealMessageIndex]) === null || _a === void 0 ? void 0 : _a.id;
-        // if no new messages were prepended, return early (same amount as before)
-        if (currentFirstMessageId === earliestMessageId.current) {
+        var currentFirstMessage = messages === null || messages === void 0 ? void 0 : messages[firstRealMessageIndex];
+        var noNewMessages = (currentFirstMessage === null || currentFirstMessage === void 0 ? void 0 : currentFirstMessage.id) === ((_a = previousFirstMessageOnFirstLoadedPage.current) === null || _a === void 0 ? void 0 : _a.id);
+        // This is possible only, when sending messages very quickly (basically single char messages submitted like a crazy) in empty channel (first page)
+        // 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 firstMessageOnFirstLoadedPage.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.
+        var firstMsgMovedAfterMessagesInExcludedStatus = (currentFirstMessage === null || currentFirstMessage === void 0 ? void 0 : currentFirstMessage.status) && STATUSES_EXCLUDED_FROM_PREPEND[currentFirstMessage.status];
+        if (noNewMessages || firstMsgMovedAfterMessagesInExcludedStatus) {
             return previousNumItemsPrepended.current;
         }
-        if (!firstMessageId.current) {
-            firstMessageId.current = currentFirstMessageId;
+        if (!firstMessageOnFirstLoadedPage.current) {
+            firstMessageOnFirstLoadedPage.current = currentFirstMessage;
         }
-        earliestMessageId.current = currentFirstMessageId;
+        previousFirstMessageOnFirstLoadedPage.current = currentFirstMessage;
         // 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 - adjustPrependedMessageCount;
-                return previousNumItemsPrepended.current;
+        for (var prependedMessageCount = previousNumItemsPrepended.current; prependedMessageCount < messages.length; prependedMessageCount += 1) {
+            var messageIsFirstOnFirstLoadedPage = messages[prependedMessageCount].id === ((_b = firstMessageOnFirstLoadedPage.current) === null || _b === void 0 ? void 0 : _b.id);
+            if (messageIsFirstOnFirstLoadedPage) {
+                previousNumItemsPrepended.current = prependedMessageCount;
+                return prependedMessageCount;
             }
         }
         // if no match has found, we have jumped - reset the prepended item count.
-        firstMessageId.current = currentFirstMessageId;
+        firstMessageOnFirstLoadedPage.current = currentFirstMessage;
         previousNumItemsPrepended.current = 0;
         return 0;
         // TODO: there's a bug here, the messages prop is the same array instance (something mutates it)
         // that's why the second dependency is necessary
-    }, [messages, messages === null || messages === void 0 ? void 0 : messages.length]);
+    }, [firstRealMessageIndex, messages, messages === null || messages === void 0 ? void 0 : messages.length]);
     return numItemsPrepended;
 }