@capgo/inappbrowser 1.3.3 → 1.3.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +25 -21
- package/android/src/main/java/ee/forgr/capacitor_inappbrowser/InAppBrowserPlugin.java +6 -0
- package/android/src/main/java/ee/forgr/capacitor_inappbrowser/Options.java +22 -0
- package/android/src/main/java/ee/forgr/capacitor_inappbrowser/WebViewDialog.java +5 -2
- package/dist/docs.json +24 -0
- package/dist/esm/definitions.d.ts +13 -0
- package/dist/esm/definitions.js.map +1 -1
- package/ios/Plugin/InAppBrowserPlugin.swift +8 -2
- package/ios/Plugin/WKWebViewController.swift +9 -8
- package/package.json +2 -2
package/README.md
CHANGED
|
@@ -19,6 +19,8 @@ import { InAppBrowser } from '@capgo/inappbrowser'
|
|
|
19
19
|
InAppBrowser.open({ url: "YOUR_URL" });
|
|
20
20
|
```
|
|
21
21
|
|
|
22
|
+
Web platform is not supported. Use `window.open` instead.
|
|
23
|
+
|
|
22
24
|
### Camera usage
|
|
23
25
|
|
|
24
26
|
if you need the Camera to work in Android, you need to add the following to your `AndroidManifest.xml` file:
|
|
@@ -300,27 +302,29 @@ Reload the current web page.
|
|
|
300
302
|
|
|
301
303
|
#### OpenWebViewOptions
|
|
302
304
|
|
|
303
|
-
| Prop
|
|
304
|
-
|
|
|
305
|
-
| **`url`**
|
|
306
|
-
| **`headers`**
|
|
307
|
-
| **`shareDisclaimer`**
|
|
308
|
-
| **`toolbarType`**
|
|
309
|
-
| **`shareSubject`**
|
|
310
|
-
| **`title`**
|
|
311
|
-
| **`backgroundColor`**
|
|
312
|
-
| **`
|
|
313
|
-
| **`
|
|
314
|
-
| **`
|
|
315
|
-
| **`
|
|
316
|
-
| **`
|
|
317
|
-
| **`
|
|
318
|
-
| **`
|
|
319
|
-
| **`
|
|
320
|
-
| **`
|
|
321
|
-
| **`
|
|
322
|
-
| **`
|
|
323
|
-
| **`
|
|
305
|
+
| Prop | Type | Description | Default | Since |
|
|
306
|
+
| -------------------------------------- | --------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------- | ------ |
|
|
307
|
+
| **`url`** | <code>string</code> | Target URL to load. | | 0.1.0 |
|
|
308
|
+
| **`headers`** | <code><a href="#headers">Headers</a></code> | <a href="#headers">Headers</a> to send with the request. | | 0.1.0 |
|
|
309
|
+
| **`shareDisclaimer`** | <code><a href="#disclaimeroptions">DisclaimerOptions</a></code> | share options | | 0.1.0 |
|
|
310
|
+
| **`toolbarType`** | <code><a href="#toolbartype">ToolBarType</a></code> | Toolbar type | <code>ToolBarType.DEFAULT</code> | 0.1.0 |
|
|
311
|
+
| **`shareSubject`** | <code>string</code> | Share subject | | 0.1.0 |
|
|
312
|
+
| **`title`** | <code>string</code> | Title of the browser | <code>'New Window'</code> | 0.1.0 |
|
|
313
|
+
| **`backgroundColor`** | <code><a href="#backgroundcolor">BackgroundColor</a></code> | Background color of the browser, only on IOS | <code>BackgroundColor.BLACK</code> | 0.1.0 |
|
|
314
|
+
| **`activeNativeNavigationForWebview`** | <code>boolean</code> | If true, active the native navigation within the webview, Android only | <code>false</code> | |
|
|
315
|
+
| **`disableGoBackOnNativeApplication`** | <code>boolean</code> | Disable the possibility to go back on native application, usefull to force user to stay on the webview, Android only | <code>false</code> | |
|
|
316
|
+
| **`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 |
|
|
317
|
+
| **`isInspectable`** | <code>boolean</code> | Whether the website in the webview is inspectable or not, ios only | <code>false</code> | |
|
|
318
|
+
| **`isAnimated`** | <code>boolean</code> | Whether the webview opening is animated or not, ios only | <code>true</code> | |
|
|
319
|
+
| **`showReloadButton`** | <code>boolean</code> | Shows a reload button that reloads the web page | <code>false</code> | 1.0.15 |
|
|
320
|
+
| **`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 |
|
|
321
|
+
| **`closeModalTitle`** | <code>string</code> | CloseModalTitle: title of the confirm when user clicks on close button, only on IOS | <code>'Close'</code> | 1.1.0 |
|
|
322
|
+
| **`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 |
|
|
323
|
+
| **`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 |
|
|
324
|
+
| **`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 |
|
|
325
|
+
| **`visibleTitle`** | <code>boolean</code> | visibleTitle: if true the website title would be shown else shown empty | <code>true</code> | 1.2.5 |
|
|
326
|
+
| **`toolbarColor`** | <code>string</code> | toolbarColor: color of the toolbar in hex format | <code>'#ffffff''</code> | 1.2.5 |
|
|
327
|
+
| **`showArrow`** | <code>boolean</code> | showArrow: if true an arrow would be shown instead of cross for closing the window | <code>false</code> | 1.2.5 |
|
|
324
328
|
|
|
325
329
|
|
|
326
330
|
#### DisclaimerOptions
|
|
@@ -256,6 +256,12 @@ public class InAppBrowserPlugin
|
|
|
256
256
|
options.setShareDisclaimer(call.getObject("shareDisclaimer", null));
|
|
257
257
|
options.setShareSubject(call.getString("shareSubject", null));
|
|
258
258
|
options.setToolbarType(call.getString("toolbarType", ""));
|
|
259
|
+
options.setActiveNativeNavigationForWebview(
|
|
260
|
+
call.getBoolean("activeNativeNavigationForWebview", false)
|
|
261
|
+
);
|
|
262
|
+
options.setDisableGoBackOnNativeApplication(
|
|
263
|
+
call.getBoolean("disableGoBackOnNativeApplication", false)
|
|
264
|
+
);
|
|
259
265
|
options.setPresentAfterPageLoad(
|
|
260
266
|
call.getBoolean("isPresentAfterPageLoad", false)
|
|
261
267
|
);
|
|
@@ -16,6 +16,8 @@ public class Options {
|
|
|
16
16
|
private String toolbarType;
|
|
17
17
|
private JSObject shareDisclaimer;
|
|
18
18
|
private String shareSubject;
|
|
19
|
+
private boolean disableGoBackOnNativeApplication;
|
|
20
|
+
private boolean activeNativeNavigationForWebview;
|
|
19
21
|
private boolean isPresentAfterPageLoad;
|
|
20
22
|
private WebViewCallbacks callbacks;
|
|
21
23
|
private PluginCall pluginCall;
|
|
@@ -129,6 +131,26 @@ public class Options {
|
|
|
129
131
|
this.shareSubject = shareSubject;
|
|
130
132
|
}
|
|
131
133
|
|
|
134
|
+
public boolean getActiveNativeNavigationForWebview() {
|
|
135
|
+
return activeNativeNavigationForWebview;
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
public void setActiveNativeNavigationForWebview(
|
|
139
|
+
boolean activeNativeNavigationForWebview
|
|
140
|
+
) {
|
|
141
|
+
this.activeNativeNavigationForWebview = activeNativeNavigationForWebview;
|
|
142
|
+
}
|
|
143
|
+
|
|
144
|
+
public boolean getDisableGoBackOnNativeApplication() {
|
|
145
|
+
return disableGoBackOnNativeApplication;
|
|
146
|
+
}
|
|
147
|
+
|
|
148
|
+
public void setDisableGoBackOnNativeApplication(
|
|
149
|
+
boolean disableGoBackOnNativeApplication
|
|
150
|
+
) {
|
|
151
|
+
this.disableGoBackOnNativeApplication = disableGoBackOnNativeApplication;
|
|
152
|
+
}
|
|
153
|
+
|
|
132
154
|
public boolean isPresentAfterPageLoad() {
|
|
133
155
|
return isPresentAfterPageLoad;
|
|
134
156
|
}
|
|
@@ -407,10 +407,13 @@ public class WebViewDialog extends Dialog {
|
|
|
407
407
|
public void onBackPressed() {
|
|
408
408
|
if (
|
|
409
409
|
_webView.canGoBack() &&
|
|
410
|
-
|
|
410
|
+
(
|
|
411
|
+
TextUtils.equals(_options.getToolbarType(), "navigation") ||
|
|
412
|
+
_options.getActiveNativeNavigationForWebview()
|
|
413
|
+
)
|
|
411
414
|
) {
|
|
412
415
|
_webView.goBack();
|
|
413
|
-
} else {
|
|
416
|
+
} else if (!_options.getDisableGoBackOnNativeApplication()) {
|
|
414
417
|
super.onBackPressed();
|
|
415
418
|
}
|
|
416
419
|
}
|
package/dist/docs.json
CHANGED
|
@@ -514,6 +514,30 @@
|
|
|
514
514
|
],
|
|
515
515
|
"type": "BackgroundColor"
|
|
516
516
|
},
|
|
517
|
+
{
|
|
518
|
+
"name": "activeNativeNavigationForWebview",
|
|
519
|
+
"tags": [
|
|
520
|
+
{
|
|
521
|
+
"text": "false",
|
|
522
|
+
"name": "default"
|
|
523
|
+
}
|
|
524
|
+
],
|
|
525
|
+
"docs": "If true, active the native navigation within the webview, Android only",
|
|
526
|
+
"complexTypes": [],
|
|
527
|
+
"type": "boolean | undefined"
|
|
528
|
+
},
|
|
529
|
+
{
|
|
530
|
+
"name": "disableGoBackOnNativeApplication",
|
|
531
|
+
"tags": [
|
|
532
|
+
{
|
|
533
|
+
"text": "false",
|
|
534
|
+
"name": "default"
|
|
535
|
+
}
|
|
536
|
+
],
|
|
537
|
+
"docs": "Disable the possibility to go back on native application,\nusefull to force user to stay on the webview, Android only",
|
|
538
|
+
"complexTypes": [],
|
|
539
|
+
"type": "boolean | undefined"
|
|
540
|
+
},
|
|
517
541
|
{
|
|
518
542
|
"name": "isPresentAfterPageLoad",
|
|
519
543
|
"tags": [
|
|
@@ -101,6 +101,19 @@ export interface OpenWebViewOptions {
|
|
|
101
101
|
* @default BackgroundColor.BLACK
|
|
102
102
|
*/
|
|
103
103
|
backgroundColor?: BackgroundColor;
|
|
104
|
+
/**
|
|
105
|
+
* If true, active the native navigation within the webview, Android only
|
|
106
|
+
*
|
|
107
|
+
* @default false
|
|
108
|
+
*/
|
|
109
|
+
activeNativeNavigationForWebview?: boolean;
|
|
110
|
+
/**
|
|
111
|
+
* Disable the possibility to go back on native application,
|
|
112
|
+
* usefull to force user to stay on the webview, Android only
|
|
113
|
+
*
|
|
114
|
+
* @default false
|
|
115
|
+
*/
|
|
116
|
+
disableGoBackOnNativeApplication?: boolean;
|
|
104
117
|
/**
|
|
105
118
|
* Open url in a new window fullscreen
|
|
106
119
|
*
|
|
@@ -1 +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 GetCookieOptions {\n url: string;\n includeHttpOnly?: boolean;\n}\n\nexport interface ClearCookieOptions {\n url: string;\n cache?: boolean;\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 * Whether the website in the webview is inspectable or not, ios only\n *\n * @default false\n */\n isInspectable?: boolean;\n /**\n * Whether the webview opening is animated or not, ios only\n *\n * @default true\n */\n isAnimated?: 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 * visibleTitle: if true the website title would be shown else shown empty\n *\n * @since 1.2.5\n * @default true\n */\n visibleTitle?: boolean;\n /**\n * toolbarColor: color of the toolbar in hex format\n *\n * @since 1.2.5\n * @default '#ffffff''\n */\n toolbarColor?: string;\n /**\n * showArrow: if true an arrow would be shown instead of cross for closing the window\n *\n * @since 1.2.5\n * @default false\n */\n showArrow?: boolean;\n}\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 cookies of url\n *\n * @since 0.5.0\n */\n clearCookies(options: ClearCookieOptions): Promise<any>;\n\n /**\n * Get cookies for a specific URL.\n * @param options The options, including the URL to get cookies for.\n * @returns A promise that resolves with the cookies.\n */\n getCookies(options: GetCookieOptions): Promise<Record<string, string>>;\n\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 /**\n * Injects JavaScript code into the InAppBrowser window.\n */\n executeScript({ code }: { code: string }): Promise<void>;\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 /**\n * Reload the current web page.\n *\n * @since 1.0.0\n */\n reload(): Promise<any>; // Add this line\n}\n"]}
|
|
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 GetCookieOptions {\n url: string;\n includeHttpOnly?: boolean;\n}\n\nexport interface ClearCookieOptions {\n url: string;\n cache?: boolean;\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 * If true, active the native navigation within the webview, Android only\n *\n * @default false\n */\n activeNativeNavigationForWebview?: boolean;\n /**\n * Disable the possibility to go back on native application,\n * usefull to force user to stay on the webview, Android only\n *\n * @default false\n */\n disableGoBackOnNativeApplication?: boolean;\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 * Whether the website in the webview is inspectable or not, ios only\n *\n * @default false\n */\n isInspectable?: boolean;\n /**\n * Whether the webview opening is animated or not, ios only\n *\n * @default true\n */\n isAnimated?: 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 * visibleTitle: if true the website title would be shown else shown empty\n *\n * @since 1.2.5\n * @default true\n */\n visibleTitle?: boolean;\n /**\n * toolbarColor: color of the toolbar in hex format\n *\n * @since 1.2.5\n * @default '#ffffff''\n */\n toolbarColor?: string;\n /**\n * showArrow: if true an arrow would be shown instead of cross for closing the window\n *\n * @since 1.2.5\n * @default false\n */\n showArrow?: boolean;\n}\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 cookies of url\n *\n * @since 0.5.0\n */\n clearCookies(options: ClearCookieOptions): Promise<any>;\n\n /**\n * Get cookies for a specific URL.\n * @param options The options, including the URL to get cookies for.\n * @returns A promise that resolves with the cookies.\n */\n getCookies(options: GetCookieOptions): Promise<Record<string, string>>;\n\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 /**\n * Injects JavaScript code into the InAppBrowser window.\n */\n executeScript({ code }: { code: string }): Promise<void>;\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 /**\n * Reload the current web page.\n *\n * @since 1.0.0\n */\n reload(): Promise<any>; // Add this line\n}\n"]}
|
|
@@ -198,11 +198,17 @@ public class InAppBrowserPlugin: CAPPlugin {
|
|
|
198
198
|
}
|
|
199
199
|
|
|
200
200
|
@objc func setUrl(_ call: CAPPluginCall) {
|
|
201
|
-
guard let
|
|
201
|
+
guard let urlString = call.getString("url") else {
|
|
202
202
|
call.reject("Cannot get new url to set")
|
|
203
203
|
return
|
|
204
204
|
}
|
|
205
|
-
|
|
205
|
+
|
|
206
|
+
guard let url = URL(string: urlString) else {
|
|
207
|
+
call.reject("Invalid URL")
|
|
208
|
+
return
|
|
209
|
+
}
|
|
210
|
+
|
|
211
|
+
self.webViewController?.load(remote: url)
|
|
206
212
|
call.resolve()
|
|
207
213
|
}
|
|
208
214
|
|
|
@@ -216,8 +216,9 @@ open class WKWebViewController: UIViewController {
|
|
|
216
216
|
let webConfiguration = WKWebViewConfiguration()
|
|
217
217
|
let webView = WKWebView(frame: .zero, configuration: webConfiguration)
|
|
218
218
|
|
|
219
|
-
if
|
|
220
|
-
|
|
219
|
+
if webView.responds(to: Selector(("setInspectable:"))) {
|
|
220
|
+
// Fix: https://stackoverflow.com/questions/76216183/how-to-debug-wkwebview-in-ios-16-4-1-using-xcode-14-2/76603043#76603043
|
|
221
|
+
webView.perform(Selector(("setInspectable:")), with: isInspectable)
|
|
221
222
|
}
|
|
222
223
|
|
|
223
224
|
webView.uiDelegate = self
|
|
@@ -262,19 +263,19 @@ open class WKWebViewController: UIViewController {
|
|
|
262
263
|
var bottomPadding = CGFloat(0.0)
|
|
263
264
|
var topPadding = CGFloat(0.0)
|
|
264
265
|
if #available(iOS 11.0, *) {
|
|
265
|
-
let window = UIApplication.shared.
|
|
266
|
+
let window = UIApplication.shared.windows.first(where: { $0.isKeyWindow })
|
|
266
267
|
bottomPadding = window?.safeAreaInsets.bottom ?? 0.0
|
|
267
|
-
topPadding =
|
|
268
|
+
topPadding = window?.safeAreaInsets.top ?? 0.0
|
|
268
269
|
}
|
|
269
270
|
if UIDevice.current.orientation.isPortrait {
|
|
270
271
|
self.navigationController?.toolbar.isHidden = false
|
|
271
272
|
if self.viewHeightPortrait == nil {
|
|
272
273
|
self.viewHeightPortrait = self.view.safeAreaLayoutGuide.layoutFrame.size.height
|
|
273
274
|
if toolbarItemTypes.count == 0 {
|
|
274
|
-
self.viewHeightPortrait!
|
|
275
|
+
self.viewHeightPortrait! += bottomPadding
|
|
275
276
|
}
|
|
276
277
|
if self.navigationController?.navigationBar.isHidden == true {
|
|
277
|
-
self.viewHeightPortrait
|
|
278
|
+
self.viewHeightPortrait! += topPadding
|
|
278
279
|
}
|
|
279
280
|
}
|
|
280
281
|
self.currentViewHeight = self.viewHeightPortrait
|
|
@@ -283,10 +284,10 @@ open class WKWebViewController: UIViewController {
|
|
|
283
284
|
if self.viewHeightLandscape == nil {
|
|
284
285
|
self.viewHeightLandscape = self.view.safeAreaLayoutGuide.layoutFrame.size.height
|
|
285
286
|
if toolbarItemTypes.count == 0 {
|
|
286
|
-
self.viewHeightLandscape!
|
|
287
|
+
self.viewHeightLandscape! += bottomPadding
|
|
287
288
|
}
|
|
288
289
|
if self.navigationController?.navigationBar.isHidden == true {
|
|
289
|
-
self.viewHeightLandscape
|
|
290
|
+
self.viewHeightLandscape! += topPadding
|
|
290
291
|
}
|
|
291
292
|
}
|
|
292
293
|
self.currentViewHeight = self.viewHeightLandscape
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@capgo/inappbrowser",
|
|
3
|
-
"version": "1.3.
|
|
3
|
+
"version": "1.3.15",
|
|
4
4
|
"description": "Capacitor plugin in app browser",
|
|
5
5
|
"main": "dist/plugin.cjs.js",
|
|
6
6
|
"module": "dist/esm/index.js",
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
],
|
|
31
31
|
"scripts": {
|
|
32
32
|
"verify": "npm run verify:ios && npm run verify:android && npm run verify:web",
|
|
33
|
-
"verify:ios": "cd ios && pod install && xcodebuild -workspace Plugin.xcworkspace -scheme Plugin && cd ..",
|
|
33
|
+
"verify:ios": "cd ios && pod install && xcodebuild -workspace Plugin.xcworkspace -sdk iphoneos -scheme Plugin && cd ..",
|
|
34
34
|
"verify:android": "cd android && ./gradlew clean build test && cd ..",
|
|
35
35
|
"verify:web": "npm run build",
|
|
36
36
|
"lint": "npm run eslint && npm run prettier -- --check && npm run swiftlint -- lint",
|