@capgo/capacitor-inappbrowser 8.6.30 → 8.6.32

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

@@ -2,6 +2,7 @@ package ee.forgr.capacitor_inappbrowser;
 
 import android.Manifest;
 import android.app.Activity;
+import android.content.ActivityNotFoundException;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -763,7 +764,26 @@ public class CapgoInAppBrowserPlugin extends Plugin implements WebViewDialog.Per
             tabsIntent.intent.putExtra("isPresentAfterPageLoad", true);
         }
 
-        tabsIntent.launchUrl(getContext(), Uri.parse(url));
+        Uri targetUri = Uri.parse(url);
+        try {
+            tabsIntent.launchUrl(getContext(), targetUri);
+        } catch (ActivityNotFoundException e) {
+            Intent fallback = new Intent(Intent.ACTION_VIEW, targetUri);
+            fallback.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            Bundle extras = tabsIntent.intent.getExtras();
+            if (extras != null) {
+                fallback.putExtras(extras);
+            }
+            if (tabsIntent.intent.getPackage() != null) {
+                fallback.setPackage(tabsIntent.intent.getPackage());
+            }
+            try {
+                getContext().startActivity(fallback);
+            } catch (ActivityNotFoundException e2) {
+                call.reject("No browser found to open URL: " + url);
+                return;
+            }
+        }
 
         call.resolve();
     }

package/ios/Sources/InAppBrowserPlugin/InAppBrowserPlugin.swift

@@ -98,7 +98,7 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         case aware = "AWARE"
         case fakeVisible = "FAKE_VISIBLE"
     }
-    private let pluginVersion: String = "8.6.30"
+    private let pluginVersion: String = "8.6.32"
     public let identifier = "CapgoInAppBrowserPlugin"
     public let jsName = "CapgoInAppBrowser"
     public let pluginMethods: [CAPPluginMethod] = [
@@ -250,9 +250,7 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
     ) -> WKWebView? {
         let popupId = UUID().uuidString
         let shouldHidePopup = parentController.hiddenPopupWindow
-        if let parentWebView = parentController.capableWebView {
-            configuration.processPool = parentWebView.configuration.processPool
-        }
+        // WKProcessPool sharing is automatic on iOS 15+; explicit assignment is deprecated.
         if let dataStore = parentController.websiteDataStore() {
             configuration.websiteDataStore = dataStore
         }

package/ios/Sources/InAppBrowserPlugin/WKWebViewController.swift

@@ -236,6 +236,49 @@ enum WebViewViewportLayoutSupport {
     }
 }
 
