@capgo/inappbrowser 1.0.13 → 1.2.4

package/README.md

@@ -213,16 +213,22 @@ Remove all listeners for this plugin.
 
 #### OpenWebViewOptions
 
-| Prop                         | Type                                                            | Description                                                                                                                                                                       | Default                            | Since |
-| ---------------------------- | --------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------- | ----- |
-| **`url`**                    | <code>string</code>                                             | Target URL to load.                                                                                                                                                               |                                    | 0.1.0 |
-| **`headers`**                | <code><a href="#headers">Headers</a></code>                     | <a href="#headers">Headers</a> to send with the request.                                                                                                                          |                                    | 0.1.0 |
-| **`shareDisclaimer`**        | <code><a href="#disclaimeroptions">DisclaimerOptions</a></code> | share options                                                                                                                                                                     |                                    | 0.1.0 |
-| **`toolbarType`**            | <code><a href="#toolbartype">ToolBarType</a></code>             | Toolbar type                                                                                                                                                                      | <code>ToolBarType.DEFAULT</code>   | 0.1.0 |
-| **`shareSubject`**           | <code>string</code>                                             | Share subject                                                                                                                                                                     |                                    | 0.1.0 |
-| **`title`**                  | <code>string</code>                                             | Title of the browser                                                                                                                                                              | <code>'New Window'</code>          | 0.1.0 |
-| **`backgroundColor`**        | <code><a href="#backgroundcolor">BackgroundColor</a></code>     | Background color of the browser, only on IOS                                                                                                                                      | <code>BackgroundColor.BLACK</code> | 0.1.0 |
-| **`isPresentAfterPageLoad`** | <code>boolean</code>                                            | Open url in a new window fullscreen isPresentAfterPageLoad: if true, the browser will be presented after the page is loaded, if false, the browser will be presented immediately. | <code>false</code>                 | 0.1.0 |
+| Prop                         | Type                                                            | Description                                                                                                                                                                       | Default                                                    | Since  |
+| ---------------------------- | --------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------- | ------ |
+| **`url`**                    | <code>string</code>                                             | Target URL to load.                                                                                                                                                               |                                                            | 0.1.0  |
+| **`headers`**                | <code><a href="#headers">Headers</a></code>                     | <a href="#headers">Headers</a> to send with the request.                                                                                                                          |                                                            | 0.1.0  |
+| **`shareDisclaimer`**        | <code><a href="#disclaimeroptions">DisclaimerOptions</a></code> | share options                                                                                                                                                                     |                                                            | 0.1.0  |
+| **`toolbarType`**            | <code><a href="#toolbartype">ToolBarType</a></code>             | Toolbar type                                                                                                                                                                      | <code>ToolBarType.DEFAULT</code>                           | 0.1.0  |
+| **`shareSubject`**           | <code>string</code>                                             | Share subject                                                                                                                                                                     |                                                            | 0.1.0  |
+| **`title`**                  | <code>string</code>                                             | Title of the browser                                                                                                                                                              | <code>'New Window'</code>                                  | 0.1.0  |
+| **`backgroundColor`**        | <code><a href="#backgroundcolor">BackgroundColor</a></code>     | Background color of the browser, only on IOS                                                                                                                                      | <code>BackgroundColor.BLACK</code>                         | 0.1.0  |
+| **`isPresentAfterPageLoad`** | <code>boolean</code>                                            | Open url in a new window fullscreen isPresentAfterPageLoad: if true, the browser will be presented after the page is loaded, if false, the browser will be presented immediately. | <code>false</code>                                         | 0.1.0  |
+| **`showReloadButton`**       | <code>boolean</code>                                            | Shows a reload button that reloads the web page                                                                                                                                   | <code>false</code>                                         | 1.0.15 |
+| **`closeModal`**             | <code>boolean</code>                                            | CloseModal: if true a confirm will be displayed when user clicks on close button, if false the browser will be closed immediately.                                                | <code>false</code>                                         | 1.1.0  |
+| **`closeModalTitle`**        | <code>string</code>                                             | CloseModalTitle: title of the confirm when user clicks on close button, only on IOS                                                                                               | <code>'Close'</code>                                       | 1.1.0  |
+| **`closeModalDescription`**  | <code>string</code>                                             | CloseModalDescription: description of the confirm when user clicks on close button, only on IOS                                                                                   | <code>'Are you sure you want to close this window?'</code> | 1.1.0  |
+| **`closeModalOk`**           | <code>string</code>                                             | CloseModalOk: text of the confirm button when user clicks on close button, only on IOS                                                                                            | <code>'Close'</code>                                       | 1.1.0  |
+| **`closeModalCancel`**       | <code>string</code>                                             | CloseModalCancel: text of the cancel button when user clicks on close button, only on IOS                                                                                         | <code>'Cancel'</code>                                      | 1.1.0  |
 
 
 #### DisclaimerOptions

