@capgo/inappbrowser 0.3.7 → 0.3.20

package/README.md

@@ -21,6 +21,7 @@ npx cap sync
 * [`openWebView(...)`](#openwebview)
 * [`setUrl(...)`](#seturl)
 * [`addListener('urlChangeEvent', ...)`](#addlistenerurlchangeevent)
+* [`addListener('closeEvent', ...)`](#addlistenercloseevent)
 * [`addListener('confirmBtnClicked', ...)`](#addlistenerconfirmbtnclicked)
 * [Interfaces](#interfaces)
 * [Type Aliases](#type-aliases)
@@ -34,14 +35,14 @@ npx cap sync
 ### open(...)
 
 ```typescript
-open(options: OpenOptions) => Promise<any>
+open(options: OpenOptions) => any
 ```
 
 | Param         | Type                                                |
 | ------------- | --------------------------------------------------- |
 | **`options`** | <code><a href="#openoptions">OpenOptions</a></code> |
 
-**Returns:** <code>Promise&lt;any&gt;</code>
+**Returns:** <code>any</code>
 
 --------------------
 
@@ -49,10 +50,10 @@ open(options: OpenOptions) => Promise<any>
 ### close()
 
 ```typescript
-close() => Promise<any>
+close() => any
 ```
 
-**Returns:** <code>Promise&lt;any&gt;</code>
+**Returns:** <code>any</code>
 
 --------------------
 
@@ -60,14 +61,14 @@ close() => Promise<any>
 ### openWebView(...)
 
 ```typescript
-openWebView(options: OpenWebViewOptions) => Promise<any>
+openWebView(options: OpenWebViewOptions) => any
 ```
 
 | Param         | Type                                                              |
 | ------------- | ----------------------------------------------------------------- |
 | **`options`** | <code><a href="#openwebviewoptions">OpenWebViewOptions</a></code> |
 
-**Returns:** <code>Promise&lt;any&gt;</code>
+**Returns:** <code>any</code>
 
 --------------------
 
@@ -75,14 +76,14 @@ openWebView(options: OpenWebViewOptions) => Promise<any>
 ### setUrl(...)
 
 ```typescript
-setUrl(options: { url: string; }) => Promise<any>
+setUrl(options: { url: string; }) => any
 ```
 
 | Param         | Type                          |
 | ------------- | ----------------------------- |
 | **`options`** | <code>{ url: string; }</code> |
 
-**Returns:** <code>Promise&lt;any&gt;</code>
+**Returns:** <code>any</code>
 
 --------------------
 
@@ -100,13 +101,33 @@ Listen for url change
 | **`eventName`**    | <code>'urlChangeEvent'</code>                                   |
 | **`listenerFunc`** | <code><a href="#urlchangelistener">UrlChangeListener</a></code> |
 
-**Returns:** <code>Promise&lt;<a href="#pluginlistenerhandle">PluginListenerHandle</a>&gt; & <a href="#pluginlistenerhandle">PluginListenerHandle</a></code>
+**Returns:** <code>any</code>
 
 **Since:** 0.0.1
 
 --------------------
 
 
+### addListener('closeEvent', ...)
+
+```typescript
+addListener(eventName: 'closeEvent', listenerFunc: UrlChangeListener) => Promise<PluginListenerHandle> & PluginListenerHandle
+```
+
+Listen for close click
+
+| Param              | Type                                                            |
+| ------------------ | --------------------------------------------------------------- |
+| **`eventName`**    | <code>'closeEvent'</code>                                       |
+| **`listenerFunc`** | <code><a href="#urlchangelistener">UrlChangeListener</a></code> |
+
+**Returns:** <code>any</code>
+
+**Since:** 0.4.0
+
+--------------------
+
+
 ### addListener('confirmBtnClicked', ...)
 
 ```typescript
@@ -120,7 +141,7 @@ Will be triggered when user clicks on confirm button when disclaimer is required
 | **`eventName`**    | <code>'confirmBtnClicked'</code>                                  |
 | **`listenerFunc`** | <code><a href="#confirmbtnlistener">ConfirmBtnListener</a></code> |
 
-**Returns:** <code>Promise&lt;<a href="#pluginlistenerhandle">PluginListenerHandle</a>&gt; & <a href="#pluginlistenerhandle">PluginListenerHandle</a></code>
+**Returns:** <code>any</code>
 
 **Since:** 0.0.1
 
@@ -166,13 +187,6 @@ Will be triggered when user clicks on confirm button when disclaimer is required
 | **`cancelBtn`**  | <code>string</code> |
 
 
-#### PluginListenerHandle
-
-| Prop         | Type                                      |
-| ------------ | ----------------------------------------- |
-| **`remove`** | <code>() =&gt; Promise&lt;void&gt;</code> |
-
-
 #### UrlEvent
 
 | Prop      | Type                | Description               | Since |
@@ -180,6 +194,13 @@ Will be triggered when user clicks on confirm button when disclaimer is required
 | **`url`** | <code>string</code> | Emit when the url changes | 0.0.1 |
 
 
+#### PluginListenerHandle
+
+| Prop         | Type                      |
+| ------------ | ------------------------- |
+| **`remove`** | <code>() =&gt; any</code> |
+
+
 #### BtnEvent
 
 | Prop      | Type                | Description                    | Since |

package/android/build.gradle

@@ -60,5 +60,5 @@ dependencies {
     implementation 'com.android.support:design:28.0.0'
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0'
-    implementation 'com.google.android.material:material:1.7.0'
+    implementation 'com.google.android.material:material:1.8.0'
 }

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

@@ -91,6 +91,10 @@ public class InAppBrowserPlugin extends Plugin {
                 public void urlChangeEvent(String url) {
                     notifyListeners("urlChangeEvent", new JSObject().put("url", url));
                 }
+                @Override
+                public void closeEvent(String url) {
+                    notifyListeners("closeEvent", new JSObject().put("url", url));
+                }
 
                 @Override
                 public void pageLoaded() {

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

@@ -3,6 +3,8 @@ package ee.forgr.capacitor_inappbrowser;
 public interface WebViewCallbacks {
     public void urlChangeEvent(String url);
 
+    public void closeEvent(String url);
+
     public void pageLoaded();
 
     public void pageLoadError();

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

@@ -72,7 +72,7 @@ public class WebViewDialog extends Dialog {
 
         if (!this._options.isPresentAfterPageLoad()) {
             show();
-            _options.getPluginCall().success();
+            _options.getPluginCall().resolve();
         }
     }
 
@@ -140,6 +140,7 @@ public class WebViewDialog extends Dialog {
                 @Override
                 public void onClick(View view) {
                     dismiss();
+                    _options.getCallbacks().closeEvent(_webView.getUrl());
                 }
             }
         );
@@ -192,7 +193,7 @@ public class WebViewDialog extends Dialog {
                         _webView.clearHistory();
                         if (_options.isPresentAfterPageLoad()) {
                             show();
-                            _options.getPluginCall().success();
+                            _options.getPluginCall().resolve();
                         }
                     }
 

package/dist/docs.json

@@ -7,7 +7,7 @@
     "methods": [
       {
         "name": "open",
-        "signature": "(options: OpenOptions) => Promise<any>",
+        "signature": "(options: OpenOptions) => any",
         "parameters": [
           {
             "name": "options",
@@ -15,7 +15,7 @@
             "type": "OpenOptions"
           }
         ],
-        "returns": "Promise<any>",
+        "returns": "any",
         "tags": [],
         "docs": "",
         "complexTypes": [
@@ -25,9 +25,9 @@
       },
       {
         "name": "close",
-        "signature": "() => Promise<any>",
+        "signature": "() => any",
         "parameters": [],
-        "returns": "Promise<any>",
+        "returns": "any",
         "tags": [],
         "docs": "",
         "complexTypes": [],
@@ -35,7 +35,7 @@
       },
       {
         "name": "openWebView",
-        "signature": "(options: OpenWebViewOptions) => Promise<any>",
+        "signature": "(options: OpenWebViewOptions) => any",
         "parameters": [
           {
             "name": "options",
@@ -43,7 +43,7 @@
             "type": "OpenWebViewOptions"
           }
         ],
-        "returns": "Promise<any>",
+        "returns": "any",
         "tags": [],
         "docs": "",
         "complexTypes": [
@@ -53,7 +53,7 @@
       },
       {
         "name": "setUrl",
-        "signature": "(options: { url: string; }) => Promise<any>",
+        "signature": "(options: { url: string; }) => any",
         "parameters": [
           {
             "name": "options",
@@ -61,7 +61,7 @@
             "type": "{ url: string; }"
           }
         ],
-        "returns": "Promise<any>",
+        "returns": "any",
         "tags": [],
         "docs": "",
         "complexTypes": [],
@@ -82,7 +82,7 @@
             "type": "UrlChangeListener"
           }
         ],
-        "returns": "Promise<PluginListenerHandle> & PluginListenerHandle",
+        "returns": "any",
         "tags": [
           {
             "name": "since",
@@ -91,11 +91,40 @@
         ],
         "docs": "Listen for url change",
         "complexTypes": [
-          "PluginListenerHandle",
-          "UrlChangeListener"
+          "UrlChangeListener",
+          "PluginListenerHandle"
         ],
         "slug": "addlistenerurlchangeevent"
       },
+      {
+        "name": "addListener",
+        "signature": "(eventName: 'closeEvent', listenerFunc: UrlChangeListener) => Promise<PluginListenerHandle> & PluginListenerHandle",
+        "parameters": [
+          {
+            "name": "eventName",
+            "docs": "",
+            "type": "'closeEvent'"
+          },
+          {
+            "name": "listenerFunc",
+            "docs": "",
+            "type": "UrlChangeListener"
+          }
+        ],
+        "returns": "any",
+        "tags": [
+          {
+            "name": "since",
+            "text": "0.4.0"
+          }
+        ],
+        "docs": "Listen for close click",
+        "complexTypes": [
+          "UrlChangeListener",
+          "PluginListenerHandle"
+        ],
+        "slug": "addlistenercloseevent"
+      },
       {
         "name": "addListener",
         "signature": "(eventName: 'confirmBtnClicked', listenerFunc: ConfirmBtnListener) => Promise<PluginListenerHandle> & PluginListenerHandle",
@@ -111,7 +140,7 @@
             "type": "ConfirmBtnListener"
           }
         ],
-        "returns": "Promise<PluginListenerHandle> & PluginListenerHandle",
+        "returns": "any",
         "tags": [
           {
             "name": "since",
@@ -120,8 +149,8 @@
         ],
         "docs": "Will be triggered when user clicks on confirm button when disclaimer is required, works only on iOS",
         "complexTypes": [
-          "PluginListenerHandle",
-          "ConfirmBtnListener"
+          "ConfirmBtnListener",
+          "PluginListenerHandle"
         ],
         "slug": "addlistenerconfirmbtnclicked"
       }
@@ -279,22 +308,6 @@
         }
       ]
     },
-    {
-      "name": "PluginListenerHandle",
-      "slug": "pluginlistenerhandle",
-      "docs": "",
-      "tags": [],
-      "methods": [],
-      "properties": [
-        {
-          "name": "remove",
-          "tags": [],
-          "docs": "",
-          "complexTypes": [],
-          "type": "() => Promise<void>"
-        }
-      ]
-    },
     {
       "name": "UrlEvent",
       "slug": "urlevent",
@@ -316,6 +329,22 @@
         }
       ]
     },
+    {
+      "name": "PluginListenerHandle",
+      "slug": "pluginlistenerhandle",
+      "docs": "",
+      "tags": [],
+      "methods": [],
+      "properties": [
+        {
+          "name": "remove",
+          "tags": [],
+          "docs": "",
+          "complexTypes": [],
+          "type": "() => any"
+        }
+      ]
+    },
     {
       "name": "BtnEvent",
       "slug": "btnevent",

package/dist/esm/definitions.d.ts

@@ -15,8 +15,8 @@ export interface BtnEvent {
      */
     url: string;
 }
-export declare type UrlChangeListener = (state: UrlEvent) => void;
-export declare type ConfirmBtnListener = (state: BtnEvent) => void;
+export type UrlChangeListener = (state: UrlEvent) => void;
+export type ConfirmBtnListener = (state: BtnEvent) => void;
 export declare enum BackgroundColor {
     WHITE = "white",
     BLACK = "black"
@@ -64,6 +64,12 @@ export interface InAppBrowserPlugin {
      * @since 0.0.1
      */
     addListener(eventName: 'urlChangeEvent', listenerFunc: UrlChangeListener): Promise<PluginListenerHandle> & PluginListenerHandle;
+    /**
+     * Listen for close click
+     *
+     * @since 0.4.0
+     */
+    addListener(eventName: 'closeEvent', listenerFunc: UrlChangeListener): Promise<PluginListenerHandle> & PluginListenerHandle;
     /**
      * Will be triggered when user clicks on confirm button when disclaimer is required, works only on iOS
      *

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  url: string;\n  headers?: Headers;\n  isPresentAfterPageLoad?: boolean;\n}\n\nexport interface DisclaimerOptions {\n  title: string;\n  message: string;\n  confirmBtn: string;\n  cancelBtn: string;\n}\n\nexport interface OpenWebViewOptions {\n  url: string;\n  headers?: Headers;\n  shareDisclaimer?: DisclaimerOptions;\n  toolbarType?: ToolBarType;\n  shareSubject?: string;\n  title: string;\n  backgroundColor?: BackgroundColor;\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  open(options: OpenOptions): Promise<any>;\n  close(): Promise<any>;\n  openWebView(options: OpenWebViewOptions): Promise<any>;\n  setUrl(options: { url: string }): Promise<any>;\n  /**\n   * Listen for url change\n   *\n   * @since 0.0.1\n   */\n  addListener(\n    eventName: 'urlChangeEvent',\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"]}
+{"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  url: string;\n  headers?: Headers;\n  isPresentAfterPageLoad?: boolean;\n}\n\nexport interface DisclaimerOptions {\n  title: string;\n  message: string;\n  confirmBtn: string;\n  cancelBtn: string;\n}\n\nexport interface OpenWebViewOptions {\n  url: string;\n  headers?: Headers;\n  shareDisclaimer?: DisclaimerOptions;\n  toolbarType?: ToolBarType;\n  shareSubject?: string;\n  title: string;\n  backgroundColor?: BackgroundColor;\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  open(options: OpenOptions): Promise<any>;\n  close(): Promise<any>;\n  openWebView(options: OpenWebViewOptions): Promise<any>;\n  setUrl(options: { url: string }): Promise<any>;\n  /**\n   * Listen for url change\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\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"]}

package/ios/Plugin/InAppBrowserPlugin.m

@@ -12,4 +12,5 @@ CAP_PLUGIN(InAppBrowserPlugin, "InAppBrowser",
            CAP_PLUGIN_METHOD(hide, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(executeScript, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(insertCSS, CAPPluginReturnPromise);
+           CAP_PLUGIN_METHOD(removeAllListeners, CAPPluginReturnPromise);
 )

package/ios/Plugin/WKWebViewController.swift

@@ -679,6 +679,7 @@ fileprivate extension WKWebViewController {
         }
         if canDismiss {
             //            UIDevice.current.setValue(Int(UIInterfaceOrientation.portrait.rawValue), forKey: "orientation")
+            self.capBrowserPlugin?.notifyListeners("closeEvent", data: ["url": webView?.url?.absoluteString ?? ""])
             dismiss(animated: true, completion: nil)
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/inappbrowser",
-  "version": "0.3.7",
+  "version": "0.3.20",
   "description": "Capacitor plugin in app browser",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -59,8 +59,8 @@
     "eslint-plugin-import": "^2.26.0",
     "husky": "^8.0.2",
     "prettier": "^2.7.1",
-    "prettier-plugin-java": "^1.6.2",
-    "rimraf": "^3.0.2",
+    "prettier-plugin-java": "^2.0.0",
+    "rimraf": "^4.0.0",
     "rollup": "^3.2.5",
     "swiftlint": "^1.0.1",
     "typescript": "^4.8.4"