@deuna/react-native-sdk 1.0.3 → 1.0.4

package/lib/module/DeunaSDK.js

@@ -2,37 +2,25 @@
 
 import { BaseDeuna } from "./types/index.js";
 import { PaymentWidgetController } from "./controllers/PaymentWidgetController.js";
-import { OpenInNewTabController } from "./controllers/OpenInNewTabController.js";
-import { getWidgetController } from "./helpers/getController.js";
-import { Completer } from "./helpers/Completer.js";
+import { buildDeunaWidgetController } from "./helpers/buildDeunaWidgetController.js";
 import { ElementsWidgetController } from "./controllers/ElementsWidgetController.js";
 import { DownloadType, Mode } from "./interfaces/types.js";
-import { Platform } from 'react-native';
 import { DeviceFingerprintController } from "./controllers/DeviceFingerprintController.js";
-import { DEVICE_FINGERPRINT_URL } from "./interfaces/constants.js";
+import { DEVICE_FINGERPRINT_URL, DOMAINS_MUST_BE_USE_CROSS_PLATFORM_BROWSER } from "./interfaces/constants.js";
 import { getSubmitStrategy } from "./helpers/getSubmitStrategy.js";
+import { WebViewManager } from "./helpers/ViewManager.js";
+import { ExternalUrlBrowser, ExternalUrlHelper } from "./helpers/ExternalUrlHelper.js";
 export class DeunaSDK extends BaseDeuna {
   constructor(config, onDestroyed) {
     super();
     this.config = config;
     this.onDestroyed = onDestroyed;
   }
-  mode = null;
   listeners = new Set();
-  webViewController = null;
-  newTabWebViewController = null;
+  deunaWidgetManager = new WebViewManager();
+  externalUrlHelper = new ExternalUrlHelper();
   deviceFingerprintController = null;
   submitStrategy = null;
-  modalDismissPromise = null;
-  newTabModalDismissPromise = null;
-  get safeWebViewController() {
-    if (!this.webViewController) {
-      const errorMessage = 'A variant of the init method must be called first. Please call initPaymentWidget, initVoucherWidget, or another init method before using this functionality.';
-      console.error(errorMessage);
-      throw new Error(errorMessage);
-    }
-    return this.webViewController;
-  }
 
   /**
    * Generates a device fingerprint, creates a invisible webview to get the device fingerprint
@@ -64,12 +52,11 @@ export class DeunaSDK extends BaseDeuna {
       controller,
       mode
     } = params;
-    this.mode = mode ?? Mode.MODAL;
-    if (this.mode === Mode.MODAL && Platform.OS === 'ios') {
-      this.modalDismissPromise = new Completer();
-    }
-    this.webViewController = controller;
-    this.webViewController.delegate = this.buildDelegate();
+    this.deunaWidgetManager.initialize({
+      controller,
+      mode: mode ?? Mode.MODAL,
+      delegate: this.buildDelegate()
+    });
     this.notifyListeners();
   };
 
@@ -80,7 +67,7 @@ export class DeunaSDK extends BaseDeuna {
    */
   async initPaymentWidget(props) {
     this.setWidgetController({
-      controller: getWidgetController(this.config, {
+      controller: buildDeunaWidgetController(this.config, {
         widget: 'payment',
         ...props
       }),
@@ -95,7 +82,7 @@ export class DeunaSDK extends BaseDeuna {
    */
   async initElements(props) {
     this.setWidgetController({
-      controller: getWidgetController(this.config, {
+      controller: buildDeunaWidgetController(this.config, {
         widget: 'elements',
         ...props
       }),
@@ -110,7 +97,7 @@ export class DeunaSDK extends BaseDeuna {
    */
   async initNextAction(props) {
     this.setWidgetController({
-      controller: getWidgetController(this.config, {
+      controller: buildDeunaWidgetController(this.config, {
         widget: 'nextAction',
         ...props
       }),
@@ -125,7 +112,7 @@ export class DeunaSDK extends BaseDeuna {
    */
   async initVoucherWidget(props) {
     this.setWidgetController({
-      controller: getWidgetController(this.config, {
+      controller: buildDeunaWidgetController(this.config, {
         widget: 'voucher',
         ...props
       }),
@@ -133,59 +120,66 @@ export class DeunaSDK extends BaseDeuna {
     });
   }
   isValid = async () => {
-    return this.safeWebViewController.isValid();
+    return this.deunaWidgetManager.controller.isValid();
   };
   submit = async () => {
     this.getStateFn = () => this.getWidgetState();
     const submitStrategy = await getSubmitStrategy(this);
     if (!submitStrategy) {
-      return this.safeWebViewController.submit();
+      return this.deunaWidgetManager.controller.submit();
     }
     this.submitStrategy = submitStrategy;
     this.notifyListeners();
     return this.submitStrategy.submit();
   };
   setCustomStyle = async style => {
-    return this.safeWebViewController.setCustomStyle(style);
+    return this.deunaWidgetManager.controller.setCustomStyle(style);
   };
   refetchOrder = async () => {
-    return this.safeWebViewController.refetchOrder();
+    return this.deunaWidgetManager.controller.refetchOrder();
   };
   getWidgetState = async () => {
-    return this.safeWebViewController.getWidgetState();
+    return this.deunaWidgetManager.controller.getWidgetState();
   };
 
   /**
    * Closes the DEUNA widget and releases the resources
    */
   close = async () => {
-    if (this.webViewController instanceof PaymentWidgetController) {
-      this.webViewController.callbacks.onClosed?.(this.webViewController.closedAction);
-    } else if (this.webViewController instanceof ElementsWidgetController) {
-      this.webViewController.callbacks.onClosed?.(this.webViewController.closedAction);
+    if (!this.deunaWidgetManager.isInitialized) {
+      return;
     }
-    this.onCloseNewTab();
-    await this.newTabModalDismissPromise?.wait;
-    this.newTabWebViewController?.dispose();
-    this.webViewController?.dispose();
-    // reset all prop
-    this.newTabWebViewController = null;
-    this.webViewController = null;
-    this.mode = null;
-    await this.submitStrategy?.deunaSDK.close();
-    this.submitStrategy = null;
-    this.notifyListeners();
+    try {
+      let onClosedCallback;
+      const closedAction = this.deunaWidgetManager.controller.closedAction;
+      if (this.deunaWidgetManager.controller instanceof PaymentWidgetController) {
+        onClosedCallback = this.deunaWidgetManager.controller.callbacks.onClosed;
+      } else if (this.deunaWidgetManager.controller instanceof ElementsWidgetController) {
+        onClosedCallback = this.deunaWidgetManager.controller.callbacks.onClosed;
+      }
 
-    // if the widget was shown in modal mode, wait for the modal to be dismissed
-    await this.modalDismissPromise?.wait;
-    this.modalDismissPromise = null;
-    this.onDestroyed?.();
-  };
-  onModalDismissed = () => {
-    this.modalDismissPromise?.complete();
-  };
-  onNewTabDismissed = () => {
-    this.newTabModalDismissPromise?.complete();
+      // If the external url was opened in a Safari View Controller or a Custom Chrome Tab
+      // we need to wait until the browser is dismissed
+      await this.externalUrlHelper.waitForClose();
+
+      // Destroy the main webview and dismiss the modal
+      this.deunaWidgetManager.destroy();
+
+      // Close the submit strategy if it exists
+      await this.submitStrategy?.deunaSDK.close();
+      this.submitStrategy = null;
+
+      // Notify listeners that the widget has been closed
+      this.notifyListeners();
+
+      // Notify the user that the widget has been closed
+      this.onDestroyed?.();
+
+      // Notify the widget that the user has closed the widget
+      onClosedCallback?.(closedAction);
+    } catch (error) {
+      console.error('Error closing the widget', error);
+    }
   };
   addListener = listener => {
     this.listeners.add(listener);
@@ -197,20 +191,22 @@ export class DeunaSDK extends BaseDeuna {
     this.listeners.forEach(listener => listener());
   };
   notifyDownloadFile = url => {
-    if (this.safeWebViewController instanceof PaymentWidgetController) {
-      this.safeWebViewController.callbacks.onDownloadFile?.({
+    if (this.deunaWidgetManager.controller instanceof PaymentWidgetController) {
+      this.deunaWidgetManager.controller.callbacks.onDownloadFile?.({
         type: DownloadType.URL,
         data: url
       });
     }
   };
-  onCloseNewTab = () => {
-    if (this.webViewController) {
-      this.webViewController.redirectUrl = null;
+
+  /**
+   * Closes the external URL Webview
+   */
+  onCloseExternalUrl = async () => {
+    if (this.externalUrlHelper.externalUrlWebViewController) {
+      await this.externalUrlHelper.closeWebView();
+      this.notifyListeners();
     }
-    this.newTabWebViewController?.dispose();
-    this.newTabWebViewController = null;
-    this.notifyListeners();
   };
 
   /**
@@ -221,21 +217,33 @@ export class DeunaSDK extends BaseDeuna {
    */
   buildDelegate = () => {
     return {
-      onOpenInNewTab: url => {
-        this.newTabWebViewController = new OpenInNewTabController(url);
-        if (Platform.OS === 'ios') {
-          this.newTabModalDismissPromise = new Completer();
+      onOpenExternalUrl: url => {
+        try {
+          const host = new URL(url).host;
+          let browser = ExternalUrlBrowser.WEB_VIEW;
+          // Check if the URL is from a domain that must be opened in a cross platform browser (SafariView or Chrome Custom Tab)
+          for (const domain of DOMAINS_MUST_BE_USE_CROSS_PLATFORM_BROWSER) {
+            if (host.includes(domain)) {
+              browser = ExternalUrlBrowser.CROSS_PLATFORM_BROWSER;
+              break;
+            }
+          }
+          this.externalUrlHelper.openUrl({
+            url,
+            browser,
+            delegate: {
+              onCloseExternalUrl: this.onCloseExternalUrl,
+              onFileDownload: this.notifyDownloadFile
+            }
+          });
+          this.notifyListeners();
+        } catch (error) {
+          console.error('Error opening external URL', error);
         }
-        this.newTabWebViewController.delegate = {
-          onFileDownload: this.notifyDownloadFile,
-          onNewTabWindowClose: this.onCloseNewTab
-        };
-        this.notifyListeners();
       },
+      onCloseExternalUrl: this.onCloseExternalUrl,
       onCloseButtonPressed: this.close,
       // Close the payment widget when the user presses the close button
-      onCloseSubWebView: this.onCloseNewTab,
-      // Close the new tab web view when the DEUNA widget emits an error event or when the purchase is successful
       onFileDownload: this.notifyDownloadFile // Notify the user when a request to download a file is made
     };
   };

package/lib/module/DeunaSDK.js.map

@@ -1 +1 @@
-{"version":3,"names":["BaseDeuna","PaymentWidgetController","OpenInNewTabController","getWidgetController","Completer","ElementsWidgetController","DownloadType","Mode","Platform","DeviceFingerprintController","DEVICE_FINGERPRINT_URL","getSubmitStrategy","DeunaSDK","constructor","config","onDestroyed","mode","listeners","Set","webViewController","newTabWebViewController","deviceFingerprintController","submitStrategy","modalDismissPromise","newTabModalDismissPromise","safeWebViewController","errorMessage","console","error","Error","getSessionId","params","publicApiKey","environment","url","notifyListeners","deviceFingerprint","generateDeviceFingerprint","dispose","initialize","setWidgetController","controller","MODAL","OS","delegate","buildDelegate","initPaymentWidget","props","widget","initElements","initNextAction","initVoucherWidget","isValid","submit","getStateFn","getWidgetState","setCustomStyle","style","refetchOrder","close","callbacks","onClosed","closedAction","onCloseNewTab","wait","deunaSDK","onModalDismissed","complete","onNewTabDismissed","addListener","listener","add","removeListener","delete","forEach","notifyDownloadFile","onDownloadFile","type","URL","data","redirectUrl","onOpenInNewTab","onFileDownload","onNewTabWindowClose","onCloseButtonPressed","onCloseSubWebView"],"sourceRoot":"../../src","sources":["DeunaSDK.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["BaseDeuna","PaymentWidgetController","buildDeunaWidgetController","ElementsWidgetController","DownloadType","Mode","DeviceFingerprintController","DEVICE_FINGERPRINT_URL","DOMAINS_MUST_BE_USE_CROSS_PLATFORM_BROWSER","getSubmitStrategy","WebViewManager","ExternalUrlBrowser","ExternalUrlHelper","DeunaSDK","constructor","config","onDestroyed","listeners","Set","deunaWidgetManager","externalUrlHelper","deviceFingerprintController","submitStrategy","getSessionId","params","publicApiKey","environment","url","notifyListeners","deviceFingerprint","generateDeviceFingerprint","dispose","initialize","setWidgetController","controller","mode","MODAL","delegate","buildDelegate","initPaymentWidget","props","widget","initElements","initNextAction","initVoucherWidget","isValid","submit","getStateFn","getWidgetState","setCustomStyle","style","refetchOrder","close","isInitialized","onClosedCallback","closedAction","callbacks","onClosed","waitForClose","destroy","deunaSDK","error","console","addListener","listener","add","removeListener","delete","forEach","notifyDownloadFile","onDownloadFile","type","URL","data","onCloseExternalUrl","externalUrlWebViewController","closeWebView","onOpenExternalUrl","host","browser","WEB_VIEW","domain","includes","CROSS_PLATFORM_BROWSER","openUrl","onFileDownload","onCloseButtonPressed"],"sourceRoot":"../../src","sources":["DeunaSDK.ts"],"mappings":";;AAAA,SACEA,SAAS,QAkBJ,kBAAS;AAKhB,SAASC,uBAAuB,QAAQ,0CAAuC;AAC/E,SAASC,0BAA0B,QAAQ,yCAAsC;AACjF,SAASC,wBAAwB,QAAQ,2CAAwC;AACjF,SAASC,YAAY,EAAEC,IAAI,QAAwB,uBAAoB;AACvE,SAASC,2BAA2B,QAAQ,8CAA2C;AACvF,SACEC,sBAAsB,EACtBC,0CAA0C,QACrC,2BAAwB;AAE/B,SAASC,iBAAiB,QAAQ,gCAA6B;AAC/D,SAASC,cAAc,QAAQ,0BAAuB;AACtD,SACEC,kBAAkB,EAClBC,iBAAiB,QACZ,gCAA6B;AAEpC,OAAO,MAAMC,QAAQ,SAASb,SAAS,CAAC;EACtCc,WAAWA,CACAC,MAAwB,EACxBC,WAAwB,EACjC;IACA,KAAK,CAAC,CAAC;IAAC,KAHCD,MAAwB,GAAxBA,MAAwB;IAAA,KACxBC,WAAwB,GAAxBA,WAAwB;EAGnC;EASQC,SAAS,GAAoB,IAAIC,GAAG,CAAC,CAAC;EAE9CC,kBAAkB,GAAG,IAAIT,cAAc,CAAyB,CAAC;EACjEU,iBAAiB,GAAG,IAAIR,iBAAiB,CAAC,CAAC;EAE3CS,2BAA2B,GAAuC,IAAI;EACtEC,cAAc,GAA0B,IAAI;;EAE5C;AACF;AACA;AACA;AACA;EACEC,YAAY,GAAG,MAAOC,MAA4B,IAAsB;IACtE,IAAI,CAACH,2BAA2B,GAAG,IAAIf,2BAA2B,CAChE,IAAI,CAACS,MAAM,CAACU,YAAY,EACxB,IAAI,CAACV,MAAM,CAACW,WAAW,IAAI,YAC7B,CAAC;IACD,IAAI,CAACL,2BAA2B,CAACM,GAAG,GAAGpB,sBAAsB;IAC7D,IAAI,CAACqB,eAAe,CAAC,CAAC;IAEtB,MAAMC,iBAAiB,GACrB,MAAM,IAAI,CAACR,2BAA2B,CAACS,yBAAyB,CAC9DN,MAAM,IAAI,CAAC,CACb,CAAC;IACH,IAAI,CAACH,2BAA2B,EAAEU,OAAO,CAAC,CAAC;IAC3C,IAAI,CAACV,2BAA2B,GAAG,IAAI;IACvC,IAAI,CAACO,eAAe,CAAC,CAAC;IACtB,OAAOC,iBAAiB,IAAI,EAAE;EAChC,CAAC;EAED,OAAOG,UAAUA,CAACjB,MAAwB,EAAY;IACpD,OAAO,IAAIF,QAAQ,CAACE,MAAM,CAAC;EAC7B;;EAEA;AACF;AACA;AACA;AACA;AACA;EACUkB,mBAAmB,GAAIT,MAG9B,IAAW;IACV,MAAM;MAAEU,UAAU;MAAEC;IAAK,CAAC,GAAGX,MAAM;IACnC,IAAI,CAACL,kBAAkB,CAACa,UAAU,CAAC;MACjCE,UAAU;MACVC,IAAI,EAAEA,IAAI,IAAI9B,IAAI,CAAC+B,KAAK;MACxBC,QAAQ,EAAE,IAAI,CAACC,aAAa,CAAC;IAC/B,CAAC,CAAC;IACF,IAAI,CAACV,eAAe,CAAC,CAAC;EACxB,CAAC;;EAED;AACF;AACA;AACA;AACA;EACE,MAAMW,iBAAiBA,CACrBC,KAGC,EACD;IACA,IAAI,CAACP,mBAAmB,CAAC;MACvBC,UAAU,EAAEhC,0BAA0B,CAAC,IAAI,CAACa,MAAM,EAAE;QAClD0B,MAAM,EAAE,SAAS;QACjB,GAAGD;MACL,CAAC,CAAC;MACFL,IAAI,EAAEK,KAAK,CAACL;IACd,CAAC,CAAC;EACJ;;EAEA;AACF;AACA;AACA;AACA;EACE,MAAMO,YAAYA,CAChBF,KAAqE,EACrE;IACA,IAAI,CAACP,mBAAmB,CAAC;MACvBC,UAAU,EAAEhC,0BAA0B,CAAC,IAAI,CAACa,MAAM,EAAE;QAClD0B,MAAM,EAAE,UAAU;QAClB,GAAGD;MACL,CAAC,CAAC;MACFL,IAAI,EAAEK,KAAK,CAACL;IACd,CAAC,CAAC;EACJ;;EAEA;AACF;AACA;AACA;AACA;EACE,MAAMQ,cAAcA,CAACH,KAAkD,EAAE;IACvE,IAAI,CAACP,mBAAmB,CAAC;MACvBC,UAAU,EAAEhC,0BAA0B,CAAC,IAAI,CAACa,MAAM,EAAE;QAClD0B,MAAM,EAAE,YAAY;QACpB,GAAGD;MACL,CAAC,CAAC;MACFL,IAAI,EAAEK,KAAK,CAACL;IACd,CAAC,CAAC;EACJ;;EAEA;AACF;AACA;AACA;AACA;EACE,MAAMS,iBAAiBA,CACrBJ,KAGC,EACD;IACA,IAAI,CAACP,mBAAmB,CAAC;MACvBC,UAAU,EAAEhC,0BAA0B,CAAC,IAAI,CAACa,MAAM,EAAE;QAClD0B,MAAM,EAAE,SAAS;QACjB,GAAGD;MACL,CAAC,CAAC;MACFL,IAAI,EAAEK,KAAK,CAACL;IACd,CAAC,CAAC;EACJ;EAEAU,OAAO,GAAG,MAAAA,CAAA,KAA8B;IACtC,OAAO,IAAI,CAAC1B,kBAAkB,CAACe,UAAU,CAACW,OAAO,CAAC,CAAC;EACrD,CAAC;EAEDC,MAAM,GAAG,MAAAA,CAAA,KAAmC;IAC1C,IAAI,CAACC,UAAU,GAAG,MAAM,IAAI,CAACC,cAAc,CAAC,CAAC;IAC7C,MAAM1B,cAAc,GAAG,MAAMb,iBAAiB,CAAC,IAAI,CAAC;IAEpD,IAAI,CAACa,cAAc,EAAE;MACnB,OAAO,IAAI,CAACH,kBAAkB,CAACe,UAAU,CAACY,MAAM,CAAC,CAAC;IACpD;IAEA,IAAI,CAACxB,cAAc,GAAGA,cAAc;IACpC,IAAI,CAACM,eAAe,CAAC,CAAC;IACtB,OAAO,IAAI,CAACN,cAAc,CAACwB,MAAM,CAAC,CAAC;EACrC,CAAC;EAEDG,cAAc,GAAG,MAAOC,KAA4B,IAAoB;IACtE,OAAO,IAAI,CAAC/B,kBAAkB,CAACe,UAAU,CAACe,cAAc,CAACC,KAAK,CAAC;EACjE,CAAC;EAEDC,YAAY,GAAG,MAAAA,CAAA,KAAkC;IAC/C,OAAO,IAAI,CAAChC,kBAAkB,CAACe,UAAU,CAACiB,YAAY,CAAC,CAAC;EAC1D,CAAC;EAEDH,cAAc,GAAG,MAAAA,CAAA,KAA4B;IAC3C,OAAO,IAAI,CAAC7B,kBAAkB,CAACe,UAAU,CAACc,cAAc,CAAC,CAAC;EAC5D,CAAC;;EAED;AACF;AACA;EACEI,KAAK,GAAG,MAAAA,CAAA,KAA2B;IACjC,IAAI,CAAC,IAAI,CAACjC,kBAAkB,CAACkC,aAAa,EAAE;MAC1C;IACF;IAEA,IAAI;MACF,IAAIC,gBAA8D;MAClE,MAAMC,YAAY,GAAG,IAAI,CAACpC,kBAAkB,CAACe,UAAU,CAACqB,YAAY;MAEpE,IACE,IAAI,CAACpC,kBAAkB,CAACe,UAAU,YAAYjC,uBAAuB,EACrE;QACAqD,gBAAgB,GACd,IAAI,CAACnC,kBAAkB,CAACe,UAAU,CAACsB,SAAS,CAACC,QAAQ;MACzD,CAAC,MAAM,IACL,IAAI,CAACtC,kBAAkB,CAACe,UAAU,YAAY/B,wBAAwB,EACtE;QACAmD,gBAAgB,GACd,IAAI,CAACnC,kBAAkB,CAACe,UAAU,CAACsB,SAAS,CAACC,QAAQ;MACzD;;MAEA;MACA;MACA,MAAM,IAAI,CAACrC,iBAAiB,CAACsC,YAAY,CAAC,CAAC;;MAE3C;MACA,IAAI,CAACvC,kBAAkB,CAACwC,OAAO,CAAC,CAAC;;MAEjC;MACA,MAAM,IAAI,CAACrC,cAAc,EAAEsC,QAAQ,CAACR,KAAK,CAAC,CAAC;MAC3C,IAAI,CAAC9B,cAAc,GAAG,IAAI;;MAE1B;MACA,IAAI,CAACM,eAAe,CAAC,CAAC;;MAEtB;MACA,IAAI,CAACZ,WAAW,GAAG,CAAC;;MAEpB;MACAsC,gBAAgB,GAAGC,YAAY,CAAC;IAClC,CAAC,CAAC,OAAOM,KAAK,EAAE;MACdC,OAAO,CAACD,KAAK,CAAC,0BAA0B,EAAEA,KAAK,CAAC;IAClD;EACF,CAAC;EAEDE,WAAW,GAAIC,QAAoB,IAAK;IACtC,IAAI,CAAC/C,SAAS,CAACgD,GAAG,CAACD,QAAQ,CAAC;EAC9B,CAAC;EAEDE,cAAc,GAAIF,QAAoB,IAAK;IACzC,IAAI,CAAC/C,SAAS,CAACkD,MAAM,CAACH,QAAQ,CAAC;EACjC,CAAC;EAEDpC,eAAe,GAAGA,CAAA,KAAM;IACtB,IAAI,CAACX,SAAS,CAACmD,OAAO,CAAEJ,QAAQ,IAAKA,QAAQ,CAAC,CAAC,CAAC;EAClD,CAAC;EAEOK,kBAAkB,GAAI1C,GAAW,IAAK;IAC5C,IAAI,IAAI,CAACR,kBAAkB,CAACe,UAAU,YAAYjC,uBAAuB,EAAE;MACzE,IAAI,CAACkB,kBAAkB,CAACe,UAAU,CAACsB,SAAS,CAACc,cAAc,GAAG;QAC5DC,IAAI,EAAEnE,YAAY,CAACoE,GAAG;QACtBC,IAAI,EAAE9C;MACR,CAAC,CAAC;IACJ;EACF,CAAC;;EAED;AACF;AACA;EACE+C,kBAAkB,GAAG,MAAAA,CAAA,KAAY;IAC/B,IAAI,IAAI,CAACtD,iBAAiB,CAACuD,4BAA4B,EAAE;MACvD,MAAM,IAAI,CAACvD,iBAAiB,CAACwD,YAAY,CAAC,CAAC;MAC3C,IAAI,CAAChD,eAAe,CAAC,CAAC;IACxB;EACF,CAAC;;EAED;AACF;AACA;AACA;AACA;AACA;EACEU,aAAa,GAAGA,CAAA,KAAuB;IACrC,OAAO;MACLuC,iBAAiB,EAAGlD,GAAG,IAAK;QAC1B,IAAI;UACF,MAAMmD,IAAI,GAAG,IAAIN,GAAG,CAAC7C,GAAG,CAAC,CAACmD,IAAI;UAC9B,IAAIC,OAAO,GAAGpE,kBAAkB,CAACqE,QAAQ;UACzC;UACA,KAAK,MAAMC,MAAM,IAAIzE,0CAA0C,EAAE;YAC/D,IAAIsE,IAAI,CAACI,QAAQ,CAACD,MAAM,CAAC,EAAE;cACzBF,OAAO,GAAGpE,kBAAkB,CAACwE,sBAAsB;cACnD;YACF;UACF;UAEA,IAAI,CAAC/D,iBAAiB,CAACgE,OAAO,CAAC;YAC7BzD,GAAG;YACHoD,OAAO;YACP1C,QAAQ,EAAE;cACRqC,kBAAkB,EAAE,IAAI,CAACA,kBAAkB;cAC3CW,cAAc,EAAE,IAAI,CAAChB;YACvB;UACF,CAAC,CAAC;UACF,IAAI,CAACzC,eAAe,CAAC,CAAC;QACxB,CAAC,CAAC,OAAOiC,KAAK,EAAE;UACdC,OAAO,CAACD,KAAK,CAAC,4BAA4B,EAAEA,KAAK,CAAC;QACpD;MACF,CAAC;MACDa,kBAAkB,EAAE,IAAI,CAACA,kBAAkB;MAC3CY,oBAAoB,EAAE,IAAI,CAAClC,KAAK;MAAE;MAClCiC,cAAc,EAAE,IAAI,CAAChB,kBAAkB,CAAE;IAC3C,CAAC;EACH,CAAC;AACH","ignoreList":[]}

package/lib/module/components/DeunaWidget.js

@@ -3,9 +3,9 @@
 import { Modal, SafeAreaView, StyleSheet, View } from 'react-native';
 import { useEffect, useRef, useState } from 'react';
 import { DeunaWebView } from "./DeunaWebView.js";
-import { NewTabWebView } from "./NewTabWebView.js";
 import { Mode } from "../interfaces/types.js";
 import { DeviceFingerprintWebView } from "./DeviceFingerprintWebView.js";
+import { ExternalUrlWebView } from "./ExternalUrlWebView.js";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 export const DeunaWidget = props => {
   const {
@@ -38,7 +38,7 @@ const DeunaWidgetContainer = props => {
     instance
   } = props;
   const instanceRef = useRef(instance);
-  const [mode, setMode] = useState(instance.mode);
+  const [isVisible, setIsVisible] = useState(instanceRef.current.deunaWidgetManager.isInitialized);
   useEffect(() => {
     instanceRef.current = instance;
   }, [instance]);
@@ -47,59 +47,61 @@ const DeunaWidgetContainer = props => {
   // has changed
   useEffect(() => {
     const listener = () => {
-      setMode(instanceRef.current.mode);
+      setIsVisible(instanceRef.current.deunaWidgetManager.isInitialized);
     };
     instanceRef.current.addListener(listener);
     return () => {
       instanceRef.current.removeListener(listener);
-      instanceRef.current.webViewController?.dispose();
+      if (instanceRef.current.deunaWidgetManager.isInitialized) {
+        instanceRef.current.deunaWidgetManager.controller?.dispose();
+      }
     };
   }, []);
-  const isModal = mode === Mode.MODAL;
-  const isEmbedded = mode === Mode.EMBEDDED;
 
   /**
    * This function is used to close the widget
    */
   const onClose = () => {
-    const controller = instanceRef.current.webViewController;
+    const controller = instanceRef.current.deunaWidgetManager.controller;
     controller.closedAction = 'userAction';
     instanceRef.current.close();
   };
 
   // render the widget if mode is not null
+  const viewManager = instanceRef.current.deunaWidgetManager;
+  const controller = viewManager.isInitialized ? viewManager.controller : null;
+  const isModal = isVisible && viewManager.mode === Mode.MODAL;
+  const isEmbedded = isVisible && viewManager.mode === Mode.EMBEDDED;
   return /*#__PURE__*/_jsxs(_Fragment, {
-    children: [/*#__PURE__*/_jsx(Modal, {
+    children: [isModal && /*#__PURE__*/_jsx(Modal, {
       presentationStyle: "pageSheet",
       animationType: "slide",
       onRequestClose: onClose,
-      onDismiss: instanceRef.current.onModalDismissed,
-      visible: isModal,
-      children: isModal && /*#__PURE__*/_jsx(SafeAreaView, {
+      children: /*#__PURE__*/_jsx(SafeAreaView, {
         style: styles.container,
         children: /*#__PURE__*/_jsxs(View, {
           style: styles.container,
           children: [/*#__PURE__*/_jsx(DeunaWebView, {
-            url: instanceRef.current.webViewController?.url ?? '',
-            onWebView: instanceRef.current.webViewController?.setWebView,
-            onMessage: instanceRef.current.webViewController?.onMessage,
-            onLoad: instanceRef.current.webViewController?.onLoad,
-            onError: instanceRef.current.webViewController?.onError,
-            onShouldStartLoadWithRequest: instanceRef.current.webViewController?.onShouldStartLoadWithRequest
-          }), /*#__PURE__*/_jsx(NewTabWebView, {
+            url: controller?.url ?? '',
+            onWebView: controller?.setWebView,
+            onMessage: controller?.onMessage,
+            onLoad: controller?.onLoad,
+            onError: controller?.onError,
+            onShouldStartLoadWithRequest: controller?.onShouldStartLoadWithRequest
+          }), /*#__PURE__*/_jsx(ExternalUrlWebView, {
             instance: instanceRef.current
           })]
         })
       })
-    }), isEmbedded && /*#__PURE__*/_jsx(NewTabWebView, {
+    }), isEmbedded && /*#__PURE__*/_jsx(ExternalUrlWebView, {
       instance: instanceRef.current
     }), isEmbedded && /*#__PURE__*/_jsx(DeunaWebView, {
-      url: instanceRef.current.webViewController?.url ?? '',
-      onWebView: instanceRef.current.webViewController?.setWebView,
-      onMessage: instanceRef.current.webViewController?.onMessage,
-      onLoad: instanceRef.current.webViewController?.onLoad,
-      onError: instanceRef.current.webViewController?.onError,
-      onShouldStartLoadWithRequest: instanceRef.current.webViewController?.onShouldStartLoadWithRequest
+      url: controller?.url ?? '',
+      onWebView: controller?.setWebView,
+      onMessage: controller?.onMessage,
+      onLoad: controller?.onLoad,
+      onError: controller?.onError,
+      onShouldStartLoadWithRequest: controller?.onShouldStartLoadWithRequest
     }), /*#__PURE__*/_jsx(DeviceFingerprintWebView, {
       instance: instanceRef.current
     })]

package/lib/module/components/DeunaWidget.js.map

@@ -1 +1 @@
-{"version":3,"names":["Modal","SafeAreaView","StyleSheet","View","useEffect","useRef","useState","DeunaWebView","NewTabWebView","Mode","DeviceFingerprintWebView","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","DeunaWidget","props","instance","instanceRef","showPaymentStrategy","setShowPaymentStrategy","current","listener","submitStrategy","addListener","removeListener","children","DeunaWidgetContainer","deunaSDK","mode","setMode","webViewController","dispose","isModal","MODAL","isEmbedded","EMBEDDED","onClose","controller","closedAction","close","presentationStyle","animationType","onRequestClose","onDismiss","onModalDismissed","visible","style","styles","container","url","onWebView","setWebView","onMessage","onLoad","onError","onShouldStartLoadWithRequest","create","flex"],"sourceRoot":"../../../src","sources":["components/DeunaWidget.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["Modal","SafeAreaView","StyleSheet","View","useEffect","useRef","useState","DeunaWebView","Mode","DeviceFingerprintWebView","ExternalUrlWebView","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","DeunaWidget","props","instance","instanceRef","showPaymentStrategy","setShowPaymentStrategy","current","listener","submitStrategy","addListener","removeListener","children","DeunaWidgetContainer","deunaSDK","isVisible","setIsVisible","deunaWidgetManager","isInitialized","controller","dispose","onClose","closedAction","close","viewManager","isModal","mode","MODAL","isEmbedded","EMBEDDED","presentationStyle","animationType","onRequestClose","style","styles","container","url","onWebView","setWebView","onMessage","onLoad","onError","onShouldStartLoadWithRequest","create","flex"],"sourceRoot":"../../../src","sources":["components/DeunaWidget.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/components/ExternalUrlWebView.js

@@ -0,0 +1,56 @@
+"use strict";
+
+import { useEffect, useRef, useState } from 'react';
+import { Modal, SafeAreaView, StyleSheet } from 'react-native';
+import { DeunaWebView } from "./DeunaWebView.js";
+import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+export const ExternalUrlWebView = props => {
+  const {
+    instance
+  } = props;
+  const instanceRef = useRef(instance);
+  const [visible, setVisible] = useState(false);
+  useEffect(() => {
+    instanceRef.current = instance;
+  }, [instance]);
+
+  // Listen when the DeunaSDK instance configuration
+  // has changed
+  useEffect(() => {
+    const ref = instanceRef.current;
+    const listener = () => {
+      const isVisible = !!ref.externalUrlHelper.externalUrlWebViewController;
+      setVisible(isVisible);
+    };
+    instanceRef.current.addListener(listener);
+    return () => {
+      ref.removeListener(listener);
+      ref.externalUrlHelper.externalUrlWebViewController?.dispose();
+    };
+  }, []);
+  const externalUrlWebViewController = instanceRef.current.externalUrlHelper.externalUrlWebViewController;
+  return /*#__PURE__*/_jsx(_Fragment, {
+    children: visible && /*#__PURE__*/_jsx(Modal, {
+      presentationStyle: "pageSheet",
+      animationType: "slide",
+      onRequestClose: instanceRef.current.onCloseExternalUrl,
+      children: /*#__PURE__*/_jsx(SafeAreaView, {
+        style: styles.container,
+        children: /*#__PURE__*/_jsx(DeunaWebView, {
+          url: externalUrlWebViewController?.url ?? '',
+          onWebView: externalUrlWebViewController?.setWebView,
+          onMessage: externalUrlWebViewController?.onMessage,
+          onLoad: externalUrlWebViewController?.onLoad,
+          onError: externalUrlWebViewController?.onError,
+          onShouldStartLoadWithRequest: externalUrlWebViewController?.onShouldStartLoadWithRequest
+        })
+      })
+    })
+  });
+};
+const styles = StyleSheet.create({
+  container: {
+    flex: 1
+  }
+});
+//# sourceMappingURL=ExternalUrlWebView.js.map

package/lib/module/components/ExternalUrlWebView.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["useEffect","useRef","useState","Modal","SafeAreaView","StyleSheet","DeunaWebView","jsx","_jsx","Fragment","_Fragment","ExternalUrlWebView","props","instance","instanceRef","visible","setVisible","current","ref","listener","isVisible","externalUrlHelper","externalUrlWebViewController","addListener","removeListener","dispose","children","presentationStyle","animationType","onRequestClose","onCloseExternalUrl","style","styles","container","url","onWebView","setWebView","onMessage","onLoad","onError","onShouldStartLoadWithRequest","create","flex"],"sourceRoot":"../../../src","sources":["components/ExternalUrlWebView.tsx"],"mappings":";;AAAA,SAASA,SAAS,EAAEC,MAAM,EAAEC,QAAQ,QAAQ,OAAO;AAEnD,SAASC,KAAK,EAAEC,YAAY,EAAEC,UAAU,QAAQ,cAAc;AAC9D,SAASC,YAAY,QAAQ,mBAAgB;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,QAAA,IAAAC,SAAA;AAM9C,OAAO,MAAMC,kBAAkB,GAAIC,KAA8B,IAAK;EACpE,MAAM;IAAEC;EAAS,CAAC,GAAGD,KAAK;EAC1B,MAAME,WAAW,GAAGb,MAAM,CAAWY,QAAQ,CAAC;EAC9C,MAAM,CAACE,OAAO,EAAEC,UAAU,CAAC,GAAGd,QAAQ,CAAC,KAAK,CAAC;EAE7CF,SAAS,CAAC,MAAM;IACdc,WAAW,CAACG,OAAO,GAAGJ,QAAQ;EAChC,CAAC,EAAE,CAACA,QAAQ,CAAC,CAAC;;EAEd;EACA;EACAb,SAAS,CAAC,MAAM;IACd,MAAMkB,GAAG,GAAGJ,WAAW,CAACG,OAAO;IAC/B,MAAME,QAAQ,GAAGA,CAAA,KAAM;MACrB,MAAMC,SAAS,GAAG,CAAC,CAACF,GAAG,CAACG,iBAAiB,CAACC,4BAA4B;MACtEN,UAAU,CAACI,SAAS,CAAC;IACvB,CAAC;IAEDN,WAAW,CAACG,OAAO,CAACM,WAAW,CAACJ,QAAQ,CAAC;IAEzC,OAAO,MAAM;MACXD,GAAG,CAACM,cAAc,CAACL,QAAQ,CAAC;MAC5BD,GAAG,CAACG,iBAAiB,CAACC,4BAA4B,EAAEG,OAAO,CAAC,CAAC;IAC/D,CAAC;EACH,CAAC,EAAE,EAAE,CAAC;EAEN,MAAMH,4BAA4B,GAChCR,WAAW,CAACG,OAAO,CAACI,iBAAiB,CAACC,4BAA4B;EAEpE,oBACEd,IAAA,CAAAE,SAAA;IAAAgB,QAAA,EACGX,OAAO,iBACNP,IAAA,CAACL,KAAK;MACJwB,iBAAiB,EAAC,WAAW;MAC7BC,aAAa,EAAC,OAAO;MACrBC,cAAc,EAAEf,WAAW,CAACG,OAAO,CAACa,kBAAmB;MAAAJ,QAAA,eAEvDlB,IAAA,CAACJ,YAAY;QAAC2B,KAAK,EAAEC,MAAM,CAACC,SAAU;QAAAP,QAAA,eACpClB,IAAA,CAACF,YAAY;UACX4B,GAAG,EAAEZ,4BAA4B,EAAEY,GAAG,IAAI,EAAG;UAC7CC,SAAS,EAAEb,4BAA4B,EAAEc,UAAW;UACpDC,SAAS,EAAEf,4BAA4B,EAAEe,SAAU;UACnDC,MAAM,EAAEhB,4BAA4B,EAAEgB,MAAO;UAC7CC,OAAO,EAAEjB,4BAA4B,EAAEiB,OAAQ;UAC/CC,4BAA4B,EAC1BlB,4BAA4B,EAAEkB;QAC/B,CACF;MAAC,CACU;IAAC,CACV;EACR,CACD,CAAC;AAEP,CAAC;AAED,MAAMR,MAAM,GAAG3B,UAAU,CAACoC,MAAM,CAAC;EAAER,SAAS,EAAE;IAAES,IAAI,EAAE;EAAE;AAAE,CAAC,CAAC","ignoreList":[]}

package/lib/module/controllers/BaseWebViewController.js

@@ -7,15 +7,14 @@ export let WebViewEventType = /*#__PURE__*/function (WebViewEventType) {
   WebViewEventType["consoleLog"] = "consoleLog";
   WebViewEventType["eventDispatch"] = "eventDispatch";
   WebViewEventType["jsExecutor"] = "jsExecutor";
-  WebViewEventType["openInNewTab"] = "openInNewTab";
+  WebViewEventType["openExternalUrl"] = "openExternalUrl";
   WebViewEventType["redirect"] = "redirect";
-  WebViewEventType["newTabWindowClose"] = "newTabWindowClose";
+  WebViewEventType["closeExternalUrl"] = "closeExternalUrl";
   return WebViewEventType;
 }({});
 const DOWNLOAD_FILE_REGEX = /\.(pdf|doc|docx|xls|xlsx|zip|rar|txt|mp3|mp4|jpg|jpeg|png|gif)$/i;
 export class BaseWebViewController {
   initialized = false;
-  redirectUrl = null;
   webView = null;
   url = null;
   delegate = null;
@@ -52,19 +51,14 @@ export class BaseWebViewController {
    * @returns boolean indicating if the URL should be loaded in current WebView
    */
   onShouldStartLoadWithRequest = request => {
-    // Prevent loading if it's the redirect URL
-    if (this.redirectUrl === request.url) {
-      return false;
+    if (this.url === request.url) {
+      return true;
     }
-    const isNewNavigation = request.isTopFrame && request.url !== this.url;
-    const isClickNavigation = request.navigationType === 'click';
-    const shouldHandleInNewTab = !this.urlMustBeLoadedInTheSameWebView(request.url);
-
-    // For iOS, check both click navigation and new navigation
-    // For Android, only check new navigation
-    const shouldOpenInNewTab = Platform.OS === 'ios' ? (isClickNavigation || isNewNavigation) && shouldHandleInNewTab : isNewNavigation && shouldHandleInNewTab;
-    if (shouldOpenInNewTab) {
-      this.delegate?.onOpenInNewTab?.(request.url);
+    const isAndroid = Platform.OS === 'android';
+    const isNewNavigation = isAndroid ? request.url.startsWith('https://') : request.navigationType === 'click';
+    const shouldOpenExternally = !this.urlMustBeLoadedInTheSameWebView(request.url);
+    if (isNewNavigation && shouldOpenExternally) {
+      this.delegate?.onOpenExternalUrl?.(request.url);
       return false;
     }
     return true;
@@ -114,18 +108,18 @@ export class DeunaWebViewController extends BaseWebViewController {
         this.jsExecutor.requests.get(requestId)?.(data);
         this.jsExecutor.requests.delete(requestId);
       },
-      [WebViewEventType.openInNewTab]: () => {
-        this.delegate?.onOpenInNewTab?.(eventData.url);
+      [WebViewEventType.openExternalUrl]: () => {
+        this.delegate?.onOpenExternalUrl?.(eventData.url);
       },
       [WebViewEventType.redirect]: () => {
         if (this.redirectUrl) {
           return;
         }
         this.redirectUrl = eventData.url;
-        this.delegate?.onOpenInNewTab?.(eventData.url);
+        this.delegate?.onOpenExternalUrl?.(eventData.url);
       },
-      [WebViewEventType.newTabWindowClose]: () => {
-        this.delegate?.onNewTabWindowClose?.();
+      [WebViewEventType.closeExternalUrl]: () => {
+        this.delegate?.onCloseExternalUrl?.();
       }
     };
     mapper[eventData.type]?.();
@@ -133,7 +127,7 @@ export class DeunaWebViewController extends BaseWebViewController {
   setXprops = () => {
     this.webView?.injectJavaScript(`
     window.open = function(url, target, features) {
-      window.ReactNativeWebView.postMessage(JSON.stringify({ type: '${WebViewEventType.openInNewTab}', url }));
+      window.ReactNativeWebView.postMessage(JSON.stringify({ type: '${WebViewEventType.openExternalUrl}', url }));
     };
     console.log = function(message) {
         window.ReactNativeWebView.postMessage(JSON.stringify({ type: '${WebViewEventType.consoleLog}', message }));