@capgo/capacitor-native-navigation 8.0.13 → 8.0.15

package/{CapgoNativeNavigation.podspec → CapgoCapacitorNativeNavigation.podspec}

@@ -3,7 +3,7 @@ require 'json'
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
 Pod::Spec.new do |s|
-  s.name = 'CapgoNativeNavigation'
+  s.name = 'CapgoCapacitorNativeNavigation'
   s.version = package['version']
   s.summary = package['description']
   s.license = package['license']

package/Package.swift

@@ -2,11 +2,11 @@
 import PackageDescription
 
 let package = Package(
-    name: "CapgoNativeNavigation",
+    name: "CapgoCapacitorNativeNavigation",
     platforms: [.iOS(.v15)],
     products: [
         .library(
-            name: "CapgoNativeNavigation",
+            name: "CapgoCapacitorNativeNavigation",
             targets: ["NativeNavigationPlugin"])
     ],
     dependencies: [

package/ios/Sources/NativeNavigationPlugin/NativeNavigationPlugin.swift

@@ -553,7 +553,7 @@ public class NativeNavigationPlugin: CAPPlugin, CAPBridgedPlugin, UITabBarContro
 
         if let parent = bridge?.viewController {
             parent.addChild(controller)
-            parent.view.addSubview(controller.view)
+            insertSystemTabControllerView(controller.view, in: parent.view)
             controller.didMove(toParent: parent)
         }
 
@@ -633,6 +633,43 @@ public class NativeNavigationPlugin: CAPPlugin, CAPBridgedPlugin, UITabBarContro
         originalWebViewAutoresizingMask = webView.autoresizingMask
     }
 
+    private func insertSystemTabControllerView(_ controllerView: UIView, in parentView: UIView) {
+        guard let webView = webView else {
+            parentView.addSubview(controllerView)
+            return
+        }
+
+        captureOriginalWebViewPlacementIfNeeded(webView)
+        let insertionIndex = systemTabControllerInsertionIndex(in: parentView, for: webView)
+        parentView.insertSubview(controllerView, at: insertionIndex)
+    }
+
+    private func systemTabControllerInsertionIndex(in parentView: UIView, for webView: UIView) -> Int {
+        if let directChild = directChild(of: parentView, containing: webView),
+           let index = parentView.subviews.firstIndex(of: directChild) {
+            return min(index, parentView.subviews.count)
+        }
+
+        if let originalWebViewSuperview = originalWebViewSuperview,
+           originalWebViewSuperview === parentView {
+            return min(originalWebViewIndex ?? parentView.subviews.count, parentView.subviews.count)
+        }
+
+        return parentView.subviews.count
+    }
+
+    private func directChild(of ancestor: UIView, containing descendant: UIView) -> UIView? {
+        var current: UIView? = descendant
+        while let view = current, let superview = view.superview {
+            if superview === ancestor {
+                return view
+            }
+            current = superview
+        }
+
+        return nil
+    }
+
     private func hostWebViewInSelectedSystemTab() {
         guard usesSystemLiquidGlass,
               let webView = webView,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-native-navigation",
-  "version": "8.0.13",
+  "version": "8.0.15",
   "description": "Capacitor plugin for native navbar, tabbar, and route transition chrome over a WebView.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -14,7 +14,7 @@
     "ios/Sources",
     "ios/Tests",
     "Package.swift",
-    "CapgoNativeNavigation.podspec"
+    "CapgoCapacitorNativeNavigation.podspec"
   ],
   "author": "Martin Donadieu <martin@capgo.app>",
   "license": "MPL-2.0",
@@ -35,7 +35,7 @@
   ],
   "scripts": {
     "verify": "bun run verify:ios && bun run verify:android && bun run verify:web",
-    "verify:ios": "xcodebuild -scheme CapgoNativeNavigation -destination generic/platform=iOS",
+    "verify:ios": "xcodebuild -scheme CapgoCapacitorNativeNavigation -destination generic/platform=iOS",
     "verify:android": "cd android && ./gradlew clean build test && cd ..",
     "verify:web": "bun run build",
     "lint": "bun run eslint && bun run prettier -- --check && bun run swiftlint -- lint",