@capawesome/capacitor-in-app-browser 0.0.1 → 0.0.2

package/ios/Plugin/Classes/WebViewController.swift

@@ -5,8 +5,9 @@ import WebKit
 @objc public class WebViewController: UIViewController, WKNavigationDelegate, WKScriptMessageHandler, WKUIDelegate {
     var onClosed: ((WebViewController) -> Void)?
     var onMessageReceived: ((String) -> Void)?
+    var onNavigationCompleted: ((String) -> Void)?
     var onPageLoaded: (() -> Void)?
-    var onPageNavigationCompleted: ((String) -> Void)?
+    var onUrlChanged: ((String) -> Void)?
 
     private static let bridgeJavaScript =
         "window.CapacitorInAppBrowser = window.CapacitorInAppBrowser || { postMessage: function (data) "
@@ -20,6 +21,7 @@ import WebKit
     private var canGoForwardObservation: NSKeyValueObservation?
     private var forwardButtonItem: UIBarButtonItem?
     private var initialLoadNotified = false
+    private var lastNotifiedUrl: String?
     private var titleObservation: NSKeyValueObservation?
     private var urlObservation: NSKeyValueObservation?
     private var webView: WKWebView?
@@ -43,6 +45,11 @@ import WebKit
         }
     }
 
+    public func handleCloseWithoutPresentation() {
+        cleanup()
+        onClosed?(self)
+    }
+
     public func postMessage(_ data: String) {
         webView?.evaluateJavaScript(
             "window.dispatchEvent(new CustomEvent('capacitorInAppBrowserMessage', { detail: \(data) }));",
@@ -95,7 +102,7 @@ import WebKit
             onPageLoaded?()
         }
         if let url = webView.url?.absoluteString {
-            onPageNavigationCompleted?(url)
+            onNavigationCompleted?(url)
         }
     }
 
@@ -178,6 +185,7 @@ import WebKit
             self?.updateTitle()
         }
         urlObservation = webView.observe(\.url, options: [.new]) { [weak self] _, _ in
+            self?.handleUrlChanged()
             self?.updateTitle()
         }
         return webView
@@ -199,6 +207,14 @@ import WebKit
         }
     }
 
