stream-chat 9.6.0 → 9.6.1

package/dist/types/utils/WithSubscriptions.d.ts

@@ -10,14 +10,19 @@ export declare abstract class WithSubscriptions {
      * overriding `unregisterSubscriptions` call the base method and return
      * its unique symbol value.
      */
-    private static symbol;
+    protected static symbol: symbol;
+    private refCount;
     abstract registerSubscriptions(): void;
     /**
      * Returns a boolean, provides information of whether `registerSubscriptions`
      * method has already been called for this instance.
      */
     get hasSubscriptions(): boolean;
-    addUnsubscribeFunction(unsubscribeFunction: Unsubscribe): void;
+    protected addUnsubscribeFunction(unsubscribeFunction: Unsubscribe): void;
+    /**
+     * Increments `refCount` by one and returns new value.
+     */
+    protected incrementRefCount(): number;
     /**
      * If you re-declare `unregisterSubscriptions` method within your class
      * make sure to run the original too.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stream-chat",
-  "version": "9.6.0",
+  "version": "9.6.1",
   "description": "JS SDK for the Stream Chat API",
   "homepage": "https://getstream.io/chat/",
   "author": {

package/src/messageComposer/messageComposer.ts

@@ -114,8 +114,6 @@ const initState = (
   };
 };
 
-const noop = () => undefined;
-
 export class MessageComposer extends WithSubscriptions {
   readonly channel: Channel;
   readonly state: StateStore<MessageComposerState>;
@@ -363,23 +361,23 @@ export class MessageComposer extends WithSubscriptions {
   }
 
   public registerSubscriptions = (): UnregisterSubscriptions => {
-    if (this.hasSubscriptions) {
-      // Already listening for events and changes
-      return noop;
+    if (!this.hasSubscriptions) {
+      this.addUnsubscribeFunction(this.subscribeMessageComposerSetupStateChange());
+      this.addUnsubscribeFunction(this.subscribeMessageUpdated());
+      this.addUnsubscribeFunction(this.subscribeMessageDeleted());
+
+      this.addUnsubscribeFunction(this.subscribeTextComposerStateChanged());
+      this.addUnsubscribeFunction(this.subscribeAttachmentManagerStateChanged());
+      this.addUnsubscribeFunction(this.subscribeLinkPreviewsManagerStateChanged());
+      this.addUnsubscribeFunction(this.subscribePollComposerStateChanged());
+      this.addUnsubscribeFunction(this.subscribeCustomDataManagerStateChanged());
+      this.addUnsubscribeFunction(this.subscribeMessageComposerStateChanged());
+      this.addUnsubscribeFunction(this.subscribeMessageComposerConfigStateChanged());
     }
-    this.addUnsubscribeFunction(this.subscribeMessageComposerSetupStateChange());
-    this.addUnsubscribeFunction(this.subscribeMessageUpdated());
-    this.addUnsubscribeFunction(this.subscribeMessageDeleted());
-
-    this.addUnsubscribeFunction(this.subscribeTextComposerStateChanged());
-    this.addUnsubscribeFunction(this.subscribeAttachmentManagerStateChanged());
-    this.addUnsubscribeFunction(this.subscribeLinkPreviewsManagerStateChanged());
-    this.addUnsubscribeFunction(this.subscribePollComposerStateChanged());
-    this.addUnsubscribeFunction(this.subscribeCustomDataManagerStateChanged());
-    this.addUnsubscribeFunction(this.subscribeMessageComposerStateChanged());
-    this.addUnsubscribeFunction(this.subscribeMessageComposerConfigStateChanged());
-
-    return this.unregisterSubscriptions.bind(this);
+
+    this.incrementRefCount();
+
+    return () => this.unregisterSubscriptions();
   };
 
   private subscribeMessageUpdated = () => {

package/src/utils/WithSubscriptions.ts

@@ -11,7 +11,8 @@ export abstract class WithSubscriptions {
    * overriding `unregisterSubscriptions` call the base method and return
    * its unique symbol value.
    */
-  private static symbol = Symbol(WithSubscriptions.name);
+  protected static symbol = Symbol(WithSubscriptions.name);
+  private refCount = 0;
 
   public abstract registerSubscriptions(): void;
 
@@ -23,10 +24,17 @@ export abstract class WithSubscriptions {
     return this.unsubscribeFunctions.size > 0;
   }
 
-  public addUnsubscribeFunction(unsubscribeFunction: Unsubscribe) {
+  protected addUnsubscribeFunction(unsubscribeFunction: Unsubscribe) {
     this.unsubscribeFunctions.add(unsubscribeFunction);
   }
 
+  /**
+   * Increments `refCount` by one and returns new value.
+   */
+  protected incrementRefCount() {
+    return ++this.refCount;
+  }
+
   /**
    * If you re-declare `unregisterSubscriptions` method within your class
    * make sure to run the original too.
@@ -43,8 +51,14 @@ export abstract class WithSubscriptions {
    * ```
    */
   public unregisterSubscriptions(): typeof WithSubscriptions.symbol {
+    if (this.refCount > 1) {
+      this.refCount--;
+      return WithSubscriptions.symbol;
+    }
+
     this.unsubscribeFunctions.forEach((unsubscribe) => unsubscribe());
     this.unsubscribeFunctions.clear();
+    this.refCount = 0;
 
     return WithSubscriptions.symbol;
   }