@capgo/capacitor-inappbrowser 8.10.7 → 8.12.0

package/ios/Sources/InAppBrowserPlugin/InAppBrowserPlugin.swift

@@ -110,7 +110,6 @@ enum CustomSchemeOpenSupport {
     }
 }
 
-
 protocol ProxyRequestLocating {
     func hasPendingProxyRequest(_ requestId: String) -> Bool
 }
@@ -149,7 +148,6 @@ enum ProxyResponseRoutingSupport {
     }
 }
 
-
 enum StatusBarBackgroundLayoutSupport {
     enum Placement: Equatable {
         case skip
@@ -232,7 +230,7 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         case aware = "AWARE"
         case fakeVisible = "FAKE_VISIBLE"
     }
-    private let pluginVersion: String = "8.10.7"
+    private let pluginVersion: String = "8.12.0"
     public let identifier = "CapgoInAppBrowserPlugin"
     public let jsName = "CapgoInAppBrowser"
     public let pluginMethods: [CAPPluginMethod] = [
@@ -279,6 +277,7 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
     private var hiddenWebViewContainers: [ObjectIdentifier: UIView] = [:]
     private var closeModalTitle: String?
     private var layeredWebViewIds = Set<String>()
+    private var framedOverlayWebViewIds = Set<String>()
     private var transparentHostWebViewIds = Set<String>()
     private var hasStoredHostWebViewAppearance = false
     private var originalHostWebViewBackgroundColor: UIColor?
@@ -339,6 +338,7 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
     }
 
     private func unregisterWebView(id: String) {
+        detachFramedOverlayWebView(id: id)
         detachLayeredWebView(id: id)
         if let webView = webViewControllers[id]?.capableWebView {
             cleanupHiddenWebViewContainer(for: webView)
@@ -606,7 +606,20 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
             return true
         }
 
+        if let resolvedId,
+           let webViewController = webViewControllers[resolvedId],
+           webViewController.shouldPresentAsFramedOverlay {
+            dismissActiveKeyboard()
+            if presentNavigationControllerAsFramedOverlay(id: resolvedId) {
+                self.currentPluginCall?.resolve()
+                return true
+            }
+            self.currentPluginCall?.reject("Failed to present webview")
+            return false
+        }
+
         if let resolvedId {
+            detachFramedOverlayWebView(id: resolvedId)
             detachLayeredWebView(id: resolvedId)
         }
         dismissActiveKeyboard()
@@ -621,61 +634,6 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         return true
     }
 
-    private func targetFrame(for webViewController: WKWebViewController, in hostWebView: UIView) -> CGRect {
-        return CustomWebViewFrameSupport.resolvedFrame(
-            width: webViewController.customWidth,
-            height: webViewController.customHeight,
-            x: webViewController.customX,
-            y: webViewController.customY,
-            fallbackSize: hostWebView.bounds.size
-        ) ?? hostWebView.bounds
-    }
-
-    @discardableResult
-    private func sendNavigationControllerToBack(id: String, transparentBackground: Bool) -> Bool {
-        guard let navigationController = navigationControllers[id],
-              let webViewController = webViewControllers[id],
-              let hostWebView = self.bridge?.webView else {
-            return false
-        }
-
-        if let webView = webViewController.capableWebView, webView.superview !== webViewController.view {
-            cleanupHiddenWebViewContainer(for: webView)
-            attachWebViewToController(webViewController, webView: webView)
-        }
-
-        dismissActiveKeyboard()
-        navigationController.view.removeFromSuperview()
-        if transparentBackground {
-            makeHostWebViewTransparent(for: id)
-        } else {
-            restoreHostWebViewBackgroundIfNeeded(for: id)
-        }
-        navigationController.view.frame = targetFrame(for: webViewController, in: hostWebView)
-        navigationController.view.autoresizingMask = [.flexibleWidth, .flexibleHeight]
-        navigationController.view.isUserInteractionEnabled = false
-        hostWebView.addSubview(navigationController.view)
-        hostWebView.sendSubviewToBack(navigationController.view)
-        navigationController.view.setNeedsLayout()
-        navigationController.view.layoutIfNeeded()
-
-        layeredWebViewIds.insert(id)
-        webViewController.isLayeredBehind = true
-        webViewController.transparentHostBackground = transparentBackground
-        return true
-    }
-
-    private func detachLayeredWebView(id: String) {
-        if let navigationController = navigationControllers[id] {
-            if navigationController.view.superview === self.bridge?.webView {
-                navigationController.view.removeFromSuperview()
-            }
-            navigationController.view.isUserInteractionEnabled = true
-        }
-        layeredWebViewIds.remove(id)
-        restoreHostWebViewBackgroundIfNeeded(for: id)
-    }
-
     private func storeSubviewBackgrounds(from view: UIView) {
         for subview in view.subviews {
             originalHostSubviewBackgrounds.append((subview, subview.backgroundColor, subview.isOpaque))
@@ -1291,6 +1249,7 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
 
         // Read disableOverscroll option (iOS only - controls WebView bounce effect)
         let disableOverscroll = call.getBool("disableOverscroll", false)
+        let enableReloadGesture = call.getBool("enableReloadGesture", false)
 
         let legacyProxyRequests = ProxySchemeRequestSupport.legacyProxyRequestsConfiguration(from: call.options["proxyRequests"])
         let outboundProxyRulesRaw = call.getArray("outboundProxyRules", [])
@@ -1361,6 +1320,8 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
                 authorizedAppLinks: authorizedAppLinks,
                 openBlankTargetInWebView: openBlankTargetInWebView
             )
+            webViewController.enableReloadGesture = enableReloadGesture
+            webViewController.disableOverscroll = disableOverscroll
             webViewController.initWebview(isInspectable: isInspectable)
             self.webViewController = webViewController
 
@@ -1390,8 +1351,6 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
                 webViewController.customY = CGFloat(yPos)
             }
 
-            // Set disableOverscroll option
-            webViewController.disableOverscroll = disableOverscroll
             webViewController.handleDownloads = handleDownloads
 
             // Set native navigation gestures before view loads
@@ -1603,42 +1562,9 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
             }
             webViewController.updateTitleAppearance()
 
