Merge pull request #1397 from OneSignal/fg/bell-fixes

chore: improve typings for bell elements

Author: fadi-george

package.json

@@ -84,7 +84,7 @@
     },
     {
       "path": "./build/releases/OneSignalSDK.page.es6.js",
-      "limit": "49.631 kB",
+      "limit": "49.421 kB",
       "gzip": true
     },
     {

src/page/bell/AnimatedElement.ts

@@ -25,44 +25,42 @@ export default class AnimatedElement {
   /**
    * Show element using CSS classes and wait for animations to complete
    */
-  async show(): Promise<AnimatedElement> {
+  async show(): Promise<void> {
     const element = this.element;
     if (!element || this.shown) {
-      return this;
+      return;
     }
 
     if (this.showClass) {
       element.classList.add(this.showClass);
     }
 
     await this.waitForAnimations();
-    return this;
   }
 
   /**
    * Hide element using CSS classes and wait for animations to complete
    */
-  async hide(): Promise<AnimatedElement> {
+  async hide(): Promise<void> {
     const element = this.element;
     if (!element || !this.shown) {
-      return this;
+      return;
     }
 
     if (this.showClass) {
       element.classList.remove(this.showClass);
     }
 
     await this.waitForAnimations();
-    return this;
   }
 
   /**
    * Activate element using CSS classes
    */
-  async activate(): Promise<AnimatedElement> {
+  async activate(): Promise<void> {
     const element = this.element;
     if (!element || this.active) {
-      return this;
+      return;
     }
 
     if (this.inactiveClass) {
@@ -73,16 +71,15 @@ export default class AnimatedElement {
     }
 
     await this.waitForAnimations();
-    return this;
   }
 
   /**
    * Inactivate element using CSS classes
    */
-  async inactivate(): Promise<AnimatedElement> {
+  async inactivate(): Promise<void> {
     const element = this.element;
     if (!element || !this.active) {
-      return this;
+      return;
     }
 
     if (this.activeClass) {
@@ -93,7 +90,6 @@ export default class AnimatedElement {
     }
 
     await this.waitForAnimations();
-    return this;
   }
 
   /**

src/page/bell/Badge.ts

@@ -9,28 +9,25 @@ export default class Badge extends AnimatedElement {
     );
   }
 
-  increment(): void {
-    // If it IS a number (is not not a number)
-    if (!isNaN(this.content as any)) {
-      let badgeNumber = +this.content; // Coerce to int
-      badgeNumber += 1;
-      this.content = badgeNumber.toString();
+  _updateCount(delta: number): void {
+    const num = Number(this.content);
+    if (!Number.isNaN(num)) {
+      const newNum = num + delta;
+      this.content = newNum > 0 ? newNum.toString() : '';
     }
   }
 
-  show(): Promise<AnimatedElement> {
+  increment(): void {
+    this._updateCount(1);
+  }
+
+  decrement(): void {
+    this._updateCount(-1);
+  }
+
+  show(): Promise<void> {
     const promise = super.show();
     OneSignal._notifyButton?.setCustomColorsIfSpecified();
     return promise;
   }
-
-  decrement() {
-    // If it IS a number (is not not a number)
-    if (!isNaN(this.content as any)) {
-      let badgeNumber = +this.content; // Coerce to int
-      badgeNumber -= 1;
-      if (badgeNumber > 0) this.content = badgeNumber.toString();
-      else this.content = '';
-    }
-  }
 }