@capgo/capacitor-native-navigation 8.0.13 → 8.0.15-beta.pr12.18.1

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

@@ -44,6 +44,7 @@ public class NativeNavigationPlugin: CAPPlugin, CAPBridgedPlugin, UITabBarContro
     private var tabBar: UITabBar?
     private var tabBarController: NativeNavigationTabController?
     private var tabViewControllers: [UIViewController] = []
+    private weak var systemTabRootContainer: UIView?
     private weak var originalWebViewSuperview: UIView?
     private var originalWebViewIndex: Int?
     private var originalWebViewAutoresizingMask: UIView.AutoresizingMask?
@@ -552,8 +553,9 @@ public class NativeNavigationPlugin: CAPPlugin, CAPBridgedPlugin, UITabBarContro
         controller.view.isHidden = !tabbarVisible
 
         if let parent = bridge?.viewController {
+            let containerView = systemTabHostingContainerView(in: parent)
             parent.addChild(controller)
-            parent.view.addSubview(controller.view)
+            insertSystemTabControllerView(controller.view, in: containerView)
             controller.didMove(toParent: parent)
         }
 
@@ -563,6 +565,49 @@ public class NativeNavigationPlugin: CAPPlugin, CAPBridgedPlugin, UITabBarContro
         return controller.tabBar
     }
 
+    private func systemTabHostingContainerView(in parent: UIViewController) -> UIView {
+        if let systemTabRootContainer = systemTabRootContainer {
+            return systemTabRootContainer
+        }
+
+        guard let webView = webView,
+              parent.view === webView else {
+            return parent.view
+        }
+
+        let previousSuperview = webView.superview
+        let previousIndex = previousSuperview?.subviews.firstIndex(of: webView)
+        let previousFrame = webView.frame
+        let previousAutoresizingMask = webView.autoresizingMask
+        let container = UIView(frame: previousFrame)
+        container.backgroundColor = .clear
+        container.isOpaque = false
+        container.autoresizingMask = previousAutoresizingMask.isEmpty ? [.flexibleWidth, .flexibleHeight] : previousAutoresizingMask
+
+        if let previousSuperview = previousSuperview {
+            previousSuperview.insertSubview(container, at: min(previousIndex ?? previousSuperview.subviews.count, previousSuperview.subviews.count))
+        }
+
+        parent.view = container
+        container.addSubview(webView)
+        webView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+        webView.frame = container.bounds
+        moveNativeChrome(from: webView, to: container)
+
+        systemTabRootContainer = container
+        originalWebViewSuperview = container
+        originalWebViewIndex = 0
+        originalWebViewAutoresizingMask = webView.autoresizingMask
+        return container
+    }
+
+    private func moveNativeChrome(from webView: UIView, to container: UIView) {
+        if let navContainer = navContainer,
+           navContainer.superview === webView {
+            container.addSubview(navContainer)
+        }
+    }
+
     private func applySystemTabBarItems(_ items: [UITabBarItem], selectedIndex: Int?, animated: Bool) {
         guard let tabBarController = tabBarController else {
             return
@@ -633,6 +678,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,
@@ -642,7 +724,10 @@ public class NativeNavigationPlugin: CAPPlugin, CAPBridgedPlugin, UITabBarContro
 
         captureOriginalWebViewPlacementIfNeeded(webView)
         clearHostedWebViews(matching: webView, except: selectedController)
-        selectedController.host(webView: webView)
+        guard selectedController.host(webView: webView) else {
+            isWebViewHostedInSystemTabController = false
+            return
+        }
         clearHostedWebViews(matching: webView, except: selectedController)
         isWebViewHostedInSystemTabController = true
     }
@@ -1330,7 +1415,7 @@ private final class NativeNavigationBar: UINavigationBar {
     }
 }
 
-private final class NativeNavigationTabController: UITabBarController {
+final class NativeNavigationTabController: UITabBarController {
     override func viewDidLoad() {
         super.viewDidLoad()
         view.backgroundColor = .clear
@@ -1339,7 +1424,7 @@ private final class NativeNavigationTabController: UITabBarController {
     }
 }
 
-private final class NativeNavigationTabContentController: UIViewController {
+final class NativeNavigationTabContentController: UIViewController {
     private weak var hostedWebView: UIView?
 
     override func loadView() {
@@ -1365,16 +1450,21 @@ private final class NativeNavigationTabContentController: UIViewController {
         hostedWebView = nil
     }
 
-    func host(webView: UIView) {
-        if hostedWebView !== webView {
-            hostedWebView = webView
+    @discardableResult
+    func host(webView: UIView) -> Bool {
+        guard view !== webView, !view.isDescendant(of: webView) else {
+            hostedWebView = nil
+            return false
         }
+
+        hostedWebView = webView
         if webView.superview !== view {
             webView.removeFromSuperview()
             view.addSubview(webView)
         }
         webView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
         webView.frame = view.bounds
+        return true
     }
 }
 

package/ios/Tests/NativeNavigationPluginTests/NativeNavigationTests.swift

@@ -1,19 +1,37 @@
 import XCTest
+import UIKit
 @testable import NativeNavigationPlugin
 
 class NativeNavigationTests: XCTestCase {
-    func testEcho() {
-        let implementation = NativeNavigation()
-        let value = "Hello, World!"
-        let result = implementation.echo(value)
-
-        XCTAssertEqual(value, result)
-    }
-
     func testGetPluginVersion() {
         let implementation = NativeNavigation()
         let result = implementation.getPluginVersion()
 
         XCTAssertEqual("native", result)
     }
+
+    func testTabContentControllerHostsWebView() {
+        let webView = UIView()
+        let originalContainer = UIView()
+        let controller = NativeNavigationTabContentController()
+        _ = controller.view
+
+        originalContainer.addSubview(webView)
+
+        XCTAssertTrue(controller.host(webView: webView))
+        XCTAssertEqual(webView.superview, controller.view)
+        XCTAssertEqual(webView.frame, controller.view.bounds)
+    }
+
+    func testTabContentControllerRejectsLayerCycle() {
+        let webView = UIView()
+        let controller = NativeNavigationTabContentController()
+        _ = controller.view
+
+        webView.addSubview(controller.view)
+
+        XCTAssertFalse(controller.host(webView: webView))
+        XCTAssertNil(webView.superview)
+        XCTAssertEqual(controller.view.superview, webView)
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-native-navigation",
-  "version": "8.0.13",
+  "version": "8.0.15-beta.pr12.18.1",
   "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",