fix logic for input

Author: fadi-george

index.html

@@ -16,6 +16,16 @@
       OneSignalDeferred.push(async function (OneSignal) {
         await OneSignal.init({
           appId,
+          // promptOptions: {
+          //   slidedown: {
+          //     prompts: [
+          //       {
+          //         type: 'email',
+          //         // autoPrompt: false,
+          //       },
+          //     ],
+          //   },
+          // },
         });
       });
 

package.json

@@ -81,7 +81,7 @@
     },
     {
       "path": "./build/releases/OneSignalSDK.page.es6.js",
-      "limit": "54.811 kB",
+      "limit": "54.812 kB",
       "gzip": true
     },
     {

src/entries/worker.ts

@@ -4,5 +4,4 @@
 import { OneSignalServiceWorker } from '../sw/serviceWorker/ServiceWorker';
 
 // Expose this class to the global scope
-declare const self: WorkerGlobalScope;
-self.OneSignalWorker = OneSignalServiceWorker;
+(self as any).OneSignal = OneSignalServiceWorker;

src/global.d.ts

@@ -34,22 +34,25 @@ declare global {
     safari?: {
       pushNotification?: SafariRemoteNotification;
     };
-    intlTelInput: ((
+    intlTelInputUtils: {
+      numberFormat: {
+        E164: string;
+      };
+    };
+    intlTelInput: (
       element: Element,
       options: {
         autoPlaceholder: string;
         separateDialCode: boolean;
       },
-    ) => void) & {
-      utils: {
-        numberFormat: {
-          E164: string;
-        };
-      };
+    ) => {
+      isValidNumber: () => boolean;
+      getNumber: (format: string) => string;
     };
   }
 
   interface WorkerGlobalScope {
+    OneSignal: _OneSignal;
     OneSignalWorker: typeof import('./sw/serviceWorker/ServiceWorker').OneSignalServiceWorker;
     workerMessenger: import('./sw/serviceWorker/WorkerMessengerSW').WorkerMessengerSW;
     shouldLog: boolean;

src/page/slidedown/ChannelCaptureContainer.ts

@@ -34,7 +34,7 @@ export default class ChannelCaptureContainer {
   public smsInputFieldIsValid = true;
   public emailInputFieldIsValid = true;
   private promptOptions: SlidedownPromptOptions;
-  private itiOneSignal: any; // iti library initialization return obj
+  private itiOneSignal: ReturnType<typeof window.intlTelInput> | undefined;
 
   constructor(promptOptions: SlidedownPromptOptions) {
     this.promptOptions = promptOptions;
@@ -207,7 +207,7 @@ export default class ChannelCaptureContainer {
 
     smsInput.addEventListener('keyup', (event) => {
       this.smsInputFieldIsValid =
-        this.itiOneSignal.isValidNumber() ||
+        this.itiOneSignal?.isValidNumber() ||
         (smsInput as HTMLInputElement)?.value === '';
 
       // @ts-expect-error - TODO: improve type
@@ -222,7 +222,7 @@ export default class ChannelCaptureContainer {
     // handles case where number is typed, then country is changed after
     smsInput.addEventListener('blur', () => {
       this.smsInputFieldIsValid =
-        this.itiOneSignal.isValidNumber() ||
+        this.itiOneSignal?.isValidNumber() ||
         (smsInput as HTMLInputElement)?.value === '';
 
       this.updateValidationOnSmsInputChange();
@@ -369,8 +369,8 @@ export default class ChannelCaptureContainer {
 
   getValueFromSmsInput(): string {
     return (
-      this.itiOneSignal.getNumber(
-        window.intlTelInput.utils.numberFormat.E164,
+      this.itiOneSignal?.getNumber(
+        window.intlTelInputUtils.numberFormat.E164,
       ) || ''
     );
   }

src/sw/serviceWorker/ServiceWorker.ts

@@ -1179,4 +1179,6 @@ export class OneSignalServiceWorker {
     }
   }
 }
+
+self.OneSignalWorker = OneSignalServiceWorker;
 OneSignalServiceWorker.run();