+enum WebViewSafeAreaLayoutSupport {
+    static func contentInsetAdjustmentBehavior(enabledSafeBottomMargin: Bool) -> UIScrollView.ContentInsetAdjustmentBehavior {
+        enabledSafeBottomMargin ? .automatic : .never
+    }
+
+    static func shouldInsetLayoutMarginsFromSafeArea(enabledSafeBottomMargin: Bool) -> Bool {
+        enabledSafeBottomMargin
+    }
+
+    static func rawSystemBottomInset(effectiveBottomInset: CGFloat, additionalBottomInset: CGFloat) -> CGFloat {
+        max(0, effectiveBottomInset - additionalBottomInset)
+    }
+
+    static func additionalBottomSafeAreaOffset(enabledSafeBottomMargin: Bool, safeAreaBottomInset: CGFloat) -> CGFloat {
+        guard !enabledSafeBottomMargin, safeAreaBottomInset > 0 else {
+            return 0
+        }
+
+        return -safeAreaBottomInset
+    }
+
+    static func cssBottomInset(enabledSafeBottomMargin: Bool, safeAreaBottomInset: CGFloat) -> CGFloat {
+        enabledSafeBottomMargin ? safeAreaBottomInset : 0
+    }
+
+    static func cssTopInset(enabledSafeTopMargin: Bool, safeAreaTopInset: CGFloat) -> CGFloat {
+        enabledSafeTopMargin ? safeAreaTopInset : 0
+    }
+
+    static func safeAreaCssVariablesScript(top: CGFloat, bottom: CGFloat, left: CGFloat, right: CGFloat) -> String {
+        let topValue = Int(top.rounded())
+        let bottomValue = Int(bottom.rounded())
+        let leftValue = Int(left.rounded())
+        let rightValue = Int(right.rounded())
+
+        return "(function(){var root=document.documentElement;" +
+            "root.style.setProperty('--safe-area-inset-top','\(topValue)px');" +
+            "root.style.setProperty('--safe-area-inset-bottom','\(bottomValue)px');" +
+            "root.style.setProperty('--safe-area-inset-left','\(leftValue)px');" +
+            "root.style.setProperty('--safe-area-inset-right','\(rightValue)px');})();"
+    }
+}
+
 open class WKWebViewController: UIViewController, WKScriptMessageHandler {
 
     public init() {
@@ -395,6 +438,14 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
     private var isWebViewInitialized = false
     private var isObservingKeyboardViewportChanges = false
     private var lastViewportRefreshSize: CGSize?
+    private struct InjectedSafeAreaInsets: Equatable {
+        let top: Int
+        let bottom: Int
+        let left: Int
+        let right: Int
+    }
+
+    private var lastInjectedSafeAreaInsets: InjectedSafeAreaInsets?
     private var downloadStates: [ObjectIdentifier: WKDownloadState] = [:]
     private var previewItemURL: URL?
 
@@ -687,7 +738,13 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
 
     // Status bar height
     private var statusBarHeight: CGFloat {
-        return UIApplication.shared.windows.first?.windowScene?.statusBarManager?.statusBarFrame.height ?? 0
+        let windowScene = UIApplication.shared.connectedScenes
+            .compactMap { $0 as? UIWindowScene }
+            .first { $0.activationState == .foregroundActive }
+            ?? UIApplication.shared.connectedScenes
+                .compactMap { $0 as? UIWindowScene }
+                .first
+        return windowScene?.statusBarManager?.statusBarFrame.height ?? 0
     }
 
     // Make status bar background with colored view underneath
@@ -898,9 +955,15 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
 
     override open func viewDidLayoutSubviews() {
         super.viewDidLayoutSubviews()
+        syncWebViewSafeAreaLayout()
         refreshWebViewViewportIfNeeded()
     }
 
+    override open func viewSafeAreaInsetsDidChange() {
+        super.viewSafeAreaInsetsDidChange()
+        syncWebViewSafeAreaLayout()
+    }
+
     func updateButtonTintColors() {
         // Ensure all button items use the navigation bar's tint color
         if let tintColor = navigationController?.navigationBar.tintColor {
@@ -1058,6 +1121,72 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
         webView.evaluateJavaScript("window.dispatchEvent(new Event('resize'));", completionHandler: nil)
     }
 
+    private func configureWebViewScrollViewSafeArea(_ webView: WKWebView) {
+        if #available(iOS 11.0, *) {
+            webView.scrollView.contentInsetAdjustmentBehavior = WebViewSafeAreaLayoutSupport
+                .contentInsetAdjustmentBehavior(enabledSafeBottomMargin: enabledSafeBottomMargin)
+        }
+
+        webView.insetsLayoutMarginsFromSafeArea = WebViewSafeAreaLayoutSupport
+            .shouldInsetLayoutMarginsFromSafeArea(enabledSafeBottomMargin: enabledSafeBottomMargin)
+
+        if !enabledSafeBottomMargin {
+            webView.scrollView.contentInset = .zero
+            webView.scrollView.scrollIndicatorInsets = .zero
+        }
+    }
+
+    private func syncWebViewSafeAreaLayout() {
+        guard let webView = self.webView, webView.superview != nil else {
+            return
+        }
+
+        let rawSafeAreaBottomInset = WebViewSafeAreaLayoutSupport.rawSystemBottomInset(
+            effectiveBottomInset: view.safeAreaInsets.bottom,
+            additionalBottomInset: additionalSafeAreaInsets.bottom
+        )
+
+        let bottomOffset = WebViewSafeAreaLayoutSupport.additionalBottomSafeAreaOffset(
+            enabledSafeBottomMargin: enabledSafeBottomMargin,
+            safeAreaBottomInset: rawSafeAreaBottomInset
+        )
+        if additionalSafeAreaInsets.bottom != bottomOffset {
+            additionalSafeAreaInsets.bottom = bottomOffset
+        }
+
+        configureWebViewScrollViewSafeArea(webView)
+
+        let topInset = WebViewSafeAreaLayoutSupport.cssTopInset(
+            enabledSafeTopMargin: enabledSafeTopMargin,
+            safeAreaTopInset: view.safeAreaInsets.top
+        )
+        let bottomInset = WebViewSafeAreaLayoutSupport.cssBottomInset(
+            enabledSafeBottomMargin: enabledSafeBottomMargin,
+            safeAreaBottomInset: rawSafeAreaBottomInset
+        )
+        let leftInset = view.safeAreaInsets.left
+        let rightInset = view.safeAreaInsets.right
+
+        let roundedInsets = InjectedSafeAreaInsets(
+            top: Int(topInset.rounded()),
+            bottom: Int(bottomInset.rounded()),
+            left: Int(leftInset.rounded()),
+            right: Int(rightInset.rounded())
+        )
+        if lastInjectedSafeAreaInsets == roundedInsets {
+            return
+        }
+        lastInjectedSafeAreaInsets = roundedInsets
+
+        let script = WebViewSafeAreaLayoutSupport.safeAreaCssVariablesScript(
+            top: topInset,
+            bottom: bottomInset,
+            left: leftInset,
+            right: rightInset
+        )
+        webView.evaluateJavaScript(script, completionHandler: nil)
+    }
+
     private func jsonString(from object: Any) -> String? {
         guard JSONSerialization.isValidJSONObject(object),
               let data = try? JSONSerialization.data(withJSONObject: object),
@@ -1405,9 +1534,7 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
         webConfiguration.allowsInlineMediaPlayback = true
         webConfiguration.userContentController = userContentController
         // Enable background task processing
-        if initialWebConfiguration == nil {
-            webConfiguration.processPool = WKProcessPool()
-        }
+        // WKProcessPool is shared automatically on iOS 15+; explicit assignment is deprecated.
 
         // Enable JavaScript to run automatically (needed for preShowScript and Firebase polyfill)
         webConfiguration.preferences.javaScriptCanOpenWindowsAutomatically = true
@@ -1500,6 +1627,7 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
 
         // Disable bounce effect by setting scrollView.bounces to false when disableOverscroll is true
         webView.scrollView.bounces = !self.disableOverscroll
+        configureWebViewScrollViewSafeArea(webView)
 
         webView.addObserver(self, forKeyPath: estimatedProgressKeyPath, options: .new, context: nil)
         if websiteTitleInNavigationBar {
@@ -1629,7 +1757,7 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
 
         // Ensure status bar appearance is correct when view appears
         // Make sure we have the latest tint color
-        if let tintColor = self.tintColor {
+        if self.tintColor != nil {
             // Update the status bar background if needed
             if let navController = navigationController, let backgroundColor = navController.navigationBar.backgroundColor ?? statusBarBackgroundView?.backgroundColor {
                 setupStatusBarBackground(color: backgroundColor)
@@ -1735,6 +1863,15 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
 // MARK: - Public Methods
 public extension WKWebViewController {
 
+    func goBack() -> Bool {
+        if webView?.canGoBack ?? false {
+            webView?.goBack()
+            return true
+        }
+        return false
+    }
+
+
     func load(source sourceValue: WKWebSource) {
         switch sourceValue {
         case .remote(let url):
@@ -1816,7 +1953,7 @@ public extension WKWebViewController {
         self.webView?.allowsBackForwardNavigationGestures = self.activeNativeNavigationForWebview
     }
 
-    open func cleanupWebView() {
+    func cleanupWebView() {
         guard let webView = self.webView else { return }
         webView.stopLoading()
         previewItemURL = nil
@@ -2062,10 +2199,10 @@ fileprivate extension WKWebViewController {
     }
 
     func setUpState() {
-        navigationController?.setNavigationBarHidden(false, animated: true)
+        navigationController?.setNavigationBarHidden(blankNavigationTab, animated: false)
 
         // Always hide toolbar since we never want it
-        navigationController?.setToolbarHidden(true, animated: true)
+        navigationController?.setToolbarHidden(true, animated: false)
 
         // Set tint colors but don't override specific colors
         if tintColor == nil {
@@ -2264,14 +2401,6 @@ fileprivate extension WKWebViewController {
     }
 
     // Public method for safe back navigation
-    public func goBack() -> Bool {
-        if webView?.canGoBack ?? false {
-            webView?.goBack()
-            return true
-        }
-        return false
-    }
-
     @objc func forwardDidClick(sender: AnyObject) {
         webView?.goForward()
     }
@@ -2422,7 +2551,7 @@ fileprivate extension WKWebViewController {
         dismiss(animated: true, completion: nil)
     }
 
-    open func setUpNavigationBarAppearance() {
+    func setUpNavigationBarAppearance() {
         // Set up basic bar appearance
         if let navBar = navigationController?.navigationBar {
             // Make navigation bar transparent
@@ -2479,15 +2608,7 @@ extension WKWebViewController: WKUIDelegate {
                 strongCompletionHandler()
             }))
 
-            // Try to present the alert
-            do {
-                self.present(alertController, animated: true, completion: nil)
-            } catch {
-                // This won't typically be triggered as present doesn't throw,
-                // but adding as a safeguard
-                print("[InAppBrowser] Error presenting alert: \(error)")
-                strongCompletionHandler()
-            }
+            self.present(alertController, animated: true, completion: nil)
         }
     }
 
@@ -2733,6 +2854,8 @@ extension WKWebViewController: WKNavigationDelegate {
             delegate?.webViewController?(self, didFinish: url)
         }
         self.injectJavaScriptInterface()
+        lastInjectedSafeAreaInsets = nil
+        syncWebViewSafeAreaLayout()
         emit("browserPageLoaded")
     }
 
@@ -2880,7 +3003,7 @@ extension WKWebViewController: WKNavigationDelegate {
     // MARK: - Dimension Management
 
     /// Apply custom dimensions to the view if specified
-    open func applyCustomDimensions() {
+    func applyCustomDimensions() {
         guard let navigationController = navigationController,
               let targetFrame = CustomWebViewFrameSupport.resolvedFrame(
                 width: customWidth,
@@ -2910,7 +3033,7 @@ extension WKWebViewController: WKNavigationDelegate {
     }
 
     /// Update dimensions at runtime
-    open func updateDimensions(width: CGFloat?, height: CGFloat?, xPos: CGFloat?, yPos: CGFloat?) {
+    func updateDimensions(width: CGFloat?, height: CGFloat?, xPos: CGFloat?, yPos: CGFloat?) {
         // Update stored dimensions
         if let width = width {
             customWidth = width
@@ -2929,7 +3052,7 @@ extension WKWebViewController: WKNavigationDelegate {
         applyCustomDimensions()
     }
 
-    open func updateSafeTopMargin(_ enabled: Bool) {
+    func updateSafeTopMargin(_ enabled: Bool) {
         guard enabled != self.enabledSafeTopMargin else { return }
         self.enabledSafeTopMargin = enabled
         guard let webView = self.webView else { return }
@@ -2947,10 +3070,11 @@ extension WKWebViewController: WKNavigationDelegate {
             webView.topAnchor.constraint(equalTo: topAnchor)
         ])
         self.view.layoutIfNeeded()
+        syncWebViewSafeAreaLayout()
         refreshWebViewViewportIfNeeded(force: true)
     }
 
-    open func updateSafeBottomMargin(_ enabled: Bool) {
+    func updateSafeBottomMargin(_ enabled: Bool) {
         guard enabled != self.enabledSafeBottomMargin else { return }
         self.enabledSafeBottomMargin = enabled
         guard let webView = self.webView else { return }
@@ -2968,6 +3092,7 @@ extension WKWebViewController: WKNavigationDelegate {
             webView.bottomAnchor.constraint(equalTo: bottomAnchor)
         ])
         self.view.layoutIfNeeded()
+        syncWebViewSafeAreaLayout()
         refreshWebViewViewportIfNeeded(force: true)
     }
 }

package/package.json

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