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

package/ios/Sources/InAppBrowserPlugin/InAppBrowserPlugin.swift

@@ -2,6 +2,7 @@ import Foundation
 import Capacitor
 import WebKit
 import AuthenticationServices
+import SafariServices
 
 enum ActiveWebViewSupport {
     static func shouldActivateNewWebView(isHidden: Bool, hasActiveWebView: Bool) -> Bool {
@@ -115,6 +116,42 @@ enum ProxyResponseRoutingSupport {
     }
 }
 
+
+enum StatusBarBackgroundLayoutSupport {
+    enum Placement: Equatable {
+        case skip
+        case host(pinToNavigationBar: Bool)
+    }
+
+    /// Decide where/how to pin the status-bar chrome without painting a PassThroughView gap.
+    static func placement(
+        isPassThroughOverlay: Bool,
+        blankNavigationTab: Bool,
+        navigationBarInHostHierarchy: Bool
+    ) -> Placement {
+        if isPassThroughOverlay && blankNavigationTab {
+            // Custom-frame blank overlays must stay transparent in the y-offset gap.
+            return .skip
+        }
+
+        if blankNavigationTab || !navigationBarInHostHierarchy {
+            return .host(pinToNavigationBar: false)
+        }
+
+        return .host(pinToNavigationBar: true)
+    }
+
+    static func hostView(
+        navigationControllerView: UIView,
+        framedContentView: UIView?
+    ) -> UIView? {
+        if let passThrough = navigationControllerView as? PassThroughView {
+            return framedContentView ?? passThrough.framedContentView
+        }
+        return navigationControllerView
+    }
+}
+
 enum CustomWebViewFrameSupport {
     static func resolvedFrame(
         width: CGFloat?,
@@ -162,7 +199,7 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         case aware = "AWARE"
         case fakeVisible = "FAKE_VISIBLE"
     }
-    private let pluginVersion: String = "8.10.2"
+    private let pluginVersion: String = "8.10.3"
     public let identifier = "CapgoInAppBrowserPlugin"
     public let jsName = "CapgoInAppBrowser"
     public let pluginMethods: [CAPPluginMethod] = [
@@ -219,6 +256,8 @@ 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() {
@@ -1583,14 +1622,10 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
                     // Apply status bar background color via the special view
                     webViewController.setupStatusBarBackground(color: color)
 
-                    // Apply background color to whole view to ensure no gaps
+                    // Color the webview controller only — never paint PassThroughView or the
+                    // y-offset gap would hide the host Capacitor app.
                     webViewController.view.backgroundColor = color
-                    self.navigationWebViewController?.view.backgroundColor = color
-
-                    // Apply status bar background color
-                    if let navController = self.navigationWebViewController {
-                        navController.view.backgroundColor = color
-                    }
+                    self.applyBlankToolbarBackground(color, to: self.navigationWebViewController)
                 } else {
                     // Follow system appearance if no specific color
                     let isDarkMode = UITraitCollection.current.userInterfaceStyle == .dark
@@ -1601,10 +1636,7 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
                     // Apply status bar background color via the special view
                     webViewController.setupStatusBarBackground(color: backgroundColor)
 
-                    // Set appropriate background color
-                    if let navController = self.navigationWebViewController {
-                        navController.view.backgroundColor = backgroundColor
-                    }
+                    self.applyBlankToolbarBackground(backgroundColor, to: self.navigationWebViewController)
                 }
 
             }
@@ -2052,6 +2084,20 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         }
     }
 
+
+    /// Keep PassThroughView clear so custom y-offsets show the host app behind the gap.
+    private func applyBlankToolbarBackground(_ color: UIColor, to navigationController: UINavigationController?) {
+        guard let navigationController else { return }
+
+        if let passThrough = navigationController.view as? PassThroughView {
+            passThrough.backgroundColor = .clear
+            passThrough.framedContentView?.backgroundColor = color
+            return
+        }
+
+        navigationController.view.backgroundColor = color
+    }
+
     private func normalizedAuthorizedHosts(from links: [String]) -> [String] {
         links.compactMap { link in
             guard let host = URLComponents(string: link)?.host?.lowercased() else {
@@ -2140,12 +2186,6 @@ 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
@@ -2156,70 +2196,42 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
             return
         }
 
-        let headers = call.getObject("headers", [:]).mapValues { String(describing: $0 as Any) }
-        let credentials = self.readCredentials(call)
+        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
+        }
 
         DispatchQueue.main.async {
-            guard let webSource = self.webSource(for: urlString) else {
-                call.reject("Invalid URL format")
+            if self.safariViewController != nil {
+                call.reject("Browser is already open")
                 return
             }
 
-            let initialUrl = webSource.remoteURL ?? URL(string: "about:blank")!
+            let safariVC = SFSafariViewController(url: url)
+            safariVC.delegate = self
+            safariVC.modalPresentationStyle = .fullScreen
 
-            self.webViewController = WKWebViewController.init(url: initialUrl, headers: headers, isInspectable: isInspectable, credentials: credentials, preventDeeplink: preventDeeplink, blankNavigationTab: true, enabledSafeBottomMargin: false, enabledSafeTopMargin: true)
+            self.safariViewController = safariVC
+            self.safariOpenedUrl = url.absoluteString
 
-            guard let webViewController = self.webViewController else {
-                call.reject("Failed to initialize WebViewController")
+            guard let rootPresenter = self.bridge?.viewController else {
+                self.safariViewController = nil
+                self.safariOpenedUrl = nil
+                call.reject("Unable to present Safari View Controller")
                 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()
-                    }
-                }
+            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
             }
-
-            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()
+            top.present(safariVC, animated: true) {
+                call.resolve()
             }
-            call.resolve()
         }
     }
 
