stream-chat-angular 4.39.5 → 4.39.6

package/fesm2015/stream-chat-angular.js

@@ -20,7 +20,7 @@ import transliterate from '@stream-io/transliterate';
 import * as i8 from 'angular-mentions';
 import { MentionModule } from 'angular-mentions';
 
-const version = '4.39.5';
+const version = '4.39.6';
 
 /**
  * The `NotificationService` can be used to add or remove notifications. By default the [`NotificationList`](../components/NotificationListComponent.mdx) component displays the currently active notifications.
@@ -309,6 +309,7 @@ class ChannelService {
         this.activeChannelPinnedMessagesSubject = new BehaviorSubject([]);
         this.hasMoreChannelsSubject = new ReplaySubject(1);
         this.activeChannelSubscriptions = [];
+        this.channelSubscriptions = {};
         this.activeParentMessageIdSubject = new BehaviorSubject(undefined);
         this.activeThreadMessagesSubject = new BehaviorSubject([]);
         this.jumpToMessageSubject = new BehaviorSubject({ id: undefined, parentId: undefined });
@@ -320,12 +321,12 @@ class ChannelService {
         this._shouldMarkActiveChannelAsRead = true;
         this.isStateRecoveryInProgress = false;
         this.channelQueryStateSubject = new BehaviorSubject(undefined);
-        this.channelListSetter = (channels) => {
+        this.channelListSetter = (channels, shouldStopWatchingRemovedChannels = true) => {
             const currentChannels = this.channelsSubject.getValue() || [];
             const newChannels = channels.filter((c) => !currentChannels.find((channel) => channel.cid === c.cid));
             const deletedChannels = currentChannels.filter((c) => !(channels === null || channels === void 0 ? void 0 : channels.find((channel) => channel.cid === c.cid)));
             void this.addChannelsFromNotification(newChannels);
-            this.removeChannelsFromChannelList(deletedChannels.map((c) => c.cid));
+            this.removeChannelsFromChannelList(deletedChannels.map((c) => c.cid), shouldStopWatchingRemovedChannels);
         };
         this.messageListSetter = (messages) => {
             this.activeChannelMessagesSubject.next(messages);
@@ -568,6 +569,10 @@ class ChannelService {
         (_a = this.clientEventsSubscription) === null || _a === void 0 ? void 0 : _a.unsubscribe();
         (_b = this.dismissErrorNotification) === null || _b === void 0 ? void 0 : _b.call(this);
         this.dismissErrorNotification = undefined;
+        Object.keys(this.channelSubscriptions).forEach((cid) => {
+            this.channelSubscriptions[cid]();
+        });
+        this.channelSubscriptions = {};
     }
     /**
      * Loads the next page of channels. The page size can be set in the [query option](https://getstream.io/chat/docs/javascript/query_channels/?language=javascript#query-options) object.
@@ -966,7 +971,7 @@ class ChannelService {
     }
     handleRemovedFromChannelNotification(clientEvent) {
         const channelIdToBeRemoved = clientEvent.event.channel.cid;
-        this.removeChannelsFromChannelList([channelIdToBeRemoved]);
+        this.removeChannelsFromChannelList([channelIdToBeRemoved], true);
     }
     handleNewMessageNotification(clientEvent) {
         if (clientEvent.event.channel) {
@@ -996,13 +1001,19 @@ class ChannelService {
             }
         });
     }
-    removeChannelsFromChannelList(cids) {
+    removeChannelsFromChannelList(cids, shouldStopWatching) {
         var _a;
         const channels = this.channels.filter((c) => !cids.includes(c.cid || ''));
-        cids.forEach((cid) => {
-            var _a;
-            return void ((_a = this.chatClientService.chatClient.activeChannels[cid]) === null || _a === void 0 ? void 0 : _a.stopWatching());
-        });
+        if (shouldStopWatching) {
+            cids.forEach((cid) => {
+                var _a;
+                if (this.channelSubscriptions[cid]) {
+                    this.channelSubscriptions[cid]();
+                    delete this.channelSubscriptions.cid;
+                }
+                void ((_a = this.chatClientService.chatClient.activeChannels[cid]) === null || _a === void 0 ? void 0 : _a.stopWatching());
+            });
+        }
         if (channels.length < this.channels.length) {
             this.channelsSubject.next(channels);
             if (cids.includes(((_a = this.activeChannelSubject.getValue()) === null || _a === void 0 ? void 0 : _a.cid) || '')) {
@@ -1197,7 +1208,7 @@ class ChannelService {
         });
     }
     watchForChannelEvents(channel) {
-        channel.on((event) => {
+        const unsubscribe = channel.on((event) => {
             switch (event.type) {
                 case 'message.new': {
                     this.ngZone.run(() => {
@@ -1267,6 +1278,7 @@ class ChannelService {
                 }
             }
         });
+        this.channelSubscriptions[channel.cid] = unsubscribe.unsubscribe;
     }
     handleNewMessage(_, channel) {
         const channelIndex = this.channels.findIndex((c) => c.cid === channel.cid);
@@ -1274,10 +1286,10 @@ class ChannelService {
         this.channelsSubject.next([channel, ...this.channels]);
     }
     handleChannelHidden(event) {
-        this.removeChannelsFromChannelList([event.channel.cid]);
+        this.removeChannelsFromChannelList([event.channel.cid], false);
     }
     handleChannelDeleted(event) {
-        this.removeChannelsFromChannelList([event.channel.cid]);
+        this.removeChannelsFromChannelList([event.channel.cid], true);
     }
     handleChannelVisible(event, channel) {
         if (!this.channels.find((c) => c.cid === event.cid)) {