-            // Configure modal presentation for touch passthrough if custom dimensions are set
-            if (width != nil || height != nil) && !toBack {
-                self.navigationWebViewController?.modalPresentationStyle = .overFullScreen
-
-                // Create a pass-through container
-                let containerView = PassThroughView()
-                containerView.backgroundColor = .clear
-                containerView.frame = UIScreen.main.bounds
-                containerView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
-                containerView.passthroughView = self.bridge?.webView
-
-                let targetFrame = CustomWebViewFrameSupport.resolvedFrame(
-                    width: width.map { CGFloat($0) },
-                    height: height.map { CGFloat($0) },
-                    x: xPos.map { CGFloat($0) },
-                    y: yPos.map { CGFloat($0) },
-                    fallbackSize: UIScreen.main.bounds.size
-                )
-                containerView.targetFrame = targetFrame
-
-                // Replace the navigation controller's view with our pass-through container
-                if let navController = self.navigationWebViewController,
-                   let originalView = navController.view {
-                    navController.view = containerView
-                    containerView.addSubview(originalView)
-                    containerView.framedContentView = originalView
-                    originalView.translatesAutoresizingMaskIntoConstraints = true
-                    originalView.autoresizingMask = []
-                    if let targetFrame {
-                        originalView.frame = targetFrame
-                    }
-                }
-            } else {
-                self.navigationWebViewController?.modalPresentationStyle = .overCurrentContext
-            }
-
+            // Custom width/height front browsers are attached as framed child overlays in
+            // presentView (matching Android window sizing) so host taps outside the frame work.
+            self.navigationWebViewController?.modalPresentationStyle = .overCurrentContext
             self.navigationWebViewController?.modalTransitionStyle = .crossDissolve
             if toolbarType == "blank" {
                 self.navigationWebViewController?.navigationBar.isHidden = true
@@ -1765,6 +1691,7 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
 
             if hidden {
                 if let resolvedId {
+                    self.detachFramedOverlayWebView(id: resolvedId)
                     self.detachLayeredWebView(id: resolvedId)
                 }
                 if !self.attachWebViewToWindow(webView) {
@@ -1793,9 +1720,22 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
                 if let navController = navigationController {
                     if let resolvedId {
                         self.setActiveWebView(id: resolvedId, webView: webViewController, navigationController: navController)
-                    }
-
-                    if navController.presentingViewController == nil {
+                        if navController.presentingViewController == nil && !self.framedOverlayWebViewIds.contains(resolvedId) {
+                            self.revealNavigationController(
+                                id: resolvedId,
+                                navigationController: navController,
+                                webViewController: webViewController,
+                                animated: true
+                            ) { presented in
+                                if presented {
+                                    call?.resolve()
+                                } else {
+                                    call?.reject("Failed to present webview")
+                                }
+                            }
+                            return
+                        }
+                    } else if navController.presentingViewController == nil {
                         let presenter = self.bridge?.viewController?.presentedViewController ?? self.bridge?.viewController
                         self.presentNavigationControllerSafely(navController, from: presenter, animated: true) { presented in
                             if presented {
@@ -1873,9 +1813,13 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
                 self.attachWebViewToController(webViewController, webView: webView)
             }
             self.setActiveWebView(id: resolvedId, webView: webViewController, navigationController: navigationController)
-            if navigationController.presentingViewController == nil {
-                let presenter = self.bridge?.viewController?.presentedViewController ?? self.bridge?.viewController
-                self.presentNavigationControllerSafely(navigationController, from: presenter, animated: isAnimated) { presented in
+            if navigationController.presentingViewController == nil && !self.framedOverlayWebViewIds.contains(resolvedId) {
+                self.revealNavigationController(
+                    id: resolvedId,
+                    navigationController: navigationController,
+                    webViewController: webViewController,
+                    animated: isAnimated
+                ) { presented in
                     if presented {
                         call.resolve()
                     } else {
@@ -1884,6 +1828,12 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
                 }
                 return
             }
+            if webViewController.shouldPresentAsFramedOverlay {
+                guard self.presentNavigationControllerAsFramedOverlay(id: resolvedId) else {
+                    call.reject("Failed to present webview")
+                    return
+                }
+            }
             call.resolve()
         }
     }
@@ -2117,7 +2067,6 @@ 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 }
@@ -2377,9 +2326,12 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
                let webViewController = self.webViewControllers[targetId],
                let navigationController = self.navigationControllers[targetId] {
                 let currentUrl = webViewController.url?.absoluteString ?? ""
+                let wasPresented = navigationController.presentingViewController != nil
                 webViewController.cleanupWebView()
                 self.handleWebViewDidClose(id: targetId, url: currentUrl)
-                navigationController.dismiss(animated: isAnimated, completion: nil)
+                if wasPresented {
+                    navigationController.dismiss(animated: isAnimated, completion: nil)
+                }
                 call.resolve()
                 return
             }
@@ -2415,7 +2367,6 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         }
     }
 
-
     private func showPrivacyScreen() {
         if privacyScreen == nil {
             let newPrivacyScreen = UIImageView()
@@ -2617,3 +2568,139 @@ extension CapgoInAppBrowserPlugin: SFSafariViewControllerDelegate {
         }
     }
 }
+
+
+extension CapgoInAppBrowserPlugin {
+    private func targetFrame(for webViewController: WKWebViewController, in hostWebView: UIView) -> CGRect {
+        return CustomWebViewFrameSupport.resolvedFrame(
+            width: webViewController.customWidth,
+            height: webViewController.customHeight,
+            x: webViewController.customX,
+            y: webViewController.customY,
+            fallbackSize: hostWebView.bounds.size
+        ) ?? hostWebView.bounds
+    }
+
+    @discardableResult
+    private func sendNavigationControllerToBack(id: String, transparentBackground: Bool) -> Bool {
+        guard let navigationController = navigationControllers[id],
+              let webViewController = webViewControllers[id],
+              let hostWebView = self.bridge?.webView else {
+            return false
+        }
+
+        if let webView = webViewController.capableWebView, webView.superview !== webViewController.view {
+            cleanupHiddenWebViewContainer(for: webView)
+            attachWebViewToController(webViewController, webView: webView)
+        }
+
+        dismissActiveKeyboard()
+        detachFramedOverlayWebView(id: id)
+        navigationController.view.removeFromSuperview()
+        if transparentBackground {
+            makeHostWebViewTransparent(for: id)
+        } else {
+            restoreHostWebViewBackgroundIfNeeded(for: id)
+        }
+        navigationController.view.frame = targetFrame(for: webViewController, in: hostWebView)
+        navigationController.view.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+        navigationController.view.isUserInteractionEnabled = false
+        hostWebView.addSubview(navigationController.view)
+        hostWebView.sendSubviewToBack(navigationController.view)
+        navigationController.view.setNeedsLayout()
+        navigationController.view.layoutIfNeeded()
+
+        layeredWebViewIds.insert(id)
+        webViewController.isLayeredBehind = true
+        webViewController.transparentHostBackground = transparentBackground
+        return true
+    }
+
+    private func detachLayeredWebView(id: String) {
+        if let navigationController = navigationControllers[id] {
+            if navigationController.view.superview === self.bridge?.webView {
+                navigationController.view.removeFromSuperview()
+            }
+            navigationController.view.isUserInteractionEnabled = true
+        }
+        layeredWebViewIds.remove(id)
+        restoreHostWebViewBackgroundIfNeeded(for: id)
+    }
+
+    /// Front custom-dimension browsers are child VCs with an exact frame (Android-style).
+    /// Full-screen modal + PassThroughView still leaves UITransitionView eating host taps.
+    @discardableResult
+    private func presentNavigationControllerAsFramedOverlay(id: String) -> Bool {
+        guard let navigationController = navigationControllers[id],
+              let webViewController = webViewControllers[id],
+              let parent = self.bridge?.viewController else {
+            return false
+        }
+
+        dismissNavigationControllerIfPresented(navigationController)
+        detachLayeredWebView(id: id)
+
+        let frame = targetFrame(for: webViewController, in: parent.view)
+
+        if navigationController.parent !== parent {
+            if navigationController.parent != nil {
+                navigationController.willMove(toParent: nil)
+                navigationController.view.removeFromSuperview()
+                navigationController.removeFromParent()
+            }
+            parent.addChild(navigationController)
+            parent.view.addSubview(navigationController.view)
+            navigationController.didMove(toParent: parent)
+        } else if navigationController.view.superview !== parent.view {
+            parent.view.addSubview(navigationController.view)
+        }
+
+        navigationController.view.frame = frame
+        navigationController.view.autoresizingMask = []
+        navigationController.view.isUserInteractionEnabled = true
+        parent.view.bringSubviewToFront(navigationController.view)
+        navigationController.view.setNeedsLayout()
+        navigationController.view.layoutIfNeeded()
+        webViewController.applyCustomDimensions()
+
+        framedOverlayWebViewIds.insert(id)
+        webViewController.isLayeredBehind = false
+        return true
+    }
+
+    private func detachFramedOverlayWebView(id: String) {
+        guard let navigationController = navigationControllers[id] else {
+            framedOverlayWebViewIds.remove(id)
+            return
+        }
+
+        if navigationController.parent != nil {
+            navigationController.willMove(toParent: nil)
+            navigationController.view.removeFromSuperview()
+            navigationController.removeFromParent()
+        } else if framedOverlayWebViewIds.contains(id) {
+            navigationController.view.removeFromSuperview()
+        }
+
+        framedOverlayWebViewIds.remove(id)
+    }
+
+    private func revealNavigationController(
+        id: String,
+        navigationController: UINavigationController,
+        webViewController: WKWebViewController,
+        animated: Bool,
+        completion: ((Bool) -> Void)? = nil
+    ) {
+        if webViewController.shouldPresentAsFramedOverlay {
+            completion?(presentNavigationControllerAsFramedOverlay(id: id))
+            return
+        }
+
+        detachFramedOverlayWebView(id: id)
+        let presenter = self.bridge?.viewController?.presentedViewController ?? self.bridge?.viewController
+        presentNavigationControllerSafely(navigationController, from: presenter, animated: animated, completion: completion)
+    }
+
+}
+

package/ios/Sources/InAppBrowserPlugin/WKWebViewController.swift

@@ -471,6 +471,7 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
     var blockedHosts: [String] = []
     var authorizedAppLinks: [String] = []
     var activeNativeNavigationForWebview: Bool = true
+    var enableReloadGesture: Bool = false
     var disableOverscroll: Bool = false
     var proxyRequests: Bool = false
     var proxySchemeHandler: ProxySchemeHandler?
@@ -490,6 +491,11 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
     var customX: CGFloat?
     var customY: CGFloat?
 
+    /// Front (non-toBack) browsers with a custom height use a framed child overlay.
+    var shouldPresentAsFramedOverlay: Bool {
+        !isLayeredBehind && customHeight != nil
+    }
+
     internal var preShowSemaphore: DispatchSemaphore?
     internal var preShowError: String?
     private var isWebViewInitialized = false
@@ -2207,6 +2213,7 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
 
         // Disable bounce effect by setting scrollView.bounces to false when disableOverscroll is true
         webView.scrollView.bounces = !self.disableOverscroll
+        configureReloadGesture(for: webView)
         configureWebViewScrollViewSafeArea(webView)
 
         webView.addObserver(self, forKeyPath: estimatedProgressKeyPath, options: .new, context: nil)
@@ -2289,6 +2296,7 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
         configuration.userContentController = WKUserContentController()
         self.initialWebConfiguration = configuration
         self.persistWebViewData = parent.persistWebViewData
+        self.enableReloadGesture = parent.enableReloadGesture
         self.disableOverscroll = parent.disableOverscroll
         self.proxyRequests = parent.proxyRequests
         self.proxySchemeHandler = proxySchemeHandler
@@ -2431,6 +2439,7 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
                 }
                 self.progressView?.alpha = 1
                 self.progressView?.setProgress(Float(estimatedProgress), animated: true)
+                self.emit("browserPageLoadProgress", data: ["progress": estimatedProgress])
 
                 if estimatedProgress >= 1.0 {
                     UIView.animate(withDuration: 0.3, delay: 0.3, options: .curveEaseOut, animations: {
@@ -2552,6 +2561,31 @@ public extension WKWebViewController {
         self.webView?.allowsBackForwardNavigationGestures = self.activeNativeNavigationForWebview
     }
 
+    private func configureReloadGesture(for webView: WKWebView) {
+        if let existing = webView.scrollView.refreshControl {
+            existing.endRefreshing()
+            existing.removeTarget(nil, action: nil, for: .allEvents)
+            webView.scrollView.refreshControl = nil
+        }
+
+        guard enableReloadGesture, !disableOverscroll else {
+            return
+        }
+
+        webView.scrollView.alwaysBounceVertical = true
+        let refreshControl = UIRefreshControl()
+        refreshControl.addTarget(self, action: #selector(handleReloadGesture(_:)), for: .valueChanged)
+        webView.scrollView.refreshControl = refreshControl
+    }
+
+    @objc private func handleReloadGesture(_ sender: UIRefreshControl) {
+        reload()
+    }
+
+    private func stopReloadGesture() {
+        webView?.scrollView.refreshControl?.endRefreshing()
+    }
+
     func cleanupWebView() {
         guard let webView = self.webView else { return }
         webView.stopLoading()
@@ -3451,6 +3485,7 @@ extension WKWebViewController: WKNavigationDelegate {
             self.url = urlValue
             delegate?.webViewController?(self, didStart: urlValue)
         }
+        emit("browserPageLoadStart")
     }
     public func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
         if !didpageInit && self.capBrowserPlugin?.isPresentAfterPageLoad == true {
@@ -3501,6 +3536,7 @@ extension WKWebViewController: WKNavigationDelegate {
         lastInjectedSafeAreaInsets = nil
         syncWebViewSafeAreaLayout()
         emit("browserPageLoaded")
+        stopReloadGesture()
     }
 
     public func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {
@@ -3510,6 +3546,7 @@ extension WKWebViewController: WKNavigationDelegate {
             self.url = url
             delegate?.webViewController?(self, didFail: url, withError: error)
         }
+        stopReloadGesture()
         emit("pageLoadError")
     }
 
@@ -3520,6 +3557,7 @@ extension WKWebViewController: WKNavigationDelegate {
             self.url = url
             delegate?.webViewController?(self, didFail: url, withError: error)
         }
+        stopReloadGesture()
         emit("pageLoadError")
     }
 
@@ -3659,14 +3697,18 @@ extension WKWebViewController: WKNavigationDelegate {
 
     /// Apply custom dimensions to the view if specified
     func applyCustomDimensions() {
-        guard let navigationController = navigationController,
-              let targetFrame = CustomWebViewFrameSupport.resolvedFrame(
-                width: customWidth,
-                height: customHeight,
-                x: customX,
-                y: customY,
-                fallbackSize: UIScreen.main.bounds.size
-              ) else {
+        guard let navigationController = navigationController else {
+            return
+        }
+
+        let fallbackSize = navigationController.view.superview?.bounds.size ?? UIScreen.main.bounds.size
+        guard let targetFrame = CustomWebViewFrameSupport.resolvedFrame(
+            width: customWidth,
+            height: customHeight,
+            x: customX,
+            y: customY,
+            fallbackSize: fallbackSize
+        ) else {
             return
         }
 
@@ -3827,7 +3869,6 @@ class PassThroughView: UIView {
         }
     }
     weak var framedContentView: UIView?
-    weak var passthroughView: UIView?
 
     override func layoutSubviews() {
         super.layoutSubviews()
@@ -3840,12 +3881,11 @@ class PassThroughView: UIView {
     }
 
     override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+        // Outside the browser frame: decline the hit. Callers that still use a full-screen
+        // PassThroughView depend on the parent hierarchy continuing hit-testing; framed
+        // front overlays avoid modal UITransitionView entirely instead.
         if let frame = targetFrame, !frame.contains(point) {
-            guard let passthroughView else {
-                return nil
-            }
-            let convertedPoint = convert(point, to: passthroughView)
-            return passthroughView.hitTest(convertedPoint, with: event)
+            return nil
         }
 
         return super.hitTest(point, with: event)

package/package.json

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