@capgo/capacitor-inappbrowser 8.6.29 → 8.6.31

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/android/src/main/java/ee/forgr/capacitor_inappbrowser/SafeAreaInsetsSupport.java

@@ -47,10 +47,25 @@ final class SafeAreaInsetsSupport {
     }
 
     static int resolveTopMargin(boolean enabledSafeTopMargin, boolean useTopInset, int systemBarsTop, boolean appBarHandlesTopInset) {
+        return resolveTopMarginWithFallback(enabledSafeTopMargin, useTopInset, systemBarsTop, appBarHandlesTopInset, 0, false);
+    }
+
+    static int resolveTopMarginWithFallback(
+        boolean enabledSafeTopMargin,
+        boolean useTopInset,
+        int systemBarsTop,
+        boolean appBarHandlesTopInset,
+        int fallbackTopInset,
+        boolean applyFallbackWhenZero
+    ) {
         if (!enabledSafeTopMargin || !useTopInset || appBarHandlesTopInset) {
             return 0;
         }
 
-        return systemBarsTop;
+        if (systemBarsTop > 0 || !applyFallbackWhenZero || fallbackTopInset <= 0) {
+            return systemBarsTop;
+        }
+
+        return fallbackTopInset;
     }
 }

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

@@ -62,6 +62,7 @@ import android.widget.Toast;
 import android.widget.Toolbar;
 import androidx.activity.result.ActivityResult;
 import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.content.FileProvider;
 import androidx.core.graphics.Insets;
 import androidx.core.view.ViewCompat;
@@ -2576,8 +2577,13 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
             }
         }
 
+        boolean isBlankToolbar = _options != null && TextUtils.equals(_options.getToolbarType(), "blank");
+        if (isBlankToolbar) {
+            configureBlankToolbarLayout();
+        }
+
         // Special handling for Android 15+
-        if (isAndroid15Plus) {
+        if (isAndroid15Plus && !isBlankToolbar) {
             // Get AppBarLayout which contains the toolbar
             if (toolbarView != null && toolbarView.getParent() instanceof com.google.android.material.appbar.AppBarLayout appBarLayout) {
                 // Remove elevation to eliminate shadows (only on Android 15+)
@@ -2752,18 +2758,76 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
             _options.getEnabledSafeMargin()
         );
         int imeBottom = keyboardVisible ? ime.bottom : 0;
-        int navTop = SafeAreaInsetsSupport.resolveTopMargin(
+        boolean applyTopFallback = _options.getEnabledSafeTopMargin() && _options.getUseTopInset();
+        int fallbackTopInset = applyTopFallback ? getSystemStatusBarHeight() : 0;
+        int navTop = SafeAreaInsetsSupport.resolveTopMarginWithFallback(
             _options.getEnabledSafeTopMargin(),
             _options.getUseTopInset(),
             bars.top,
-            appBarHandlesTopInset
+            appBarHandlesTopInset,
+            fallbackTopInset,
+            applyTopFallback
         );
+        int bottomMargin = SafeAreaInsetsSupport.resolveBottomMargin(_options.getEnabledSafeMargin(), safeBottomInset, imeBottom);
 
         mlp.topMargin = navTop;
-        mlp.bottomMargin = SafeAreaInsetsSupport.resolveBottomMargin(_options.getEnabledSafeMargin(), safeBottomInset, imeBottom);
+        mlp.bottomMargin = bottomMargin;
         mlp.leftMargin = bars.left;
         mlp.rightMargin = bars.right;
         _webView.setLayoutParams(mlp);
+        injectSafeAreaCssVariables(navTop, bottomMargin, bars.left, bars.right);
+    }
+
+    private void configureBlankToolbarLayout() {
+        View appBarLayout = findViewById(R.id.app_bar_layout);
+        if (appBarLayout != null) {
+            appBarLayout.setVisibility(View.GONE);
+        }
+
+        View statusBarColorView = findViewById(R.id.status_bar_color_view);
+        if (statusBarColorView != null) {
+            statusBarColorView.setVisibility(View.GONE);
+        }
+
+        View contentBrowserLayout = findViewById(R.id.content_browser_layout);
+        if (contentBrowserLayout != null && contentBrowserLayout.getLayoutParams() instanceof CoordinatorLayout.LayoutParams) {
+            CoordinatorLayout.LayoutParams layoutParams = (CoordinatorLayout.LayoutParams) contentBrowserLayout.getLayoutParams();
+            layoutParams.setBehavior(null);
+            contentBrowserLayout.setLayoutParams(layoutParams);
+        }
+    }
+
+    private int getSystemStatusBarHeight() {
+        int resourceId = getContext().getResources().getIdentifier("status_bar_height", "dimen", "android");
+        if (resourceId <= 0) {
+            return 0;
+        }
+
+        return getContext().getResources().getDimensionPixelSize(resourceId);
+    }
+
+    private void injectSafeAreaCssVariables(int top, int bottom, int left, int right) {
+        if (_webView == null) {
+            return;
+        }
+
+        String script = String.format(
+            Locale.US,
+            "(function(){var root=document.documentElement;" +
+                "root.style.setProperty('--safe-area-inset-top','%dpx');" +
+                "root.style.setProperty('--safe-area-inset-bottom','%dpx');" +
+                "root.style.setProperty('--safe-area-inset-left','%dpx');" +
+                "root.style.setProperty('--safe-area-inset-right','%dpx');})();",
+            top,
+            bottom,
+            left,
+            right
+        );
+        _webView.post(() -> {
+            if (_webView != null) {
+                _webView.evaluateJavascript(script, null);
+            }
+        });
     }
 
     private View resolveSafeAreaInsetsSourceView() {
@@ -3595,6 +3659,8 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
             // Status bar color is already set at the top of this method, no need to set again
         } else if (TextUtils.equals(_options.getToolbarType(), "blank")) {
             _toolbar.setVisibility(View.GONE);
+            configureBlankToolbarLayout();
+            requestSafeAreaInsets();
 
             // Also set window background color to match status bar for blank toolbar
             View statusBarColorView = findViewById(R.id.status_bar_color_view);

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.29"
+    private let pluginVersion: String = "8.6.31"
     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

@@ -687,7 +687,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
@@ -1405,9 +1411,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
@@ -1629,7 +1633,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 +1739,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 +1829,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
@@ -2264,14 +2277,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 +2427,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 +2484,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)
         }
     }
 
@@ -2880,7 +2877,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 +2907,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 +2926,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 }
@@ -2950,7 +2947,7 @@ extension WKWebViewController: WKNavigationDelegate {
         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 }

package/package.json

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