@capgo/inappbrowser 0.0.4 → 0.0.5

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.
@@ -12,6 +12,7 @@ public class InAppBrowserPlugin: CAPPlugin {
12
12
  private var isSetupDone = false
13
13
  var currentPluginCall: CAPPluginCall?
14
14
  var isPresentAfterPageLoad = false
15
+ var webViewController: WKWebViewController?
15
16
 
16
17
  private func setup(){
17
18
  self.isSetupDone = true
@@ -59,25 +60,24 @@ public class InAppBrowserPlugin: CAPPlugin {
59
60
 
60
61
  DispatchQueue.main.async {
61
62
  let url = URL(string: urlString)
62
- let webViewController: WKWebViewController?
63
63
 
64
64
  if self.isPresentAfterPageLoad {
65
- webViewController = WKWebViewController.init(url: url!, headers: headers)
65
+ self.webViewController = WKWebViewController.init(url: url!, headers: headers)
66
66
  } else {
67
- webViewController = WKWebViewController.init()
68
- webViewController?.setHeaders(headers: headers)
67
+ self.webViewController = WKWebViewController.init()
68
+ self.webViewController?.setHeaders(headers: headers)
69
69
  }
70
70
 
71
- webViewController?.source = .remote(url!)
72
- webViewController?.leftNavigaionBarItemTypes = self.getToolbarItems(toolbarType: toolbarType ?? "")
71
+ self.webViewController?.source = .remote(url!)
72
+ self.webViewController?.leftNavigaionBarItemTypes = self.getToolbarItems(toolbarType: toolbarType ?? "")
73
73
 
74
- webViewController?.toolbarItemTypes = []
75
- webViewController?.doneBarButtonItemPosition = .right
76
- webViewController?.capBrowserPlugin = self
77
- webViewController?.title = call.getString("title") ?? ""
78
- webViewController?.shareSubject = call.getString("shareSubject")
79
- webViewController?.shareDisclaimer = disclaimerContent
80
- self.navigationWebViewController = UINavigationController.init(rootViewController: webViewController!)
74
+ self.webViewController?.toolbarItemTypes = []
75
+ self.webViewController?.doneBarButtonItemPosition = .right
76
+ self.webViewController?.capBrowserPlugin = self
77
+ self.webViewController?.title = call.getString("title") ?? ""
78
+ self.webViewController?.shareSubject = call.getString("shareSubject")
79
+ self.webViewController?.shareDisclaimer = disclaimerContent
80
+ self.navigationWebViewController = UINavigationController.init(rootViewController: self.webViewController!)
81
81
  self.navigationWebViewController?.navigationBar.isTranslucent = false
82
82
  self.navigationWebViewController?.toolbar.isTranslucent = false
83
83
  self.navigationWebViewController?.navigationBar.backgroundColor = .white
@@ -104,6 +104,11 @@ public class InAppBrowserPlugin: CAPPlugin {
104
104
  }
105
105
 
106
106
  @objc func setUrl(_ call: CAPPluginCall) {
107
+ guard let url = call.getString("url") else {
108
+ call.reject("Cannot get new url to set")
109
+ return
110
+ }
111
+ self.webViewController?.load(remote: URL(string: url)!)
107
112
  call.resolve()
108
113
  }
109
114
 
@@ -130,21 +135,20 @@ public class InAppBrowserPlugin: CAPPlugin {
130
135
 
131
136
  DispatchQueue.main.async {
132
137
  let url = URL(string: urlString)
133
- let webViewController: WKWebViewController?
134
138
 
135
139
  if self.isPresentAfterPageLoad {
136
- webViewController = WKWebViewController.init(url: url!, headers: headers)
140
+ self.webViewController = WKWebViewController.init(url: url!, headers: headers)
137
141
  } else {
138
- webViewController = WKWebViewController.init()
139
- webViewController?.setHeaders(headers: headers)
142
+ self.webViewController = WKWebViewController.init()
143
+ self.webViewController?.setHeaders(headers: headers)
140
144
  }
141
145
 
142
- webViewController?.source = .remote(url!)
143
- webViewController?.leftNavigaionBarItemTypes = [.reload]
144
- webViewController?.toolbarItemTypes = [.back, .forward, .activity]
145
- webViewController?.capBrowserPlugin = self
146
- webViewController?.hasDynamicTitle = true
147
- self.navigationWebViewController = UINavigationController.init(rootViewController: webViewController!)
146
+ self.webViewController?.source = .remote(url!)
147
+ self.webViewController?.leftNavigaionBarItemTypes = [.reload]
148
+ self.webViewController?.toolbarItemTypes = [.back, .forward, .activity]
149
+ self.webViewController?.capBrowserPlugin = self
150
+ self.webViewController?.hasDynamicTitle = true
151
+ self.navigationWebViewController = UINavigationController.init(rootViewController: self.webViewController!)
148
152
  self.navigationWebViewController?.navigationBar.isTranslucent = false
149
153
  self.navigationWebViewController?.toolbar.isTranslucent = false
150
154
  self.navigationWebViewController?.navigationBar.backgroundColor = .white
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@capgo/inappbrowser",
3
- "version": "0.0.4",
3
+ "version": "0.0.5",
4
4
  "description": "Capacitor plugin in app browser",
5
5
  "main": "dist/plugin.cjs.js",
6
6
  "module": "dist/esm/index.js",