Merge pull request #688 from GetStream/run-ws-events-inside-scope

feat: run all WS event handlers inside Angular's zone
GetStream · Feb 20, 2025 · 785513e · 785513e
2 parents 413a800 + b64baf1
commit 785513e
Show file tree

Hide file tree

Showing 4 changed files with 305 additions and 354 deletions.
diff --git a/projects/stream-chat-angular/src/lib/avatar/avatar.component.ts b/projects/stream-chat-angular/src/lib/avatar/avatar.component.ts
@@ -163,9 +163,7 @@ export class AvatarComponent
           .pipe(filter((e) => e.eventType === 'user.presence.changed'))
           .subscribe((event) => {
             if (event.event.user?.id === otherMember.id) {
-              this.ngZone.run(() => {
-                this.isOnline = event.event.user?.online || false;
-              });
+              this.isOnline = event.event.user?.online || false;
             }
           });
       } else {

diff --git a/projects/stream-chat-angular/src/lib/channel-preview/channel-preview.component.ts b/projects/stream-chat-angular/src/lib/channel-preview/channel-preview.component.ts
@@ -85,12 +85,10 @@ export class ChannelPreviewComponent implements OnInit, OnDestroy {
       this.channel!.on('channel.truncated', this.handleMessageEvent.bind(this))
     );
     this.subscriptions.push(
-      this.channel!.on('message.read', () =>
-        this.ngZone.run(() => {
-          this.isUnreadMessageWasCalled = false;
-          this.updateUnreadState();
-        })
-      )
+      this.channel!.on('message.read', () => {
+        this.isUnreadMessageWasCalled = false;
+        this.updateUnreadState();
+      })
     );
     this.subscriptions.push(
       this.chatClientService.events$
@@ -102,10 +100,8 @@ export class ChannelPreviewComponent implements OnInit, OnDestroy {
           )
         )
         .subscribe(() => {
-          this.ngZone.run(() => {
-            this.isUnreadMessageWasCalled = true;
-            this.updateUnreadState();
-          });
+          this.isUnreadMessageWasCalled = true;
+          this.updateUnreadState();
         })
     );
   }
@@ -137,24 +133,22 @@ export class ChannelPreviewComponent implements OnInit, OnDestroy {
   }
 
   private handleMessageEvent(event: Event) {
-    this.ngZone.run(() => {
-      if (this.channel?.state.latestMessages.length === 0) {
-        this.latestMessage = undefined;
-        this.latestMessageStatus = undefined;
-        this.latestMessageText = 'streamChat.Nothing yet...';
-        this.latestMessageTime = undefined;
-        return;
-      }
-      const latestMessage =
-        this.channel?.state.latestMessages[
-          this.channel?.state.latestMessages.length - 1
-        ];
-      if (!event.message || latestMessage?.id !== event.message.id) {
-        return;
-      }
-      this.setLatestMessage(latestMessage);
-      this.updateUnreadState();
-    });
+    if (this.channel?.state.latestMessages.length === 0) {
+      this.latestMessage = undefined;
+      this.latestMessageStatus = undefined;
+      this.latestMessageText = 'streamChat.Nothing yet...';
+      this.latestMessageTime = undefined;
+      return;
+    }
+    const latestMessage =
+      this.channel?.state.latestMessages[
+        this.channel?.state.latestMessages.length - 1
+      ];
+    if (!event.message || latestMessage?.id !== event.message.id) {
+      return;
+    }
+    this.setLatestMessage(latestMessage);
+    this.updateUnreadState();
   }
 
   private setLatestMessage(