@capgo/capacitor-native-navigation 8.4.0 → 8.4.1

package/android/build.gradle

@@ -3,7 +3,6 @@ ext {
     androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.1'
     androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.3.0'
     androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.7.0'
-    materialVersion = project.hasProperty('materialVersion') ? rootProject.ext.materialVersion : '1.12.0'
 }
 
 buildscript {
@@ -54,7 +53,6 @@ dependencies {
     implementation project(':capacitor-android')
     annotationProcessor project(':capacitor-android')
     implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
-    implementation "com.google.android.material:material:$materialVersion"
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"

package/android/src/main/java/app/capgo/nativenavigation/NativeNavigationPlugin.java

@@ -1883,18 +1883,29 @@ public class NativeNavigationPlugin extends Plugin {
     }
 
     private JSObject currentInsets() {
+        // View layout uses device pixels; CSS variables must be density-independent
+        // or a 3x screen writes `192px` which CSS treats as 192 CSS px.
         int top = navbarVisible ? statusBarInset() + dp(DEFAULT_NAVBAR_DP) : 0;
         int bottom = tabbarVisible ? navigationBarInset() + dp(tabbarStyle.totalHeight()) + dp(tabbarStyle.bottomGap) : 0;
         JSObject insets = new JSObject();
-        insets.put("top", top);
+        insets.put("top", cssPx(top));
         insets.put("right", 0);
-        insets.put("bottom", bottom);
+        insets.put("bottom", cssPx(bottom));
         insets.put("left", 0);
-        insets.put("navbarHeight", top);
-        insets.put("tabbarHeight", bottom);
+        insets.put("navbarHeight", cssPx(top));
+        insets.put("tabbarHeight", cssPx(bottom));
         return insets;
     }
 
+    /** Converts a layout pixel value to CSS pixels for WebView CSS variables. */
+    private int cssPx(int devicePx) {
+        float density = getContext().getResources().getDisplayMetrics().density;
+        if (density <= 0f) {
+            return devicePx;
+        }
+        return Math.round(devicePx / density);
+    }
+
     private JSObject insetsResult() {
         JSObject result = new JSObject();
         result.put("insets", currentInsets());

package/ios/Sources/NativeNavigationPlugin/NativeNavigationPlugin.swift

@@ -69,6 +69,7 @@ public class NativeNavigationPlugin: CAPPlugin, CAPBridgedPlugin, UITabBarContro
     private var tabBaseImages: [UIImage?] = []
     private var tabSelectedImages: [UIImage?] = []
     private var suppressTabSelectEvent = false
+    private var tabSelectEmittedForReTap = false
     private var transitionSnapshot: UIView?
     private var activeTransitionId: String?
     private var activeTransitionDirection = "forward"
@@ -543,17 +544,27 @@ public class NativeNavigationPlugin: CAPPlugin, CAPBridgedPlugin, UITabBarContro
         if usesSystemLiquidGlass {
             hostWebView(in: viewController)
         }
+        tabSelectEmittedForReTap = false
+        if !suppressTabSelectEvent,
+           tabBarController.selectedViewController === viewController {
+            notifyTabSelect(index: viewController.tabBarItem.tag)
+            tabSelectEmittedForReTap = true
+        }
         return true
     }
 
     public func tabBarController(_ tabBarController: UITabBarController, didSelect viewController: UIViewController) {
         guard !suppressTabSelectEvent else {
+            tabSelectEmittedForReTap = false
             hostWebViewInSelectedSystemTab()
             return
         }
         let index = viewController.tabBarItem.tag
         hostWebViewInSelectedSystemTab()
-        notifyTabSelect(index: index)
+        if !tabSelectEmittedForReTap {
+            notifyTabSelect(index: index)
+        }
+        tabSelectEmittedForReTap = false
     }
 
     private func notifyTabSelect(index: Int) {
@@ -1791,7 +1802,13 @@ public class NativeNavigationPlugin: CAPPlugin, CAPBridgedPlugin, UITabBarContro
 
         if let container = systemTabRootContainer {
             container.frame = rootView.bounds
-            webView?.frame = container.bounds
+            // Capacitor's root view is the WKWebView. After the webview is
+            // hosted in a tab content controller, stretching it to this
+            // container's full bounds overflows the tab VC (clipsToBounds is
+            // off) and paints over the system tab bar.
+            if !isWebViewHostedInSystemTabController {
+                webView?.frame = container.bounds
+            }
         }
 
         if let container = navContainer {
@@ -1852,8 +1869,11 @@ public class NativeNavigationPlugin: CAPPlugin, CAPBridgedPlugin, UITabBarContro
 
     private func bringChromeToFront() {
         if usesSystemLiquidGlass && tabbarStyle.shape != .curve {
+            if let tabBarController = tabBarController {
+                (systemTabRootContainer ?? bridge?.viewController?.view)?.bringSubviewToFront(tabBarController.view)
+            }
             if let navContainer = navContainer {
-                bridge?.viewController?.view.bringSubviewToFront(navContainer)
+                (systemTabRootContainer ?? bridge?.viewController?.view)?.bringSubviewToFront(navContainer)
             }
             bringLiftedWebViewOverlaysToFront()
             return
@@ -1975,7 +1995,12 @@ public class NativeNavigationPlugin: CAPPlugin, CAPBridgedPlugin, UITabBarContro
         let usesSystemTabbar = usesSystemLiquidGlass && tabbarStyle.shape != .curve
         let nativeTabHeight = max(tabBar?.frame.height ?? 0, 49 + safeInsets.bottom)
         let customTabHeight = tabbarHeight + safeInsets.bottom + tabbarStyle.bottomGap
-        let tabHeight = isEnabled && tabbarVisible ? (usesSystemTabbar ? nativeTabHeight : customTabHeight) : 0
+        // Hosted in the tab content VC: the WebView already ends above the
+        // bar. Reporting the bar height as CSS overlap lifts the FAB by a
+        // second bar.
+        let tabHeight = isEnabled && tabbarVisible && !isWebViewHostedInSystemTabController
+            ? (usesSystemTabbar ? nativeTabHeight : customTabHeight)
+            : 0
         return [
             "top": navHeight,
             "right": safeInsets.right,
@@ -2674,6 +2699,7 @@ final class NativeNavigationTabContentController: UIViewController {
         let view = UIView()
         view.backgroundColor = .systemBackground
         view.isOpaque = true
+        view.clipsToBounds = true
         self.view = view
     }
 
@@ -2714,7 +2740,8 @@ final class NativeNavigationTabContentController: UIViewController {
         snapshotPlaceholder = nil
         hostedWebView = webView
         if webView.superview !== view {
-            webView.removeFromSuperview()
+            // addSubview reparents in one step. removeFromSuperview() first
+            // leaves a frame of this VC's backing colour (system white).
             view.addSubview(webView)
         }
         webView.autoresizingMask = [.flexibleWidth, .flexibleHeight]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-native-navigation",
-  "version": "8.4.0",
+  "version": "8.4.1",
   "description": "Capacitor plugin for native navbar, tabbar, safe-area handling, and WebView snapshot transitions.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",