@capgo/inappbrowser 7.29.0 → 7.29.2

package/README.md

@@ -65,6 +65,8 @@ InAppBrowser.updateDimensions({
 });
 ```
 
+**Touch Passthrough**: When custom dimensions are set (not fullscreen), touches outside the webview bounds will pass through to the underlying Capacitor webview, allowing the user to interact with your app in the exposed areas. This enables picture-in-picture style experiences where the InAppBrowser floats above your content.
+
 ### Open WebView with Safe Margin
 
 To create a webView with a 20px bottom margin (safe margin area outside the browser):

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

@@ -50,7 +50,7 @@ import org.json.JSONObject;
 )
 public class InAppBrowserPlugin extends Plugin implements WebViewDialog.PermissionHandler {
 
-    private final String pluginVersion = "7.29.0";
+    private final String pluginVersion = "7.29.2";
 
     public static final String CUSTOM_TAB_PACKAGE_NAME = "com.android.chrome"; // Change when in stable
     private CustomTabsClient customTabsClient;
@@ -653,6 +653,12 @@ public class InAppBrowserPlugin extends Plugin implements WebViewDialog.Permissi
         Integer x = call.getInt("x");
         Integer y = call.getInt("y");
 
+        // Validate dimension parameters
+        if (width != null && height == null) {
+            call.reject("Height must be specified when width is provided");
+            return;
+        }
+
         if (width != null) {
             options.setWidth(width);
         }

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

@@ -30,6 +30,7 @@ import android.text.TextUtils;
 import android.util.Base64;
 import android.util.Log;
 import android.util.TypedValue;
+import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
@@ -266,6 +267,19 @@ public class WebViewDialog extends Dialog {
         );
         setContentView(R.layout.activity_browser);
 
+        // If custom dimensions are set, configure for touch passthrough
+        if (_options != null && (_options.getWidth() != null || _options.getHeight() != null)) {
+            Window window = getWindow();
+            if (window != null) {
+                // Make the dialog background transparent
+                window.setBackgroundDrawableResource(android.R.color.transparent);
+                // Don't dim the background
+                window.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+                // Allow touches outside to pass through
+                window.setFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL, WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL);
+            }
+        }
+
         // Set fitsSystemWindows only for Android 10 (API 29)
         if (android.os.Build.VERSION.SDK_INT == android.os.Build.VERSION_CODES.Q) {
             View coordinator = findViewById(R.id.coordinator_layout);
@@ -2662,6 +2676,28 @@ public class WebViewDialog extends Dialog {
         }
     }
 
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        // Forward volume key events to the MainActivity
+        switch (keyCode) {
+            case KeyEvent.KEYCODE_VOLUME_UP:
+            case KeyEvent.KEYCODE_VOLUME_DOWN:
+                return activity.onKeyDown(keyCode, event);
+        }
+        return super.onKeyDown(keyCode, event);
+    }
+
+    @Override
+    public boolean onKeyUp(int keyCode, KeyEvent event) {
+        // Forward volume key events to the MainActivity
+        switch (keyCode) {
+            case KeyEvent.KEYCODE_VOLUME_UP:
+            case KeyEvent.KEYCODE_VOLUME_DOWN:
+                return activity.onKeyUp(keyCode, event);
+        }
+        return super.onKeyUp(keyCode, event);
+    }
+
     public static String getReasonPhrase(int statusCode) {
         return switch (statusCode) {
             case (200) -> "OK";
@@ -2672,7 +2708,7 @@ public class WebViewDialog extends Dialog {
             case (205) -> "Reset Content";
             case (206) -> "Partial Content";
             case (207) -> "Partial Update OK";
-            case (300) -> "Mutliple Choices";
+            case (300) -> "Multiple Choices";
             case (301) -> "Moved Permanently";
             case (302) -> "Moved Temporarily";
             case (303) -> "See Other";
@@ -2975,6 +3011,12 @@ public class WebViewDialog extends Dialog {
             params.height = (int) getPixels(height);
             params.x = (x != null) ? (int) getPixels(x) : 0;
             params.y = (y != null) ? (int) getPixels(y) : 0;
+        } else if (height != null && width == null) {
+            // If only height is specified, use custom height with fullscreen width
+            params.width = WindowManager.LayoutParams.MATCH_PARENT;
+            params.height = (int) getPixels(height);
+            params.x = 0;
+            params.y = (y != null) ? (int) getPixels(y) : 0;
         } else {
             // Default to fullscreen
             params.width = WindowManager.LayoutParams.MATCH_PARENT;

package/ios/Sources/InAppBrowserPlugin/InAppBrowserPlugin.swift

@@ -24,7 +24,7 @@ extension UIColor {
  */
 @objc(InAppBrowserPlugin)
 public class InAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
-    private let pluginVersion: String = "7.29.0"
+    private let pluginVersion: String = "7.29.2"
     public let identifier = "InAppBrowserPlugin"
     public let jsName = "InAppBrowser"
     public let pluginMethods: [CAPPluginMethod] = [
@@ -374,6 +374,12 @@ public class InAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         let x = call.getFloat("x")
         let y = call.getFloat("y")
 
+        // Validate dimension parameters
+        if width != nil && height == nil {
+            call.reject("Height must be specified when width is provided")
+            return
+        }
+
         DispatchQueue.main.async {
             guard let url = URL(string: urlString) else {
                 call.reject("Invalid URL format")
@@ -603,7 +609,41 @@ public class InAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
 
             }
 
-            self.navigationWebViewController?.modalPresentationStyle = .overCurrentContext
+            // Configure modal presentation for touch passthrough if custom dimensions are set
+            if width != nil || height != nil {
+                self.navigationWebViewController?.modalPresentationStyle = .overFullScreen
+
+                // Create a pass-through container
+                let containerView = PassThroughView()
+                containerView.backgroundColor = .clear
+
+                // Calculate dimensions - use screen width if only height is provided
+                let finalWidth = width != nil ? CGFloat(width!) : UIScreen.main.bounds.width
+                let finalHeight = height != nil ? CGFloat(height!) : UIScreen.main.bounds.height
+
+                containerView.targetFrame = CGRect(
+                    x: CGFloat(x ?? 0),
+                    y: CGFloat(y ?? 0),
+                    width: finalWidth,
+                    height: finalHeight
+                )
+
+                // 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(x ?? 0),
+                        y: CGFloat(y ?? 0),
+                        width: finalWidth,
+                        height: finalHeight
+                    )
+                }
+            } else {
+                self.navigationWebViewController?.modalPresentationStyle = .overCurrentContext
+            }
+
             self.navigationWebViewController?.modalTransitionStyle = .crossDissolve
             if toolbarType == "blank" {
                 self.navigationWebViewController?.navigationBar.isHidden = true

package/ios/Sources/InAppBrowserPlugin/WKWebViewController.swift

@@ -153,6 +153,7 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
 
     internal var preShowSemaphore: DispatchSemaphore?
     internal var preShowError: String?
+    private var isWebViewInitialized = false
 
     func setHeaders(headers: [String: String]) {
         self.headers = headers
@@ -394,6 +395,10 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
     override open func viewDidDisappear(_ animated: Bool) {
         super.viewDidDisappear(animated)
 
+        if self.isBeingDismissed || self.isMovingFromParent {
+            self.cleanupWebView()
+        }
+
         if let capacitorStatusBar = capacitorStatusBar {
             self.capBrowserPlugin?.bridge?.webView?.superview?.addSubview(capacitorStatusBar)
             self.capBrowserPlugin?.bridge?.webView?.frame.origin.y = capacitorStatusBar.frame.height
@@ -582,6 +587,10 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
     }
 
     open func initWebview(isInspectable: Bool = true) {
+        if self.isWebViewInitialized {
+            return
+        }
+        self.isWebViewInitialized = true
         self.view.backgroundColor = UIColor.white
 
         self.extendedLayoutIncludesOpaqueBars = true
@@ -589,11 +598,13 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
 
         let webConfiguration = WKWebViewConfiguration()
         let userContentController = WKUserContentController()
-        userContentController.add(self, name: "messageHandler")
-        userContentController.add(self, name: "preShowScriptError")
-        userContentController.add(self, name: "preShowScriptSuccess")
-        userContentController.add(self, name: "close")
-        userContentController.add(self, name: "magicPrint")
+
+        let weakHandler = WeakScriptMessageHandler(self)
+        userContentController.add(weakHandler, name: "messageHandler")
+        userContentController.add(weakHandler, name: "preShowScriptError")
+        userContentController.add(weakHandler, name: "preShowScriptSuccess")
+        userContentController.add(weakHandler, name: "close")
+        userContentController.add(weakHandler, name: "magicPrint")
 
         // Inject JavaScript to override window.print
         let script = WKUserScript(
@@ -1914,7 +1925,7 @@ extension WKWebViewController: WKNavigationDelegate {
     open func applyCustomDimensions() {
         guard let navigationController = navigationController else { return }
 
-        // Only apply custom dimensions if both width and height are specified
+        // Apply custom dimensions if both width and height are specified
         if let width = customWidth, let height = customHeight {
             let x = customX ?? 0
             let y = customY ?? 0
@@ -1922,6 +1933,15 @@ extension WKWebViewController: WKNavigationDelegate {
             // Set the frame for the navigation controller's view
             navigationController.view.frame = CGRect(x: x, y: y, width: width, height: height)
         }
+        // If only height is specified, use fullscreen width
+        else if let height = customHeight, customWidth == nil {
+            let x = customX ?? 0
+            let y = customY ?? 0
+            let screenWidth = UIScreen.main.bounds.width
+
+            // Set the frame with fullscreen width and custom height
+            navigationController.view.frame = CGRect(x: x, y: y, width: screenWidth, height: height)
+        }
         // Otherwise, use default fullscreen behavior (no action needed)
     }
 
@@ -1951,6 +1971,36 @@ class BlockBarButtonItem: UIBarButtonItem {
     var block: ((WKWebViewController) -> Void)?
 }
 
+/// Custom view that passes touches outside a target frame to the underlying view
+class PassThroughView: UIView {
+    var targetFrame: CGRect?
+
+    override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+        // If we have a target frame and the touch is outside it, pass through
+        if let frame = targetFrame {
+            if !frame.contains(point) {
+                return nil  // Pass through to underlying views
+            }
+        }
+
+        // Otherwise, handle normally
+        return super.hitTest(point, with: event)
+    }
+}
+
 extension WKNavigationActionPolicy {
     static let preventDeeplinkActionPolicy = WKNavigationActionPolicy(rawValue: WKNavigationActionPolicy.allow.rawValue + 2)!
 }
+
+class WeakScriptMessageHandler: NSObject, WKScriptMessageHandler {
+    weak var delegate: WKScriptMessageHandler?
+
+    init(_ delegate: WKScriptMessageHandler) {
+        self.delegate = delegate
+        super.init()
+    }
+
+    func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) {
+        self.delegate?.userContentController(userContentController, didReceive: message)
+    }
+}

package/package.json

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