package/android/build.gradle

@@ -3,6 +3,7 @@ ext {
     androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.6.1'
     androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.5'
     androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.5.1'
+    androidxBrowserVersion = project.hasProperty('androidxBrowserVersion') ? rootProject.ext.androidxBrowserVersion : '1.5.0'
 }
 
 buildscript {
@@ -55,7 +56,7 @@ dependencies {
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
-    implementation 'androidx.browser:browser:1.6.0'
+    implementation "androidx.browser:browser:$androidxBrowserVersion"
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'com.google.android.material:material:1.0.0'
     implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0'

package/android/src/main/java/ee/forgr/capacitor_inappbrowser/InAppBrowserPlugin.java

@@ -150,6 +150,7 @@ public class InAppBrowserPlugin extends Plugin {
     final Options options = new Options();
     options.setUrl(url);
     options.setHeaders(call.getObject("headers"));
+    options.setShowReloadButton(call.getBoolean("showReloadButton", false));
     options.setTitle(call.getString("title", "New Window"));
     options.setShareDisclaimer(call.getObject("shareDisclaimer", null));
     options.setShareSubject(call.getString("shareSubject", null));
@@ -157,6 +158,17 @@ public class InAppBrowserPlugin extends Plugin {
     options.setPresentAfterPageLoad(
       call.getBoolean("isPresentAfterPageLoad", false)
     );
+    if (call.getBoolean("closeModal", false)) {
+      options.setCloseModal(true);
+      options.setCloseModalTitle(call.getString("closeModalTitle", "Close"));
+      options.setCloseModalDescription(
+        call.getString("closeModalDescription", "Are you sure ?")
+      );
+      options.setCloseModalOk(call.getString("closeModalOk", "Ok"));
+      options.setCloseModalCancel(call.getString("closeModalCancel", "Cancel"));
+    } else {
+      options.setCloseModal(false);
+    }
     options.setPluginCall(call);
     options.setCallbacks(
       new WebViewCallbacks() {

package/android/src/main/java/ee/forgr/capacitor_inappbrowser/Options.java

@@ -6,6 +6,11 @@ import com.getcapacitor.PluginCall;
 public class Options {
 
   private String title;
+  private boolean CloseModal;
+  private String CloseModalTitle;
+  private String CloseModalDescription;
+  private String CloseModalCancel;
+  private String CloseModalOk;
   private String url;
   private JSObject headers;
   private String toolbarType;
@@ -31,6 +36,46 @@ public class Options {
     this.title = title;
   }
 
+  public boolean getCloseModal() {
+    return CloseModal;
+  }
+
+  public void setCloseModal(boolean CloseModal) {
+    this.CloseModal = CloseModal;
+  }
+
+  public String getCloseModalTitle() {
+    return CloseModalTitle;
+  }
+
+  public void setCloseModalTitle(String CloseModalTitle) {
+    this.CloseModalTitle = CloseModalTitle;
+  }
+
+  public String getCloseModalDescription() {
+    return CloseModalDescription;
+  }
+
+  public void setCloseModalDescription(String CloseModalDescription) {
+    this.CloseModalDescription = CloseModalDescription;
+  }
+
+  public String getCloseModalCancel() {
+    return CloseModalCancel;
+  }
+
+  public void setCloseModalCancel(String CloseModalCancel) {
+    this.CloseModalCancel = CloseModalCancel;
+  }
+
+  public String getCloseModalOk() {
+    return CloseModalOk;
+  }
+
+  public void setCloseModalOk(String CloseModalOk) {
+    this.CloseModalOk = CloseModalOk;
+  }
+
   public String getUrl() {
     return url;
   }
@@ -59,6 +104,16 @@ public class Options {
     return shareDisclaimer;
   }
 
+  public boolean showReloadButton;
+
+  public boolean getShowReloadButton() {
+    return showReloadButton;
+  }
+
+  public void setShowReloadButton(boolean showReloadButton) {
+    this.showReloadButton = showReloadButton;
+  }
+
   public void setShareDisclaimer(JSObject shareDisclaimer) {
     this.shareDisclaimer = shareDisclaimer;
   }

package/android/src/main/java/ee/forgr/capacitor_inappbrowser/WebViewDialog.java

@@ -1,7 +1,9 @@
 package ee.forgr.capacitor_inappbrowser;
 
+import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.graphics.Bitmap;
 import android.text.TextUtils;
 import android.view.View;
@@ -25,11 +27,13 @@ public class WebViewDialog extends Dialog {
   private WebView _webView;
   private Toolbar _toolbar;
   private Options _options;
+  private Context _context;
   private boolean isInitialized = false;
 
   public WebViewDialog(Context context, int theme, Options options) {
     super(context, theme);
     this._options = options;
+    this._context = context;
     this.isInitialized = false;
   }
 
@@ -153,12 +157,44 @@ public class WebViewDialog extends Dialog {
       new View.OnClickListener() {
         @Override
         public void onClick(View view) {
-          dismiss();
-          _options.getCallbacks().closeEvent(_webView.getUrl());
+          // if closeModal true then display a native modal to check if the user is sure to close the browser
+          if (_options.getCloseModal()) {
+            new AlertDialog.Builder(_context)
+              .setTitle(_options.getCloseModalTitle())
+              .setMessage(_options.getCloseModalDescription())
+              .setPositiveButton(
+                _options.getCloseModalOk(),
+                new DialogInterface.OnClickListener() {
+                  public void onClick(DialogInterface dialog, int which) {
+                    // Close button clicked, do something
+                    dismiss();
+                    _options.getCallbacks().closeEvent(_webView.getUrl());
+                  }
+                }
+              )
+              .setNegativeButton(_options.getCloseModalCancel(), null)
+              .show();
+          } else {
+            dismiss();
+            _options.getCallbacks().closeEvent(_webView.getUrl());
+          }
         }
       }
     );
 
+    if (_options.getShowReloadButton()) {
+      View reloadButton = _toolbar.findViewById(R.id.reloadButton);
+      reloadButton.setVisibility(View.VISIBLE);
+      reloadButton.setOnClickListener(
+        new View.OnClickListener() {
+          @Override
+          public void onClick(View view) {
+            _webView.reload();
+          }
+        }
+      );
+    }
+
     if (TextUtils.equals(_options.getToolbarType(), "activity")) {
       _toolbar.findViewById(R.id.forwardButton).setVisibility(View.GONE);
       _toolbar.findViewById(R.id.backButton).setVisibility(View.GONE);
@@ -198,7 +234,17 @@ public class WebViewDialog extends Dialog {
           } catch (URISyntaxException e) {
             // Do nothing
           }
-          _options.getCallbacks().urlChangeEvent(url);
+        }
+
+        public void doUpdateVisitedHistory(
+          WebView view,
+          String url,
+          boolean isReload
+        ) {
+          if (!isReload) {
+            _options.getCallbacks().urlChangeEvent(url);
+          }
+          super.doUpdateVisitedHistory(view, url, isReload);
         }
 
         @Override

package/android/src/main/res/drawable/ic_refresh.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/enable"
+        android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
+</vector>

package/android/src/main/res/layout/tool_bar.xml

@@ -15,6 +15,15 @@
         android:layout_gravity="start"
         android:background="#eeeeef"
         android:contentDescription="@string/close_button" />
+    <ImageButton
+        android:id="@+id/reloadButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end"
+        android:background="#eeeeef"
+        android:contentDescription="@string/reload_button"
+        android:src="@drawable/ic_refresh"
+        android:visibility="gone" />
 
     <TextView
         android:id="@+id/titleText"

package/android/src/main/res/values/strings.xml

@@ -3,6 +3,7 @@
     <string name="title_activity_browser">BrowserActivity</string>
     <string name="title_activity_basic">BasicActivity</string>
     <string name="close_button">Close Button</string>
+    <string name="reload_button">Reload Button</string>
     <string name="back_button">Back Button</string>
     <string name="title">Title</string>
     <string name="forward_button">Forward Button</string>

package/dist/docs.json

@@ -386,6 +386,102 @@
           "docs": "Open url in a new window fullscreen\n\nisPresentAfterPageLoad: if true, the browser will be presented after the page is loaded, if false, the browser will be presented immediately.",
           "complexTypes": [],
           "type": "boolean | undefined"
+        },
+        {
+          "name": "showReloadButton",
+          "tags": [
+            {
+              "text": "1.0.15",
+              "name": "since"
+            },
+            {
+              "text": "false",
+              "name": "default"
+            }
+          ],
+          "docs": "Shows a reload button that reloads the web page",
+          "complexTypes": [],
+          "type": "boolean | undefined"
+        },
+        {
+          "name": "closeModal",
+          "tags": [
+            {
+              "text": "1.1.0",
+              "name": "since"
+            },
+            {
+              "text": "false",
+              "name": "default"
+            }
+          ],
+          "docs": "CloseModal: if true a confirm will be displayed when user clicks on close button, if false the browser will be closed immediately.",
+          "complexTypes": [],
+          "type": "boolean | undefined"
+        },
+        {
+          "name": "closeModalTitle",
+          "tags": [
+            {
+              "text": "1.1.0",
+              "name": "since"
+            },
+            {
+              "text": "'Close'",
+              "name": "default"
+            }
+          ],
+          "docs": "CloseModalTitle: title of the confirm when user clicks on close button, only on IOS",
+          "complexTypes": [],
+          "type": "string | undefined"
+        },
+        {
+          "name": "closeModalDescription",
+          "tags": [
+            {
+              "text": "1.1.0",
+              "name": "since"
+            },
+            {
+              "text": "'Are you sure you want to close this window?'",
+              "name": "default"
+            }
+          ],
+          "docs": "CloseModalDescription: description of the confirm when user clicks on close button, only on IOS",
+          "complexTypes": [],
+          "type": "string | undefined"
+        },
+        {
+          "name": "closeModalOk",
+          "tags": [
+            {
+              "text": "1.1.0",
+              "name": "since"
+            },
+            {
+              "text": "'Close'",
+              "name": "default"
+            }
+          ],
+          "docs": "CloseModalOk: text of the confirm button when user clicks on close button, only on IOS",
+          "complexTypes": [],
+          "type": "string | undefined"
+        },
+        {
+          "name": "closeModalCancel",
+          "tags": [
+            {
+              "text": "1.1.0",
+              "name": "since"
+            },
+            {
+              "text": "'Cancel'",
+              "name": "default"
+            }
+          ],
+          "docs": "CloseModalCancel: text of the cancel button when user clicks on close button, only on IOS",
+          "complexTypes": [],
+          "type": "string | undefined"
         }
       ]
     },

package/dist/esm/definitions.d.ts

@@ -101,6 +101,47 @@ export interface OpenWebViewOptions {
      * @default false
      */
     isPresentAfterPageLoad?: boolean;
+    /**
+     * Shows a reload button that reloads the web page
+     * @since 1.0.15
+     * @default false
+     */
+    showReloadButton?: boolean;
+    /**
+     * CloseModal: if true a confirm will be displayed when user clicks on close button, if false the browser will be closed immediately.
+     *
+     * @since 1.1.0
+     * @default false
+     */
+    closeModal?: boolean;
+    /**
+     * CloseModalTitle: title of the confirm when user clicks on close button, only on IOS
+     *
+     * @since 1.1.0
+     * @default 'Close'
+     */
+    closeModalTitle?: string;
+    /**
+     * CloseModalDescription: description of the confirm when user clicks on close button, only on IOS
+     *
+     * @since 1.1.0
+     * @default 'Are you sure you want to close this window?'
+     */
+    closeModalDescription?: string;
+    /**
+     * CloseModalOk: text of the confirm button when user clicks on close button, only on IOS
+     *
+     * @since 1.1.0
+     * @default 'Close'
+     */
+    closeModalOk?: string;
+    /**
+     * CloseModalCancel: text of the cancel button when user clicks on close button, only on IOS
+     *
+     * @since 1.1.0
+     * @default 'Cancel'
+     */
+    closeModalCancel?: string;
 }
 export interface InAppBrowserPlugin {
     /**

package/dist/esm/definitions.js.map

@@ -1 +1 @@
-{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"AAsBA,MAAM,CAAN,IAAY,eAGX;AAHD,WAAY,eAAe;IACzB,kCAAe,CAAA;IACf,kCAAe,CAAA;AACjB,CAAC,EAHW,eAAe,KAAf,eAAe,QAG1B;AACD,MAAM,CAAN,IAAY,WAKX;AALD,WAAY,WAAW;IACrB,oCAAqB,CAAA;IACrB,wCAAyB,CAAA;IACzB,8BAAe,CAAA;IACf,2BAAY,CAAA;AACd,CAAC,EALW,WAAW,KAAX,WAAW,QAKtB","sourcesContent":["import type { PluginListenerHandle } from \"@capacitor/core\";\n\nexport interface UrlEvent {\n  /**\n   * Emit when the url changes\n   *\n   * @since 0.0.1\n   */\n  url: string;\n}\nexport interface BtnEvent {\n  /**\n   * Emit when a button is clicked.\n   *\n   * @since 0.0.1\n   */\n  url: string;\n}\n\nexport type UrlChangeListener = (state: UrlEvent) => void;\nexport type ConfirmBtnListener = (state: BtnEvent) => void;\n\nexport enum BackgroundColor {\n  WHITE = \"white\",\n  BLACK = \"black\",\n}\nexport enum ToolBarType {\n  ACTIVITY = \"activity\",\n  NAVIGATION = \"navigation\",\n  BLANK = \"blank\",\n  DEFAULT = \"\",\n}\n\nexport interface Headers {\n  [key: string]: string;\n}\n\nexport interface OpenOptions {\n  /**\n   * Target URL to load.\n   * @since 0.1.0\n   */\n  url: string;\n  /**\n   * Headers to send with the request.\n   * @since 0.1.0\n   */\n  headers?: Headers;\n  /**\n   * if true, the browser will be presented after the page is loaded, if false, the browser will be presented immediately.\n   * @since 0.1.0\n   */\n  isPresentAfterPageLoad?: boolean;\n  preventDeeplink?: boolean;\n}\n\nexport interface DisclaimerOptions {\n  title: string;\n  message: string;\n  confirmBtn: string;\n  cancelBtn: string;\n}\n\nexport interface OpenWebViewOptions {\n  /**\n   * Target URL to load.\n   * @since 0.1.0\n   */\n  url: string;\n  /**\n   * Headers to send with the request.\n   * @since 0.1.0\n   */\n  headers?: Headers;\n  /**\n   * share options\n   * @since 0.1.0\n   */\n  shareDisclaimer?: DisclaimerOptions;\n  /**\n   * Toolbar type\n   * @since 0.1.0\n   * @default ToolBarType.DEFAULT\n   */\n  toolbarType?: ToolBarType;\n  /**\n   * Share subject\n   * @since 0.1.0\n   */\n  shareSubject?: string;\n  /**\n   * Title of the browser\n   * @since 0.1.0\n   * @default 'New Window'\n   */\n  title: string;\n  /**\n   * Background color of the browser, only on IOS\n   * @since 0.1.0\n   * @default BackgroundColor.BLACK\n   */\n  backgroundColor?: BackgroundColor;\n  /**\n   * Open url in a new window fullscreen\n   *\n   * isPresentAfterPageLoad: if true, the browser will be presented after the page is loaded, if false, the browser will be presented immediately.\n   * @since 0.1.0\n   * @default false\n   */\n  isPresentAfterPageLoad?: boolean;\n}\n\n// CapBrowser.addListener(\"urlChangeEvent\", (info:  any) => {\n//   console.log(info.url)\n// })\n\n// CapBrowser.addListener(\"confirmBtnClicked\", (info:  any) => {\n//   // will be triggered when user clicks on confirm button when disclaimer is required, works only on iOS\n//   console.log(info.url)\n// })\nexport interface InAppBrowserPlugin {\n  /**\n   * Open url in a new window fullscreen\n   *\n   * @since 0.1.0\n   */\n  open(options: OpenOptions): Promise<any>;\n\n  /**\n   * Clear all cookies\n   *\n   * @since 0.5.0\n   */\n  clearCookies(): Promise<any>;\n  close(): Promise<any>;\n  /**\n   * Open url in a new webview with toolbars\n   *\n   * @since 0.1.0\n   */\n  openWebView(options: OpenWebViewOptions): Promise<any>;\n  setUrl(options: { url: string }): Promise<any>;\n  /**\n   * Listen for url change, only for openWebView\n   *\n   * @since 0.0.1\n   */\n  addListener(\n    eventName: \"urlChangeEvent\",\n    listenerFunc: UrlChangeListener\n  ): Promise<PluginListenerHandle> & PluginListenerHandle;\n\n  /**\n   * Listen for close click only for openWebView\n   *\n   * @since 0.4.0\n   */\n  addListener(\n    eventName: \"closeEvent\",\n    listenerFunc: UrlChangeListener\n  ): Promise<PluginListenerHandle> & PluginListenerHandle;\n  /**\n   * Will be triggered when user clicks on confirm button when disclaimer is required, works only on iOS\n   *\n   * @since 0.0.1\n   */\n  addListener(\n    eventName: \"confirmBtnClicked\",\n    listenerFunc: ConfirmBtnListener\n  ): Promise<PluginListenerHandle> & PluginListenerHandle;\n\n  /**\n   * Remove all listeners for this plugin.\n   *\n   * @since 1.0.0\n   */\n  removeAllListeners(): Promise<void>;\n}\n"]}
+{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"AAsBA,MAAM,CAAN,IAAY,eAGX;AAHD,WAAY,eAAe;IACzB,kCAAe,CAAA;IACf,kCAAe,CAAA;AACjB,CAAC,EAHW,eAAe,KAAf,eAAe,QAG1B;AACD,MAAM,CAAN,IAAY,WAKX;AALD,WAAY,WAAW;IACrB,oCAAqB,CAAA;IACrB,wCAAyB,CAAA;IACzB,8BAAe,CAAA;IACf,2BAAY,CAAA;AACd,CAAC,EALW,WAAW,KAAX,WAAW,QAKtB","sourcesContent":["import type { PluginListenerHandle } from \"@capacitor/core\";\n\nexport interface UrlEvent {\n  /**\n   * Emit when the url changes\n   *\n   * @since 0.0.1\n   */\n  url: string;\n}\nexport interface BtnEvent {\n  /**\n   * Emit when a button is clicked.\n   *\n   * @since 0.0.1\n   */\n  url: string;\n}\n\nexport type UrlChangeListener = (state: UrlEvent) => void;\nexport type ConfirmBtnListener = (state: BtnEvent) => void;\n\nexport enum BackgroundColor {\n  WHITE = \"white\",\n  BLACK = \"black\",\n}\nexport enum ToolBarType {\n  ACTIVITY = \"activity\",\n  NAVIGATION = \"navigation\",\n  BLANK = \"blank\",\n  DEFAULT = \"\",\n}\n\nexport interface Headers {\n  [key: string]: string;\n}\n\nexport interface OpenOptions {\n  /**\n   * Target URL to load.\n   * @since 0.1.0\n   */\n  url: string;\n  /**\n   * Headers to send with the request.\n   * @since 0.1.0\n   */\n  headers?: Headers;\n  /**\n   * if true, the browser will be presented after the page is loaded, if false, the browser will be presented immediately.\n   * @since 0.1.0\n   */\n  isPresentAfterPageLoad?: boolean;\n  preventDeeplink?: boolean;\n}\n\nexport interface DisclaimerOptions {\n  title: string;\n  message: string;\n  confirmBtn: string;\n  cancelBtn: string;\n}\n\nexport interface OpenWebViewOptions {\n  /**\n   * Target URL to load.\n   * @since 0.1.0\n   */\n  url: string;\n  /**\n   * Headers to send with the request.\n   * @since 0.1.0\n   */\n  headers?: Headers;\n  /**\n   * share options\n   * @since 0.1.0\n   */\n  shareDisclaimer?: DisclaimerOptions;\n  /**\n   * Toolbar type\n   * @since 0.1.0\n   * @default ToolBarType.DEFAULT\n   */\n  toolbarType?: ToolBarType;\n  /**\n   * Share subject\n   * @since 0.1.0\n   */\n  shareSubject?: string;\n  /**\n   * Title of the browser\n   * @since 0.1.0\n   * @default 'New Window'\n   */\n  title: string;\n  /**\n   * Background color of the browser, only on IOS\n   * @since 0.1.0\n   * @default BackgroundColor.BLACK\n   */\n  backgroundColor?: BackgroundColor;\n  /**\n   * Open url in a new window fullscreen\n   *\n   * isPresentAfterPageLoad: if true, the browser will be presented after the page is loaded, if false, the browser will be presented immediately.\n   * @since 0.1.0\n   * @default false\n   */\n  isPresentAfterPageLoad?: boolean;\n  /**\n   * Shows a reload button that reloads the web page\n   * @since 1.0.15\n   * @default false\n   */\n  showReloadButton?: boolean;\n  /**\n   * CloseModal: if true a confirm will be displayed when user clicks on close button, if false the browser will be closed immediately.\n   *\n   * @since 1.1.0\n   * @default false\n   */\n  closeModal?: boolean;\n  /**\n   * CloseModalTitle: title of the confirm when user clicks on close button, only on IOS\n   *\n   * @since 1.1.0\n   * @default 'Close'\n   */\n  closeModalTitle?: string;\n  /**\n   * CloseModalDescription: description of the confirm when user clicks on close button, only on IOS\n   *\n   * @since 1.1.0\n   * @default 'Are you sure you want to close this window?'\n   */\n  closeModalDescription?: string;\n  /**\n   * CloseModalOk: text of the confirm button when user clicks on close button, only on IOS\n   *\n   * @since 1.1.0\n   * @default 'Close'\n   */\n  closeModalOk?: string;\n  /**\n   * CloseModalCancel: text of the cancel button when user clicks on close button, only on IOS\n   *\n   * @since 1.1.0\n   * @default 'Cancel'\n   */\n  closeModalCancel?: string;\n}\n\n// CapBrowser.addListener(\"urlChangeEvent\", (info:  any) => {\n//   console.log(info.url)\n// })\n\n// CapBrowser.addListener(\"confirmBtnClicked\", (info:  any) => {\n//   // will be triggered when user clicks on confirm button when disclaimer is required, works only on iOS\n//   console.log(info.url)\n// })\nexport interface InAppBrowserPlugin {\n  /**\n   * Open url in a new window fullscreen\n   *\n   * @since 0.1.0\n   */\n  open(options: OpenOptions): Promise<any>;\n\n  /**\n   * Clear all cookies\n   *\n   * @since 0.5.0\n   */\n  clearCookies(): Promise<any>;\n  close(): Promise<any>;\n  /**\n   * Open url in a new webview with toolbars\n   *\n   * @since 0.1.0\n   */\n  openWebView(options: OpenWebViewOptions): Promise<any>;\n  setUrl(options: { url: string }): Promise<any>;\n  /**\n   * Listen for url change, only for openWebView\n   *\n   * @since 0.0.1\n   */\n  addListener(\n    eventName: \"urlChangeEvent\",\n    listenerFunc: UrlChangeListener\n  ): Promise<PluginListenerHandle> & PluginListenerHandle;\n\n  /**\n   * Listen for close click only for openWebView\n   *\n   * @since 0.4.0\n   */\n  addListener(\n    eventName: \"closeEvent\",\n    listenerFunc: UrlChangeListener\n  ): Promise<PluginListenerHandle> & PluginListenerHandle;\n  /**\n   * Will be triggered when user clicks on confirm button when disclaimer is required, works only on iOS\n   *\n   * @since 0.0.1\n   */\n  addListener(\n    eventName: \"confirmBtnClicked\",\n    listenerFunc: ConfirmBtnListener\n  ): Promise<PluginListenerHandle> & PluginListenerHandle;\n\n  /**\n   * Remove all listeners for this plugin.\n   *\n   * @since 1.0.0\n   */\n  removeAllListeners(): Promise<void>;\n}\n"]}

package/ios/Plugin/InAppBrowserPlugin.swift

@@ -54,6 +54,11 @@ public class InAppBrowserPlugin: CAPPlugin {
         }
 
         let headers = call.getObject("headers", [:]).mapValues { String(describing: $0 as Any) }
+        let closeModal = call.getBool("closeModal", false)
+        let closeModalTitle = call.getString("closeModalTitle", "Close")
+        let closeModalDescription = call.getString("closeModalDescription", "Are you sure you want to close this window?")
+        let closeModalOk = call.getString("closeModalOk", "OK")
+        let closeModalCancel = call.getString("closeModalCancel", "Cancel")
 
         var disclaimerContent = call.getObject("shareDisclaimer")
         let toolbarType = call.getString("toolbarType", "")
@@ -63,6 +68,7 @@ public class InAppBrowserPlugin: CAPPlugin {
         }
 
         self.isPresentAfterPageLoad = call.getBool("isPresentAfterPageLoad", false)
+        let showReloadButton = call.getBool("showReloadButton", false)
 
         DispatchQueue.main.async {
             let url = URL(string: urlString)
@@ -82,6 +88,13 @@ public class InAppBrowserPlugin: CAPPlugin {
             self.webViewController?.title = call.getString("title", "New Window")
             self.webViewController?.shareSubject = call.getString("shareSubject")
             self.webViewController?.shareDisclaimer = disclaimerContent
+            if closeModal {
+                self.webViewController?.closeModal = true
+                self.webViewController?.closeModalTitle = closeModalTitle
+                self.webViewController?.closeModalDescription = closeModalDescription
+                self.webViewController?.closeModalOk = closeModalOk
+                self.webViewController?.closeModalCancel = closeModalCancel
+            }
             self.navigationWebViewController = UINavigationController.init(rootViewController: self.webViewController!)
             self.navigationWebViewController?.navigationBar.isTranslucent = false
             self.navigationWebViewController?.toolbar.isTranslucent = false
@@ -91,6 +104,10 @@ public class InAppBrowserPlugin: CAPPlugin {
             if toolbarType == "blank" {
                 self.navigationWebViewController?.navigationBar.isHidden = true
             }
+            if showReloadButton {
+                var toolbarItems = self.getToolbarItems(toolbarType: toolbarType)
+                self.webViewController?.leftNavigaionBarItemTypes = toolbarItems + [.reload]
+            }
             if !self.isPresentAfterPageLoad {
                 self.presentView()
             }

package/ios/Plugin/WKWebViewController.swift

@@ -74,6 +74,11 @@ open class WKWebViewController: UIViewController {
     var viewHeightLandscape: CGFloat?
     var viewHeightPortrait: CGFloat?
     var currentViewHeight: CGFloat?
+    open var closeModal = false
+    open var closeModalTitle = ""
+    open var closeModalDescription = ""
+    open var closeModalOk = ""
+    open var closeModalCancel = ""
 
     func setHeaders(headers: [String: String]) {
         self.headers = headers
@@ -672,7 +677,7 @@ fileprivate extension WKWebViewController {
         }
     }
 
-    @objc func doneDidClick(sender: AnyObject) {
+    func closeView () {
         var canDismiss = true
         if let url = self.source?.url {
             canDismiss = delegate?.webViewController?(self, canDismiss: url) ?? true
@@ -684,6 +689,21 @@ fileprivate extension WKWebViewController {
         }
     }
 
+    @objc func doneDidClick(sender: AnyObject) {
+        // check if closeModal is true, if true display alert before close
+        if self.closeModal {
+            let alert = UIAlertController(title: self.closeModalTitle, message: self.closeModalDescription, preferredStyle: UIAlertController.Style.alert)
+            alert.addAction(UIAlertAction(title: self.closeModalOk, style: UIAlertAction.Style.default, handler: { _ in
+                self.closeView()
+            }))
+            alert.addAction(UIAlertAction(title: self.closeModalCancel, style: UIAlertAction.Style.default, handler: nil))
+            self.present(alert, animated: true, completion: nil)
+        } else {
+            self.closeView()
+        }
+
+    }
+
     @objc func customDidClick(sender: BlockBarButtonItem) {
         sender.block?(self)
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/inappbrowser",
-  "version": "1.0.13",
+  "version": "1.2.4",
   "description": "Capacitor plugin in app browser",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",