@capgo/capacitor-inappbrowser 8.10.3-beta.pr621.476.1 → 8.10.3

package/ios/Sources/InAppBrowserPlugin/InAppBrowserPlugin.swift

@@ -2,7 +2,6 @@ import Foundation
 import Capacitor
 import WebKit
 import AuthenticationServices
-import SafariServices
 
 enum ActiveWebViewSupport {
     static func shouldActivateNewWebView(isHidden: Bool, hasActiveWebView: Bool) -> Bool {
@@ -256,8 +255,6 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
     private var closeModalDescription: String?
     private var closeModalOk: String?
     private var closeModalCancel: String?
-    private var safariViewController: SFSafariViewController?
-    private var safariOpenedUrl: String?
     private var openSecureWindowCall: CAPPluginCall?
 
     private func setup() {
@@ -2186,6 +2183,12 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
             self.setup()
         }
 
+        let isInspectable = call.getBool("isInspectable", false)
+        let preventDeeplink = call.getBool("preventDeeplink", false)
+        self.isPresentAfterPageLoad = call.getBool("isPresentAfterPageLoad", false)
+
+        self.currentPluginCall = call
+
         guard let urlString = call.getString("url") else {
             call.reject("Must provide a URL to open")
             return
@@ -2196,42 +2199,70 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
             return
         }
 
-        guard let url = URL(string: urlString),
-              let scheme = url.scheme?.lowercased(),
-              ["http", "https"].contains(scheme) else {
-            call.reject("Must provide a valid http(s) URL to open")
-            return
-        }
+        let headers = call.getObject("headers", [:]).mapValues { String(describing: $0 as Any) }
+        let credentials = self.readCredentials(call)
 
         DispatchQueue.main.async {
-            if self.safariViewController != nil {
-                call.reject("Browser is already open")
+            guard let webSource = self.webSource(for: urlString) else {
+                call.reject("Invalid URL format")
                 return
             }
 
-            let safariVC = SFSafariViewController(url: url)
-            safariVC.delegate = self
-            safariVC.modalPresentationStyle = .fullScreen
+            let initialUrl = webSource.remoteURL ?? URL(string: "about:blank")!
 
-            self.safariViewController = safariVC
-            self.safariOpenedUrl = url.absoluteString
+            self.webViewController = WKWebViewController.init(url: initialUrl, headers: headers, isInspectable: isInspectable, credentials: credentials, preventDeeplink: preventDeeplink, blankNavigationTab: true, enabledSafeBottomMargin: false, enabledSafeTopMargin: true)
 
-            guard let rootPresenter = self.bridge?.viewController else {
-                self.safariViewController = nil
-                self.safariOpenedUrl = nil
-                call.reject("Unable to present Safari View Controller")
+            guard let webViewController = self.webViewController else {
+                call.reject("Failed to initialize WebViewController")
                 return
             }
-            let top = BlankTargetNavigationSupport.topPresenter(from: rootPresenter)
-            guard top.presentedViewController == nil else {
-                self.safariViewController = nil
-                self.safariOpenedUrl = nil
-                call.reject("Unable to present Safari View Controller: another view is already presented")
-                return
+
+            if self.bridge?.statusBarVisible == true {
+                let subviews = self.bridge?.webView?.superview?.subviews
+                if let emptyStatusBarIndex = subviews?.firstIndex(where: { $0.subviews.isEmpty }) {
+                    if let emptyStatusBar = subviews?[emptyStatusBarIndex] {
+                        webViewController.capacitorStatusBar = emptyStatusBar
+                        emptyStatusBar.removeFromSuperview()
+                    }
+                }
             }
-            top.present(safariVC, animated: true) {
-                call.resolve()
+
+            webViewController.source = webSource
+            webViewController.leftNavigationBarItemTypes = [.back, .forward, .reload]
+            webViewController.capBrowserPlugin = self
+            webViewController.hasDynamicTitle = true
+
+            self.navigationWebViewController = UINavigationController.init(rootViewController: webViewController)
+            self.navigationWebViewController?.navigationBar.isTranslucent = false
+
+            // Ensure no lines or borders appear by default
+            self.navigationWebViewController?.navigationBar.setBackgroundImage(UIImage(), for: .default)
+            self.navigationWebViewController?.navigationBar.shadowImage = UIImage()
+            self.navigationWebViewController?.navigationBar.setValue(true, forKey: "hidesShadow")
+
+            // Use system appearance
+            let isDarkMode = UITraitCollection.current.userInterfaceStyle == .dark
+            let backgroundColor = isDarkMode ? UIColor.black : UIColor.white
+            let textColor = isDarkMode ? UIColor.white : UIColor.black
+
+            // Apply colors
+            webViewController.setupStatusBarBackground(color: backgroundColor)
+            webViewController.tintColor = textColor
+            self.navigationWebViewController?.navigationBar.tintColor = textColor
+            self.navigationWebViewController?.navigationBar.titleTextAttributes = [NSAttributedString.Key.foregroundColor: textColor]
+            webViewController.statusBarStyle = isDarkMode ? .lightContent : .darkContent
+            webViewController.updateStatusBarStyle()
+
+            // Always hide toolbar to ensure no bottom bar
+            self.navigationWebViewController?.setToolbarHidden(true, animated: false)
+
+            self.navigationWebViewController?.modalPresentationStyle = .overCurrentContext
+            self.navigationWebViewController?.modalTransitionStyle = .crossDissolve
+
+            if !self.isPresentAfterPageLoad {
+                self.presentView()
             }
+            call.resolve()
         }
     }
 
@@ -2328,17 +2359,6 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         let isAnimated = call.getBool("isAnimated", true)
 
         DispatchQueue.main.async {
-            if call.getString("id") == nil, let safariViewController = self.safariViewController {
-                let url = self.safariOpenedUrl ?? ""
-                self.safariViewController = nil
-                self.safariOpenedUrl = nil
-                safariViewController.dismiss(animated: isAnimated) {
-                    self.notifyListeners("closeEvent", data: ["url": url])
-                    call.resolve()
-                }
-                return
-            }
-
             let targetId = call.getString("id") ?? self.activeWebViewId
             if let targetId,
                let webViewController = self.webViewControllers[targetId],
@@ -2382,7 +2402,6 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         }
     }
 
-
     private func showPrivacyScreen() {
         if privacyScreen == nil {
             let newPrivacyScreen = UIImageView()
@@ -2564,23 +2583,3 @@ extension CapgoInAppBrowserPlugin: ASWebAuthenticationPresentationContextProvidi
         return self.bridge?.viewController?.view.window ?? ASPresentationAnchor()
     }
 }
-
-extension CapgoInAppBrowserPlugin: SFSafariViewControllerDelegate {
-    public func safariViewControllerDidFinish(_ controller: SFSafariViewController) {
-        guard safariViewController != nil else {
-            return
-        }
-        let url = safariOpenedUrl ?? ""
-        safariViewController = nil
-        safariOpenedUrl = nil
-        notifyListeners("closeEvent", data: ["url": url])
-    }
-
-    public func safariViewController(_ controller: SFSafariViewController, didCompleteInitialLoad didLoadSuccessfully: Bool) {
-        if didLoadSuccessfully {
-            notifyListeners("browserPageLoaded", data: [:])
-        } else {
-            notifyListeners("pageLoadError", data: [:])
-        }
-    }
-}

package/ios/Sources/InAppBrowserPlugin/WKWebViewController.swift

@@ -47,35 +47,6 @@ private enum BlobDownloadSupport {
     static let chunkBytes = 64 * 1024
 }
 
-/// Script message handlers registered on every in-app browser WKWebView.
-/// Popup configs from `createWebViewWith` copy parent handlers, so we must
-/// remove these names before re-adding or WKWebView raises NSInvalidArgumentException.
-enum ScriptMessageHandlerSupport {
-    static let allNames = [
-        "messageHandler",
-        "preShowScriptError",
-        "preShowScriptSuccess",
-        "close",
-        "hide",
-        "show",
-        "blobDownload",
-        "blobDownloadStart",
-        "blobDownloadChunk",
-        "blobDownloadFinish",
-        "blobDownloadAbort",
-        "takeScreenshot",
-        "consoleMessageHandler",
-        "magicPrint",
-        "capgoProxyBridge"
-    ]
-
-    static func removeAll(from userContentController: WKUserContentController) {
-        for name in allNames {
-            userContentController.removeScriptMessageHandler(forName: name)
-        }
-    }
-}
-
 private struct BlobDownloadSession {
     let destinationURL: URL
     let sourceURL: String?
@@ -2037,7 +2008,16 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
         }
         let userContentController = webConfiguration.userContentController
         userContentController.removeAllUserScripts()
-        ScriptMessageHandlerSupport.removeAll(from: userContentController)
+        userContentController.removeScriptMessageHandler(forName: "messageHandler")
+        userContentController.removeScriptMessageHandler(forName: "preShowScriptError")
+        userContentController.removeScriptMessageHandler(forName: "preShowScriptSuccess")
+        userContentController.removeScriptMessageHandler(forName: "close")
+        userContentController.removeScriptMessageHandler(forName: "hide")
+        userContentController.removeScriptMessageHandler(forName: "show")
+        userContentController.removeScriptMessageHandler(forName: "takeScreenshot")
+        userContentController.removeScriptMessageHandler(forName: "consoleMessageHandler")
+        userContentController.removeScriptMessageHandler(forName: "magicPrint")
+        userContentController.removeScriptMessageHandler(forName: "capgoProxyBridge")
 
         if proxyRequests || proxySchemeHandler != nil, let handler = proxySchemeHandler {
             WKWebView.enableCustomSchemeHandling(for: ["https", "http"])
@@ -2284,9 +2264,7 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
         self.enabledSafeTopMargin = parent.enabledSafeTopMargin
         self.blockedHosts = parent.blockedHosts
         self.authorizedAppLinks = parent.authorizedAppLinks
-        // createWebViewWith configs copy parent script handlers; start clean so
-        // initWebview can register blobDownload/etc without NSInvalidArgumentException.
-        configuration.userContentController = WKUserContentController()
+        self.activeNativeNavigationForWebview = parent.activeNativeNavigationForWebview
         self.initialWebConfiguration = configuration
         self.persistWebViewData = parent.persistWebViewData
         self.disableOverscroll = parent.disableOverscroll
@@ -2570,7 +2548,20 @@ public extension WKWebViewController {
         webView.loadHTMLString("", baseURL: nil)
 
         webView.configuration.userContentController.removeAllUserScripts()
-        ScriptMessageHandlerSupport.removeAll(from: webView.configuration.userContentController)
+        webView.configuration.userContentController.removeScriptMessageHandler(forName: "messageHandler")
+        webView.configuration.userContentController.removeScriptMessageHandler(forName: "close")
+        webView.configuration.userContentController.removeScriptMessageHandler(forName: "hide")
+        webView.configuration.userContentController.removeScriptMessageHandler(forName: "show")
+        if allowScreenshotsFromWebPage {
+            webView.configuration.userContentController.removeScriptMessageHandler(forName: "takeScreenshot")
+        }
+        if captureConsoleLogs {
+            webView.configuration.userContentController.removeScriptMessageHandler(forName: "consoleMessageHandler")
+        }
+        webView.configuration.userContentController.removeScriptMessageHandler(forName: "preShowScriptSuccess")
+        webView.configuration.userContentController.removeScriptMessageHandler(forName: "preShowScriptError")
+        webView.configuration.userContentController.removeScriptMessageHandler(forName: "magicPrint")
+        webView.configuration.userContentController.removeScriptMessageHandler(forName: "capgoProxyBridge")
 
         webView.removeFromSuperview()
         // Also clean progress bar view if present

package/package.json

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