@capgo/capacitor-inappbrowser 8.13.0 → 8.13.2

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

@@ -94,4 +94,40 @@ final class SafeAreaInsetsSupport {
 
         return fallbackTopInset;
     }
+
+    /**
+     * Bottom padding to apply to the WebView container (a SwipeRefreshLayout, which honours its own
+     * padding but ignores child margins). Combines the resolved safe bottom inset with a compensation
+     * term: on Android 15+ the AppBarLayout is pushed down by the status-bar height, which shifts the
+     * container's bottom edge off-screen by that same amount, so it must be added back as padding
+     * regardless of the safe-margin option.
+     */
+    static int resolveContainerBottomPadding(
+        boolean enabledSafeBottomMargin,
+        int safeBottomInset,
+        boolean appBarHandlesTopInset,
+        int statusBarTop
+    ) {
+        int base = enabledSafeBottomMargin ? Math.max(0, safeBottomInset) : 0;
+        int appBarCompensation = appBarHandlesTopInset ? Math.max(0, statusBarTop) : 0;
+        return base + appBarCompensation;
+    }
+
+    /**
+     * Top padding for the WebView container. When the AppBarLayout handles the top inset it already
+     * sits below the status bar, so no additional padding is needed; otherwise the status-bar height
+     * is applied when the safe-top options request it.
+     */
+    static int resolveContainerTopPadding(
+        boolean enabledSafeTopMargin,
+        boolean useTopInset,
+        int statusBarTop,
+        boolean appBarHandlesTopInset
+    ) {
+        if (appBarHandlesTopInset || !enabledSafeTopMargin || !useTopInset) {
+            return 0;
+        }
+
+        return Math.max(0, statusBarTop);
+    }
 }

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

@@ -3147,6 +3147,9 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
         }
 
         requestSafeAreaInsets();
+
+        mainHandler.postDelayed(this::applyContainerInsetsSnapshot, 300);
+        mainHandler.postDelayed(this::applyContainerInsetsSnapshot, 1200);
     }
 
     private void applySafeAreaMargins(
@@ -3202,6 +3205,76 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
         mlp.rightMargin = bars.right;
         _webView.setLayoutParams(mlp);
         injectSafeAreaCssVariables(navTop, bottomMargin, bars.left, bars.right);
+        applyContainerInsetsSnapshot();
+    }
+
+    private void applyContainerInsetsSnapshot() {
+        if (_options == null || _webView == null) {
+            return;
+        }
+
+        View container = findViewById(R.id.content_browser_layout);
+        if (container == null) {
+            return;
+        }
+
+        Window window = getWindow();
+        View decorView = window != null ? window.getDecorView() : null;
+        WindowInsetsCompat windowInsets = decorView != null ? ViewCompat.getRootWindowInsets(decorView) : null;
+
+        Insets bars = windowInsets != null ? windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()) : Insets.NONE;
+        Insets navigationBars = windowInsets != null ? windowInsets.getInsets(WindowInsetsCompat.Type.navigationBars()) : Insets.NONE;
+        Insets systemGestures = windowInsets != null ? windowInsets.getInsets(WindowInsetsCompat.Type.systemGestures()) : Insets.NONE;
+        Insets mandatoryGestures =
+            windowInsets != null ? windowInsets.getInsets(WindowInsetsCompat.Type.mandatorySystemGestures()) : Insets.NONE;
+
+        boolean isAndroid15Plus = Build.VERSION.SDK_INT >= 35;
+        View toolbarView = findViewById(R.id.tool_bar);
+        boolean appBarHandlesTopInset =
+            isAndroid15Plus &&
+            !TextUtils.equals(_options.getToolbarType(), "blank") &&
+            toolbarView != null &&
+            toolbarView.getVisibility() == View.VISIBLE &&
+            toolbarView.getParent() instanceof com.google.android.material.appbar.AppBarLayout;
+
+        int statusBarTop = bars.top > 0 ? bars.top : getSystemStatusBarHeight();
+        int fallbackBottomInset = _options.getEnabledSafeMargin() ? getSystemNavigationBarHeight() : 0;
+        int safeBottomInset = SafeAreaInsetsSupport.resolveSafeBottomInsetWithFallback(
+            bars.bottom,
+            navigationBars.bottom,
+            systemGestures.bottom,
+            mandatoryGestures.bottom,
+            bars.left,
+            bars.right,
+            navigationBars.left,
+            navigationBars.right,
+            fallbackBottomInset,
+            _options.getEnabledSafeMargin()
+        );
+
+        int padTop = SafeAreaInsetsSupport.resolveContainerTopPadding(
+            _options.getEnabledSafeTopMargin(),
+            _options.getUseTopInset(),
+            statusBarTop,
+            appBarHandlesTopInset
+        );
+        int padBottom = SafeAreaInsetsSupport.resolveContainerBottomPadding(
+            _options.getEnabledSafeMargin(),
+            safeBottomInset,
+            appBarHandlesTopInset,
+            statusBarTop
+        );
+
+        if (
+            container.getPaddingLeft() == bars.left &&
+            container.getPaddingTop() == padTop &&
+            container.getPaddingRight() == bars.right &&
+            container.getPaddingBottom() == padBottom
+        ) {
+            return;
+        }
+
+        container.setPadding(bars.left, padTop, bars.right, padBottom);
     }
 
     private void configureBlankToolbarLayout() {
@@ -3285,7 +3358,10 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
         }
 
         ViewCompat.requestApplyInsets(insetsSourceView);
-        insetsSourceView.post(() -> ViewCompat.requestApplyInsets(insetsSourceView));
+        insetsSourceView.post(() -> {
+            ViewCompat.requestApplyInsets(insetsSourceView);
+            applyContainerInsetsSnapshot();
+        });
     }
 
     public void postMessageToJS(Object detail) {

package/ios/Sources/InAppBrowserPlugin/InAppBrowserPlugin.swift

@@ -320,7 +320,7 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         case aware = "AWARE"
         case fakeVisible = "FAKE_VISIBLE"
     }
-    private let pluginVersion: String = "8.13.0"
+    private let pluginVersion: String = "8.13.2"
     public let identifier = "CapgoInAppBrowserPlugin"
     public let jsName = "CapgoInAppBrowser"
     public let pluginMethods: [CAPPluginMethod] = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-inappbrowser",
-  "version": "8.13.0",
+  "version": "8.13.2",
   "description": "Capacitor plugin in app browser",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -68,7 +68,7 @@
     "@ionic/prettier-config": "^4.0.0",
     "@ionic/swiftlint-config": "^2.0.0",
     "@types/node": "^24.10.1",
-    "esbuild": "^0.27.3",
+    "esbuild": "^0.28.0",
     "eslint": "^8.57.1",
     "eslint-plugin-import": "^2.31.0",
     "husky": "^9.1.7",