+    private func handleUrlChanged() {
+        guard let url = webView?.url?.absoluteString, url != lastNotifiedUrl else {
+            return
+        }
+        lastNotifiedUrl = url
+        onUrlChanged?(url)
+    }
+
     private func loadUrl() {
         var request = URLRequest(url: options.url)
         for (key, value) in options.headers {

package/ios/Plugin/InAppBrowser.swift

@@ -9,6 +9,7 @@ import WebKit
 
     private var safariViewController: SFSafariViewController?
     private var webViewController: WebViewController?
+    private var webViewNavigationController: UINavigationController?
 
     init(plugin: InAppBrowserPlugin) {
         self.plugin = plugin
@@ -35,6 +36,11 @@ import WebKit
     @objc public func close(completion: @escaping (_ error: Error?) -> Void) {
         DispatchQueue.main.async {
             if let webViewController = self.webViewController {
+                if self.webViewNavigationController?.presentingViewController == nil {
+                    webViewController.handleCloseWithoutPresentation()
+                    completion(nil)
+                    return
+                }
                 webViewController.dismiss(animated: true) {
                     completion(nil)
                 }
@@ -122,23 +128,33 @@ import WebKit
                     }
                     if self.webViewController === viewController {
                         self.webViewController = nil
+                        self.webViewNavigationController = nil
                     }
                     self.plugin.notifyBrowserClosedListeners()
                 }
                 webViewController.onMessageReceived = { [weak self] data in
                     self?.handleMessageReceived(data)
                 }
+                webViewController.onNavigationCompleted = { [weak self] url in
+                    self?.plugin.notifyBrowserNavigationCompletedListeners(BrowserNavigationCompletedEvent(url: url))
+                }
                 webViewController.onPageLoaded = { [weak self] in
                     self?.plugin.notifyBrowserPageLoadedListeners()
                 }
-                webViewController.onPageNavigationCompleted = { [weak self] url in
-                    self?.plugin.notifyBrowserPageNavigationCompletedListeners(BrowserPageNavigationCompletedEvent(url: url))
+                webViewController.onUrlChanged = { [weak self] url in
+                    self?.plugin.notifyBrowserUrlChangedListeners(BrowserUrlChangedEvent(url: url))
                 }
                 let navigationController = UINavigationController(rootViewController: webViewController)
                 navigationController.modalPresentationStyle = .fullScreen
                 navigationController.setNavigationBarHidden(!options.toolbar.visible, animated: false)
                 self.webViewController = webViewController
-                bridgeViewController.present(navigationController, animated: true) {
+                self.webViewNavigationController = navigationController
+                if options.visible {
+                    bridgeViewController.present(navigationController, animated: true) {
+                        completion(nil)
+                    }
+                } else {
+                    webViewController.loadViewIfNeeded()
                     completion(nil)
                 }
             }
@@ -168,8 +184,33 @@ import WebKit
         plugin.notifyBrowserClosedListeners()
     }
 
+    @objc public func show(completion: @escaping (_ error: Error?) -> Void) {
+        DispatchQueue.main.async {
+            guard let navigationController = self.webViewNavigationController else {
+                completion(CustomError.noBrowserOpen)
+                return
+            }
+            if navigationController.presentingViewController != nil {
+                completion(nil)
+                return
+            }
+            guard let bridgeViewController = self.plugin.bridge?.viewController else {
+                completion(CustomError.noBrowserOpen)
+                return
+            }
+            bridgeViewController.present(navigationController, animated: true) {
+                completion(nil)
+            }
+        }
+    }
+
     private func dismissActiveBrowser(_ completion: @escaping () -> Void) {
         if let webViewController = self.webViewController {
+            if self.webViewNavigationController?.presentingViewController == nil {
+                webViewController.handleCloseWithoutPresentation()
+                completion()
+                return
+            }
             webViewController.dismiss(animated: false) {
                 completion()
             }
@@ -189,6 +230,6 @@ import WebKit
         if let jsonData = data.data(using: .utf8), let parsedValue = try? JSONSerialization.jsonObject(with: jsonData, options: [.fragmentsAllowed]) {
             value = parsedValue
         }
-        plugin.notifyMessageReceivedListeners(MessageReceivedEvent(data: value))
+        plugin.notifyBrowserMessageReceivedListeners(BrowserMessageReceivedEvent(data: value))
     }
 }

package/ios/Plugin/InAppBrowserPlugin.swift

@@ -14,13 +14,15 @@ public class InAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         CAPPluginMethod(name: "openInExternalBrowser", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "openInSystemBrowser", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "openInWebView", returnType: CAPPluginReturnPromise),
-        CAPPluginMethod(name: "postMessage", returnType: CAPPluginReturnPromise)
+        CAPPluginMethod(name: "postMessage", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "show", returnType: CAPPluginReturnPromise)
     ]
 
     public static let eventBrowserClosed = "browserClosed"
+    public static let eventBrowserMessageReceived = "browserMessageReceived"
+    public static let eventBrowserNavigationCompleted = "browserNavigationCompleted"
     public static let eventBrowserPageLoaded = "browserPageLoaded"
-    public static let eventBrowserPageNavigationCompleted = "browserPageNavigationCompleted"
-    public static let eventMessageReceived = "messageReceived"
+    public static let eventBrowserUrlChanged = "browserUrlChanged"
     public static let tag = "InAppBrowserPlugin"
 
     private var implementation: InAppBrowser?
@@ -95,16 +97,20 @@ public class InAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         self.notifyListeners(Self.eventBrowserClosed, data: [:])
     }
 
-    @objc public func notifyBrowserPageLoadedListeners() {
-        self.notifyListeners(Self.eventBrowserPageLoaded, data: [:])
+    @objc public func notifyBrowserMessageReceivedListeners(_ event: BrowserMessageReceivedEvent) {
+        self.notifyListeners(Self.eventBrowserMessageReceived, data: event.toJSObject() as? [String: Any])
     }
 
-    @objc public func notifyBrowserPageNavigationCompletedListeners(_ event: BrowserPageNavigationCompletedEvent) {
-        self.notifyListeners(Self.eventBrowserPageNavigationCompleted, data: event.toJSObject() as? [String: Any])
+    @objc public func notifyBrowserNavigationCompletedListeners(_ event: BrowserNavigationCompletedEvent) {
+        self.notifyListeners(Self.eventBrowserNavigationCompleted, data: event.toJSObject() as? [String: Any])
     }
 
-    @objc public func notifyMessageReceivedListeners(_ event: MessageReceivedEvent) {
-        self.notifyListeners(Self.eventMessageReceived, data: event.toJSObject() as? [String: Any])
+    @objc public func notifyBrowserPageLoadedListeners() {
+        self.notifyListeners(Self.eventBrowserPageLoaded, data: [:])
+    }
+
+    @objc public func notifyBrowserUrlChangedListeners(_ event: BrowserUrlChangedEvent) {
+        self.notifyListeners(Self.eventBrowserUrlChanged, data: event.toJSObject() as? [String: Any])
     }
 
     @objc func openInExternalBrowser(_ call: CAPPluginCall) {
@@ -171,6 +177,16 @@ public class InAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         }
     }
 
+    @objc func show(_ call: CAPPluginCall) {
+        implementation?.show(completion: { error in
+            if let error = error {
+                self.rejectCall(call, error)
+                return
+            }
+            self.resolveCall(call)
+        })
+    }
+
     private func rejectCall(_ call: CAPPluginCall, _ error: Error) {
         CAPLog.print("[", InAppBrowserPlugin.tag, "] ", error)
         let code = (error as? CustomError)?.code

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capawesome/capacitor-in-app-browser",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Capacitor plugin to open URLs in the external browser, the system browser or an embedded web view.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -33,7 +33,7 @@
       "url": "https://opencollective.com/capawesome"
     }
   ],
-  "homepage": "https://capawesome.io/docs/plugins/in-app-browser/",
+  "homepage": "https://capawesome.io/docs/sdks/capacitor/in-app-browser/",
   "keywords": [
     "capacitor",
     "plugin",