more clean up

Author: fadi-george

package.json

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

src/page/bell/Button.ts

@@ -4,7 +4,7 @@ import LimitStore from 'src/shared/services/LimitStore';
 import OneSignalEvent from 'src/shared/services/OneSignalEvent';
 import AnimatedElement from './AnimatedElement';
 import Bell from './Bell';
-import { MESSAGE_TIMEOUT, MessageType } from './constants';
+import { Events, MESSAGE_TIMEOUT, MessageType } from './constants';
 
 export default class Button extends AnimatedElement {
   public _events: Record<string, string>;
@@ -69,14 +69,14 @@ export default class Button extends AnimatedElement {
       LimitStore.isEmpty(this._events.mouse) ||
       LimitStore.getLast(this._events.mouse) === 'out'
     ) {
-      OneSignalEvent.trigger('notifyButtonHovering');
+      OneSignalEvent.trigger(Events.Hovering);
     }
     LimitStore.put(this._events.mouse, 'over');
   }
 
   _onHovered() {
     LimitStore.put(this._events.mouse, 'out');
-    OneSignalEvent.trigger('notifyButtonHover');
+    OneSignalEvent.trigger(Events.Hovered);
   }
 
   _onTap() {
@@ -98,8 +98,8 @@ export default class Button extends AnimatedElement {
     this._isHandlingClick = true;
 
     try {
-      OneSignalEvent.trigger('notifyButtonButtonClick');
-      OneSignalEvent.trigger('notifyButtonLauncherClick');
+      OneSignalEvent.trigger(Events.BellClick);
+      OneSignalEvent.trigger(Events.LauncherClick);
 
       if (
         this._bell._message._shown &&
@@ -115,20 +115,23 @@ export default class Button extends AnimatedElement {
       if (this._bell._unsubscribed && !optedOut) {
         registerForPushNotifications();
         this._bell._ignoreSubscriptionState = true;
-        OneSignal.emitter.once('change', async () => {
-          try {
-            await this._bell._message._display(
-              MessageType._Message,
-              this._bell._options.text['message.action.subscribed'],
-              MESSAGE_TIMEOUT,
-            );
-            this._bell._ignoreSubscriptionState = false;
-            await this._bell._launcher._inactivate();
-          } catch (error) {
-            this._bell._ignoreSubscriptionState = false;
-            throw error;
-          }
-        });
+        OneSignal.emitter.once(
+          OneSignal.EVENTS.SUBSCRIPTION_CHANGED,
+          async () => {
+            try {
+              await this._bell._message._display(
+                MessageType._Message,
+                this._bell._options.text['message.action.subscribed'],
+                MESSAGE_TIMEOUT,
+              );
+              this._bell._ignoreSubscriptionState = false;
+              await this._bell._launcher._inactivate();
+            } catch (error) {
+              this._bell._ignoreSubscriptionState = false;
+              throw error;
+            }
+          },
+        );
         return;
       }
 

src/page/bell/Dialog.ts

@@ -10,7 +10,11 @@ import { getPlatformNotificationIcon } from 'src/shared/utils/utils';
 import OneSignalEvent from '../../shared/services/OneSignalEvent';
 import AnimatedElement from './AnimatedElement';
 import Bell from './Bell';
-import { SUBSCRIBE_BUTTON_ID, UNSUBSCRIBE_BUTTON_ID } from './constants';
+import {
+  Events,
+  SUBSCRIBE_BUTTON_ID,
+  UNSUBSCRIBE_BUTTON_ID,
+} from './constants';
 
 const STATIC_RESOURCES_URL = new URL('https://media.onesignal.com/web-sdk');
 
@@ -135,12 +139,12 @@ export default class Dialog extends AnimatedElement {
               a notification shown in this resubscription case.
             */
             OneSignal.__doNotShowWelcomeNotification = false;
-            OneSignalEvent.trigger('notifyButtonSubscribeClick');
+            OneSignalEvent.trigger(Events.SubscribeClick);
           });
         }
         if (this._unsubscribeButton) {
           this._unsubscribeButton.addEventListener('click', () =>
-            OneSignalEvent.trigger('notifyButtonUnsubscribeClick'),
+            OneSignalEvent.trigger(Events.UnsubscribeClick),
           );
         }
       });

src/page/bell/constants.ts

@@ -11,11 +11,11 @@ export const SUBSCRIBE_BUTTON_ID = 'subscribe-button';
 export const UNSUBSCRIBE_BUTTON_ID = 'unsubscribe-button';
 
 export const Events = {
-  StateChanged: 'notifyButtonStateChange',
-  LauncherClick: 'notifyButtonLauncherClick',
-  BellClick: 'notifyButtonButtonClick',
-  SubscribeClick: 'notifyButtonSubscribeClick',
-  UnsubscribeClick: 'notifyButtonUnsubscribeClick',
-  Hovering: 'notifyButtonHovering',
-  Hovered: 'notifyButtonHover',
+  StateChanged: 'notifySC',
+  LauncherClick: 'notifyLC',
+  BellClick: 'notifyBC',
+  SubscribeClick: 'notifySC',
+  UnsubscribeClick: 'notifyUC',
+  Hovering: 'notifyH1',
+  Hovered: 'notifyH2',
 };

src/shared/services/OneSignalEvent.ts

@@ -1,22 +1,15 @@
+import { Events } from 'src/page/bell/constants';
 import { containsMatch } from '../context/helpers';
 import { windowEnvString } from '../environment/detect';
 import Emitter from '../libraries/Emitter';
 import Log from '../libraries/Log';
 import { IS_SERVICE_WORKER } from '../utils/EnvVariables';
 
 const SILENT_EVENTS = [
-  'notifyButtonHovering',
-  'notifyButtonHover',
-  'notifyButtonButtonClick',
-  'notifyButtonLauncherClick',
-  'animatedElementHiding',
-  'animatedElementHidden',
-  'animatedElementShowing',
-  'animatedElementShown',
-  'activeAnimatedElementActivating',
-  'activeAnimatedElementActive',
-  'activeAnimatedElementInactivating',
-  'activeAnimatedElementInactive',
+  Events.Hovering,
+  Events.Hovered,
+  Events.BellClick,
+  Events.LauncherClick,
 ];
 
 export default class OneSignalEvent {