stream-chat-angular 5.11.0 → 5.11.1

package/fesm2020/stream-chat-angular.mjs

@@ -20,7 +20,7 @@ import transliterate from '@stream-io/transliterate';
 import * as i8 from 'angular-mentions';
 import { MentionModule } from 'angular-mentions';
 
-const version = '5.11.0';
+const version = '5.11.1';
 
 /**
  * The `NotificationService` can be used to add or remove notifications. By default the [`NotificationList`](/chat/docs/sdk/angular/components/NotificationListComponent/) component displays the currently active notifications.
@@ -447,6 +447,10 @@ class ChannelService {
         this.chatClientService = chatClientService;
         this.ngZone = ngZone;
         this.notificationService = notificationService;
+        /**
+         * @internal
+         */
+        this.isMessageLoadingInProgress = false;
         this.messagePageSize = 25;
         this.channelsSubject = new BehaviorSubject(undefined);
         this.activeChannelSubject = new BehaviorSubject(undefined);
@@ -612,6 +616,7 @@ class ChannelService {
         this.stopWatchForActiveChannelEvents(prevActiveChannel);
         this.flushMarkReadQueue();
         this.areReadEventsPaused = false;
+        this.isMessageLoadingInProgress = false;
         const readState = channel.state.read[this.chatClientService.chatClient.user?.id || ''];
         this.activeChannelLastReadMessageId = readState?.last_read_message_id;
         if (channel.state.latestMessages[channel.state.latestMessages.length - 1]
@@ -651,6 +656,7 @@ class ChannelService {
         this.activeChannelLastReadMessageId = undefined;
         this.activeChannelUnreadCount = undefined;
         this.areReadEventsPaused = false;
+        this.isMessageLoadingInProgress = false;
     }
     /**
      * Sets the given `message` as an active parent message. If `undefined` is provided, it will deleselect the current parent message.
@@ -1177,6 +1183,7 @@ class ChannelService {
      * @param parentMessageId The ID of the parent message if we want to load a thread message
      */
     async jumpToMessage(messageId, parentMessageId) {
+        this.isMessageLoadingInProgress = true;
         const activeChannel = this.activeChannelSubject.getValue();
         try {
             await activeChannel?.state.loadMessageIntoState(messageId, parentMessageId);
@@ -1195,6 +1202,9 @@ class ChannelService {
             this.notificationService.addTemporaryNotification('streamChat.Message not found');
             throw error;
         }
+        finally {
+            this.isMessageLoadingInProgress = false;
+        }
     }
     /**
      * Clears the currently selected message to jump
@@ -7780,9 +7790,9 @@ class MessageListComponent {
             this.forceRepaint();
         }));
         this.subscriptions.push(this.channelService.activeChannel$.subscribe((channel) => {
-            let isNewChannel = false;
+            let wasChannelSwitch = false;
             if (this.channelId !== channel?.id) {
-                isNewChannel = true;
+                wasChannelSwitch = true;
                 if (this.checkIfUnreadNotificationIsVisibleTimeout) {
                     clearTimeout(this.checkIfUnreadNotificationIsVisibleTimeout);
                 }
@@ -7805,9 +7815,16 @@ class MessageListComponent {
                     unreadCount !== this.unreadCount) {
                     this.lastReadMessageId = lastReadMessageId;
                     this.unreadCount = unreadCount || 0;
-                    if (isNewChannel && this.lastReadMessageId) {
+                    if (wasChannelSwitch && this.lastReadMessageId) {
+                        // Delay jumping to last read message in case we need to give precedence to channelService.jumpToMessage
                         if (this.openMessageListAt === 'last-read-message') {
-                            this.jumpToFirstUnreadMessage();
+                            setTimeout(() => {
+                                // Don't jump if a jump to a message was already started (using channelService.jumpToMessage)
+                                if (!this.isJumpingToMessage &&
+                                    !this.channelService.isMessageLoadingInProgress) {
+                                    this.jumpToFirstUnreadMessage();
+                                }
+                            }, 0);
                         }
                         else {
                             // Wait till messages and the unread banner is rendered
@@ -8193,8 +8210,9 @@ class MessageListComponent {
                 !this.firstUnreadMessageId &&
                 this.lastReadMessageId) {
                 const lastReadIndex = messages.findIndex((m) => m.id === this.lastReadMessageId);
-                this.firstUnreadMessageId =
-                    messages[lastReadIndex + 1]?.id || this.lastReadMessageId;
+                if (lastReadIndex !== -1) {
+                    this.firstUnreadMessageId = messages[lastReadIndex + 1]?.id;
+                }
             }
         }), tap((messages) => (this.lastSentMessageId = [...messages]
             .reverse()