@capgo/capacitor-inappbrowser 8.6.26 → 8.6.28

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

@@ -13,6 +13,34 @@ final class SafeAreaInsetsSupport {
         return Math.max(systemBarsBottom, Math.max(navigationBarsBottom, Math.max(systemGesturesBottom, mandatoryGesturesBottom)));
     }
 
+    static int resolveSafeBottomInsetWithFallback(
+        int systemBarsBottom,
+        int navigationBarsBottom,
+        int systemGesturesBottom,
+        int mandatoryGesturesBottom,
+        int systemBarsLeft,
+        int systemBarsRight,
+        int navigationBarsLeft,
+        int navigationBarsRight,
+        int fallbackBottomInset,
+        boolean applyFallbackWhenZero
+    ) {
+        int inset = resolveSafeBottomInset(systemBarsBottom, navigationBarsBottom, systemGesturesBottom, mandatoryGesturesBottom);
+        if (inset > 0 || !applyFallbackWhenZero || fallbackBottomInset <= 0) {
+            return inset;
+        }
+
+        if (hasSideNavigationBarInsets(systemBarsLeft, systemBarsRight, navigationBarsLeft, navigationBarsRight)) {
+            return 0;
+        }
+
+        return fallbackBottomInset;
+    }
+
+    static boolean hasSideNavigationBarInsets(int systemBarsLeft, int systemBarsRight, int navigationBarsLeft, int navigationBarsRight) {
+        return systemBarsLeft > 0 || systemBarsRight > 0 || navigationBarsLeft > 0 || navigationBarsRight > 0;
+    }
+
     static int resolveBottomMargin(boolean enabledSafeBottomMargin, int safeBottomInset, int imeBottom) {
         int bottomInset = enabledSafeBottomMargin ? safeBottomInset : 0;
         return Math.max(bottomInset, imeBottom);

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

@@ -2626,10 +2626,9 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
             }
         }
 
-        View coordinatorView = findViewById(R.id.coordinator_layout);
-        final View insetsSourceView = coordinatorView != null ? coordinatorView : _webView;
+        // Resolve insets from the dialog window root; layout children can receive already-fitted zero insets.
+        final View insetsSourceView = resolveSafeAreaInsetsSourceView();
 
-        // Resolve insets from the dialog root; child WebViews can receive already-fitted zero insets.
         ViewCompat.setOnApplyWindowInsetsListener(insetsSourceView, (v, windowInsets) -> {
             Insets bars = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
             Insets navigationBars = windowInsets.getInsets(WindowInsetsCompat.Type.navigationBars());
@@ -2738,11 +2737,18 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
             return;
         }
 
-        int safeBottomInset = SafeAreaInsetsSupport.resolveSafeBottomInset(
+        int fallbackBottomInset = _options.getEnabledSafeMargin() ? getSystemNavigationBarHeight() : 0;
+        int safeBottomInset = SafeAreaInsetsSupport.resolveSafeBottomInsetWithFallback(
             bars.bottom,
             navigationBars.bottom,
             systemGestures.bottom,
-            mandatoryGestures.bottom
+            mandatoryGestures.bottom,
+            bars.left,
+            bars.right,
+            navigationBars.left,
+            navigationBars.right,
+            fallbackBottomInset,
+            _options.getEnabledSafeMargin()
         );
         int imeBottom = keyboardVisible ? ime.bottom : 0;
         int navTop = SafeAreaInsetsSupport.resolveTopMargin(
@@ -2759,9 +2765,30 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
         _webView.setLayoutParams(mlp);
     }
 
-    private void requestSafeAreaInsets() {
+    private View resolveSafeAreaInsetsSourceView() {
+        Window window = getWindow();
+        if (window != null) {
+            View decorView = window.getDecorView();
+            if (decorView != null) {
+                return decorView;
+            }
+        }
+
         View coordinatorView = findViewById(R.id.coordinator_layout);
-        View insetsSourceView = coordinatorView != null ? coordinatorView : _webView;
+        return coordinatorView != null ? coordinatorView : _webView;
+    }
+
+    private int getSystemNavigationBarHeight() {
+        int resourceId = getContext().getResources().getIdentifier("navigation_bar_height", "dimen", "android");
+        if (resourceId <= 0) {
+            return 0;
+        }
+
+        return getContext().getResources().getDimensionPixelSize(resourceId);
+    }
+
+    private void requestSafeAreaInsets() {
+        View insetsSourceView = resolveSafeAreaInsetsSourceView();
         if (insetsSourceView == null) {
             return;
         }

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.26"
+    private let pluginVersion: String = "8.6.28"
     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.6.26",
+  "version": "8.6.28",
   "description": "Capacitor plugin in app browser",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -55,8 +55,7 @@
     "maestro:test:android:keyboard": "export MAESTRO_DRIVER_STARTUP_TIMEOUT=300000 MAESTRO_CLI_NO_ANALYTICS=1 && sh ./scripts/prepare-android-maestro-device.sh && sh ./scripts/install-android-apk-with-retry.sh example-app/android/app/build/outputs/apk/debug/app-debug.apk && sh ./scripts/start-android-maestro-app.sh app.capgo.inappbrowser app.capgo.inappbrowser/.MainActivity && $HOME/.maestro/bin/maestro test -e APP_ID=app.capgo.inappbrowser example-app/.maestro/keyboard-regression-android.yaml",
     "check:wiring": "node scripts/check-capacitor-plugin-wiring.mjs",
     "example:install": "cd example-app && bun install --frozen-lockfile",
-    "example:build": "bun run build && cd example-app && bun install --frozen-lockfile && bun run build",
-    "example:capgo:deploy": "bun run example:build && bun scripts/deploy-example-capgo.mjs"
+    "example:build": "bun run build && cd example-app && bun install --frozen-lockfile && bun run build"
   },
   "devDependencies": {
     "@capacitor/android": "^8.0.0",