@capgo/capacitor-inappbrowser 8.6.20 → 8.6.22

package/android/src/main/java/ee/forgr/capacitor_inappbrowser/WebViewDialog.java

@@ -1416,6 +1416,8 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
     }
 
     private void downloadUrlToFile(String url, String userAgent, String contentDisposition, String mimeType) {
+        // WebView methods must run on the main thread; capture the page URL before the background download starts.
+        final String pageUrl = currentManagedDownloadPageUrl();
         executorService.execute(() -> {
             HttpURLConnection connection = null;
             InputStream inputStream = null;
@@ -1423,7 +1425,6 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
             boolean downloadSucceeded = false;
 
             try {
-                String pageUrl = currentManagedDownloadPageUrl();
                 String currentUrl = url;
                 int redirectsFollowed = 0;
                 while (true) {

package/ios/Sources/InAppBrowserPlugin/InAppBrowserPlugin.swift

@@ -51,6 +51,27 @@ enum ProxyResponseRoutingSupport {
     }
 }
 
+enum CustomWebViewFrameSupport {
+    static func resolvedFrame(
+        width: CGFloat?,
+        height: CGFloat?,
+        x: CGFloat?,
+        y: CGFloat?,
+        fallbackSize: CGSize
+    ) -> CGRect? {
+        guard let height else {
+            return nil
+        }
+
+        return CGRect(
+            x: x ?? 0,
+            y: y ?? 0,
+            width: width ?? fallbackSize.width,
+            height: height
+        )
+    }
+}
+
 extension UIColor {
 
     convenience init(hexString: String) {
@@ -77,7 +98,7 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         case aware = "AWARE"
         case fakeVisible = "FAKE_VISIBLE"
     }
-    private let pluginVersion: String = "8.6.20"
+    private let pluginVersion: String = "8.6.22"
     public let identifier = "CapgoInAppBrowserPlugin"
     public let jsName = "CapgoInAppBrowser"
     public let pluginMethods: [CAPPluginMethod] = [
@@ -1153,29 +1174,29 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
                 // Create a pass-through container
                 let containerView = PassThroughView()
                 containerView.backgroundColor = .clear
-
-                // Calculate dimensions - use screen width if only height is provided
-                let finalWidth = width.map { CGFloat($0) } ?? UIScreen.main.bounds.width
-                let finalHeight = height.map { CGFloat($0) } ?? UIScreen.main.bounds.height
-
-                containerView.targetFrame = CGRect(
-                    x: CGFloat(xPos ?? 0),
-                    y: CGFloat(yPos ?? 0),
-                    width: finalWidth,
-                    height: finalHeight
+                containerView.frame = UIScreen.main.bounds
+                containerView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+
+                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)
-                    originalView.frame = CGRect(
-                        x: CGFloat(xPos ?? 0),
-                        y: CGFloat(yPos ?? 0),
-                        width: finalWidth,
-                        height: finalHeight
-                    )
+                    containerView.framedContentView = originalView
+                    originalView.translatesAutoresizingMaskIntoConstraints = true
+                    originalView.autoresizingMask = []
+                    if let targetFrame {
+                        originalView.frame = targetFrame
+                    }
                 }
             } else {
                 self.navigationWebViewController?.modalPresentationStyle = .overCurrentContext
@@ -1824,6 +1845,11 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         let xPos = call.getFloat("x")
         let yPos = call.getFloat("y")
 
+        if width != nil && height == nil {
+            call.reject("Height must be specified when width is provided")
+            return
+        }
+
         DispatchQueue.main.async {
             let targetId = call.getString("id") ?? self.activeWebViewId
             guard let webViewController = self.resolveWebViewController(for: targetId) else {

package/ios/Sources/InAppBrowserPlugin/WKWebViewController.swift

@@ -2881,26 +2881,32 @@ extension WKWebViewController: WKNavigationDelegate {
 
     /// Apply custom dimensions to the view if specified
     open func applyCustomDimensions() {
-        guard let navigationController = navigationController else { return }
-
-        // Apply custom dimensions if both width and height are specified
-        if let width = customWidth, let height = customHeight {
-            let xPos = customX ?? 0
-            let yPos = customY ?? 0
-
-            // Set the frame for the navigation controller's view
-            navigationController.view.frame = CGRect(x: xPos, y: yPos, width: width, height: height)
+        guard let navigationController = navigationController,
+              let targetFrame = CustomWebViewFrameSupport.resolvedFrame(
+                width: customWidth,
+                height: customHeight,
+                x: customX,
+                y: customY,
+                fallbackSize: UIScreen.main.bounds.size
+              ) else {
+            return
         }
-        // If only height is specified, use fullscreen width
-        else if let height = customHeight, customWidth == nil {
-            let xPos = customX ?? 0
-            let yPos = customY ?? 0
-            let screenWidth = UIScreen.main.bounds.width
 
-            // Set the frame with fullscreen width and custom height
-            navigationController.view.frame = CGRect(x: xPos, y: yPos, width: screenWidth, height: height)
+        if let passThroughView = navigationController.view as? PassThroughView {
+            passThroughView.targetFrame = targetFrame
+            let contentView = passThroughView.framedContentView ?? passThroughView.subviews.first
+            contentView?.frame = targetFrame
+            contentView?.setNeedsLayout()
+            contentView?.layoutIfNeeded()
+            passThroughView.setNeedsLayout()
+            passThroughView.layoutIfNeeded()
+        } else {
+            navigationController.view.frame = targetFrame
+            navigationController.view.setNeedsLayout()
+            navigationController.view.layoutIfNeeded()
         }
-        // Otherwise, use default fullscreen behavior (no action needed)
+
+        refreshWebViewViewportIfNeeded(force: true)
     }
 
     /// Update dimensions at runtime
@@ -3035,7 +3041,22 @@ class BlockBarButtonItem: UIBarButtonItem {
 
 /// Custom view that passes touches outside a target frame to the underlying view
 class PassThroughView: UIView {
-    var targetFrame: CGRect?
+    var targetFrame: CGRect? {
+        didSet {
+            setNeedsLayout()
+        }
+    }
+    weak var framedContentView: UIView?
+
+    override func layoutSubviews() {
+        super.layoutSubviews()
+
+        guard let targetFrame, let framedContentView else {
+            return
+        }
+
+        framedContentView.frame = targetFrame
+    }
 
     override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
         // If we have a target frame and the touch is outside it, pass through

package/package.json

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