@@ -2316,6 +2328,17 @@ 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],
@@ -2359,6 +2382,7 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         }
     }
 
+
     private func showPrivacyScreen() {
         if privacyScreen == nil {
             let newPrivacyScreen = UIImageView()
@@ -2540,3 +2564,23 @@ 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,6 +47,35 @@ 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?
@@ -1101,7 +1130,7 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
     open var statusBarStyle: UIStatusBarStyle = .default
 
     // Status bar background view
-    private var statusBarBackgroundView: UIView?
+    var statusBarBackgroundView: UIView?
 
     // Status bar height
     private var statusBarHeight: CGFloat {
@@ -1151,25 +1180,60 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
     // Make status bar background with colored view underneath
     open func setupStatusBarBackground(color: UIColor) {
         statusBarBackgroundView?.removeFromSuperview()
-        statusBarBackgroundView = UIView()
+        statusBarBackgroundView = nil
 
-        guard let navController = navigationController,
-              let navView = navController.view,
-              let statusBarBackgroundView else {
+        guard let navController = navigationController else {
             return
         }
-        navView.insertSubview(statusBarBackgroundView, at: 0)
-        statusBarBackgroundView.translatesAutoresizingMaskIntoConstraints = false
-        statusBarBackgroundView.backgroundColor = color
 
-        NSLayoutConstraint.activate([
-            statusBarBackgroundView.topAnchor.constraint(equalTo: navView.topAnchor),
-            statusBarBackgroundView.leadingAnchor.constraint(equalTo: navView.leadingAnchor),
-            statusBarBackgroundView.trailingAnchor.constraint(equalTo: navView.trailingAnchor),
-            statusBarBackgroundView.bottomAnchor.constraint(equalTo: navController.navigationBar.bottomAnchor, constant: 1)
-        ])
+        if let passThrough = navController.view as? PassThroughView {
+            // Never paint the full-screen overlay — that fills the custom y-offset gap.
+            passThrough.backgroundColor = .clear
+        }
+
+        let navigationBar = navController.navigationBar
+        let hostCandidate = StatusBarBackgroundLayoutSupport.hostView(
+            navigationControllerView: navController.view,
+            framedContentView: (navController.view as? PassThroughView)?.framedContentView
+        )
+        let navigationBarInHost = hostCandidate.map { navigationBar.isDescendant(of: $0) } ?? false
+        let placement = StatusBarBackgroundLayoutSupport.placement(
+            isPassThroughOverlay: navController.view is PassThroughView,
+            blankNavigationTab: blankNavigationTab,
+            navigationBarInHostHierarchy: navigationBarInHost
+        )
+
+        guard case .host(let pinToNavigationBar) = placement,
+              let hostView = hostCandidate else {
+            return
+        }
 
-        applyNavigationBarBackground(color: color)
+        let backgroundView = UIView()
+        statusBarBackgroundView = backgroundView
+        hostView.insertSubview(backgroundView, at: 0)
+        backgroundView.translatesAutoresizingMaskIntoConstraints = false
+        backgroundView.backgroundColor = color
+
+        var constraints = [
+            backgroundView.topAnchor.constraint(equalTo: hostView.topAnchor),
+            backgroundView.leadingAnchor.constraint(equalTo: hostView.leadingAnchor),
+            backgroundView.trailingAnchor.constraint(equalTo: hostView.trailingAnchor)
+        ]
+
+        if pinToNavigationBar {
+            constraints.append(
+                backgroundView.bottomAnchor.constraint(equalTo: navigationBar.bottomAnchor, constant: 1)
+            )
+            applyNavigationBarBackground(color: color)
+        } else {
+            // Blank toolbar / detached nav bar: cover status-bar height only.
+            // Avoid pinning to a hidden UINavigationBar (removed from hierarchy → crash).
+            constraints.append(
+                backgroundView.heightAnchor.constraint(equalToConstant: max(statusBarHeight, 20))
+            )
+        }
+
+        NSLayoutConstraint.activate(constraints)
     }
 
     // Override to use our custom status bar style
@@ -1973,16 +2037,7 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
         }
         let userContentController = webConfiguration.userContentController
         userContentController.removeAllUserScripts()
-        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")
+        ScriptMessageHandlerSupport.removeAll(from: userContentController)
 
         if proxyRequests || proxySchemeHandler != nil, let handler = proxySchemeHandler {
             WKWebView.enableCustomSchemeHandling(for: ["https", "http"])
@@ -2229,7 +2284,9 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
         self.enabledSafeTopMargin = parent.enabledSafeTopMargin
         self.blockedHosts = parent.blockedHosts
         self.authorizedAppLinks = parent.authorizedAppLinks
-        self.activeNativeNavigationForWebview = parent.activeNativeNavigationForWebview
+        // createWebViewWith configs copy parent script handlers; start clean so
+        // initWebview can register blobDownload/etc without NSInvalidArgumentException.
+        configuration.userContentController = WKUserContentController()
         self.initialWebConfiguration = configuration
         self.persistWebViewData = parent.persistWebViewData
         self.disableOverscroll = parent.disableOverscroll
@@ -2513,20 +2570,7 @@ public extension WKWebViewController {
         webView.loadHTMLString("", baseURL: nil)
 
         webView.configuration.userContentController.removeAllUserScripts()
-        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")
+        ScriptMessageHandlerSupport.removeAll(from: webView.configuration.userContentController)
 
         webView.removeFromSuperview()
         // Also clean progress bar view if present

package/package.json

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