@capgo/capacitor-inappbrowser 8.7.0-beta.pr596.340.1 → 8.7.0-beta.pr598.346.1

package/ios/Sources/InAppBrowserPlugin/InAppBrowserPlugin.swift

@@ -190,16 +190,11 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         }
     }
 
-    private func dismissNavigationControllerIfPresented(_ navigationController: UINavigationController?, completion: (() -> Void)? = nil) {
-        guard let navigationController else {
-            completion?()
-            return
-        }
-        guard navigationController.presentingViewController != nil else {
-            completion?()
+    private func dismissNavigationControllerIfPresented(_ navigationController: UINavigationController?) {
+        guard let navigationController, navigationController.presentingViewController != nil else {
             return
         }
-        navigationController.dismiss(animated: false, completion: completion)
+        navigationController.dismiss(animated: false)
     }
 
     private func unregisterWebView(id: String) {
@@ -451,6 +446,7 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         }
 
         dismissActiveKeyboard()
+        dismissNavigationControllerIfPresented(navigationController)
         navigationController.view.removeFromSuperview()
         if transparentBackground {
             makeHostWebViewTransparent(for: id)
@@ -1606,16 +1602,14 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
             }
 
             let transparentBackground = call.getBool("transparentBackground", true)
-            self.dismissNavigationControllerIfPresented(navigationController) {
-                webViewController.isLayeredBehind = true
-                webViewController.transparentHostBackground = transparentBackground
-                guard self.sendNavigationControllerToBack(id: resolvedId, transparentBackground: transparentBackground) else {
-                    call.reject("Failed to send webview to back")
-                    return
-                }
-                self.setActiveWebView(id: resolvedId, webView: webViewController, navigationController: navigationController)
-                call.resolve()
+            webViewController.isLayeredBehind = true
+            webViewController.transparentHostBackground = transparentBackground
+            guard self.sendNavigationControllerToBack(id: resolvedId, transparentBackground: transparentBackground) else {
+                call.reject("Failed to send webview to back")
+                return
             }
+            self.setActiveWebView(id: resolvedId, webView: webViewController, navigationController: navigationController)
+            call.resolve()
         }
     }
 

package/ios/Sources/InAppBrowserPlugin/WKWebViewController.swift

@@ -756,40 +756,62 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
         return windowScene?.statusBarManager?.statusBarFrame.height ?? 0
     }
 
-    // Make status bar background with colored view underneath
-    open func setupStatusBarBackground(color: UIColor) {
-        // Remove any existing status bar view
-        statusBarBackgroundView?.removeFromSuperview()
+    private func applyNavigationBarBackground(color: UIColor) {
+        guard let navigationBar = navigationController?.navigationBar else {
+            return
+        }
 
-        // Create a new view to cover both status bar and navigation bar
-        statusBarBackgroundView = UIView()
+        navigationBar.backgroundColor = color
+        navigationBar.barTintColor = color
+        navigationBar.isTranslucent = false
+        navigationBar.setBackgroundImage(UIImage(), for: .default)
+        navigationBar.shadowImage = UIImage()
+        navigationBar.setValue(true, forKey: "hidesShadow")
 
-        if let navView = navigationController?.view {
-            // Add to back of view hierarchy
-            navView.insertSubview(statusBarBackgroundView!, at: 0)
-            statusBarBackgroundView?.translatesAutoresizingMaskIntoConstraints = false
+        if #available(iOS 13.0, *) {
+            let appearance = UINavigationBarAppearance()
+            appearance.configureWithOpaqueBackground()
+            appearance.backgroundColor = color
+            appearance.backgroundEffect = nil
+            appearance.shadowColor = .clear
+            appearance.shadowImage = UIImage()
 
-            // Calculate total height - status bar + navigation bar
-            let navBarHeight = navigationController?.navigationBar.frame.height ?? 44
-            let totalHeight = (navigationController?.view.safeAreaInsets.top ?? CGFloat(0)) + navBarHeight
+            if let titleTextAttributes = navigationBar.titleTextAttributes {
+                appearance.titleTextAttributes = titleTextAttributes
+            }
+            if let largeTitleTextAttributes = navigationBar.largeTitleTextAttributes {
+                appearance.largeTitleTextAttributes = largeTitleTextAttributes
+            }
 
-            // Position from top of screen to bottom of navigation bar
-            NSLayoutConstraint.activate([
-                statusBarBackgroundView!.topAnchor.constraint(equalTo: navView.topAnchor),
-                statusBarBackgroundView!.leadingAnchor.constraint(equalTo: navView.leadingAnchor),
-                statusBarBackgroundView!.trailingAnchor.constraint(equalTo: navView.trailingAnchor),
-                statusBarBackgroundView!.heightAnchor.constraint(equalToConstant: totalHeight)
-            ])
+            navigationBar.standardAppearance = appearance
+            navigationBar.compactAppearance = appearance
+            navigationBar.scrollEdgeAppearance = appearance
+            navigationBar.compactScrollEdgeAppearance = appearance
+        }
+    }
 
-            // Set background color
-            statusBarBackgroundView?.backgroundColor = color
+    // Make status bar background with colored view underneath
+    open func setupStatusBarBackground(color: UIColor) {
+        statusBarBackgroundView?.removeFromSuperview()
+        statusBarBackgroundView = UIView()
 
-            // Make navigation bar transparent to show our view underneath
-            navigationController?.navigationBar.setBackgroundImage(UIImage(), for: .default)
-            navigationController?.navigationBar.shadowImage = UIImage()
-            navigationController?.navigationBar.isTranslucent = true
-            navigationController?.navigationBar.isTranslucent = true
+        guard let navController = navigationController,
+              let navView = navController.view,
+              let statusBarBackgroundView else {
+            return
         }
+        navView.insertSubview(statusBarBackgroundView, at: 0)
+        statusBarBackgroundView.translatesAutoresizingMaskIntoConstraints = false
+        statusBarBackgroundView.backgroundColor = color
+
+        NSLayoutConstraint.activate([
+            statusBarBackgroundView.topAnchor.constraint(equalTo: navView.topAnchor),
+            statusBarBackgroundView.leadingAnchor.constraint(equalTo: navView.leadingAnchor),
+            statusBarBackgroundView.trailingAnchor.constraint(equalTo: navView.trailingAnchor),
+            statusBarBackgroundView.bottomAnchor.constraint(equalTo: navController.navigationBar.bottomAnchor, constant: 1)
+        ])
+
+        applyNavigationBarBackground(color: color)
     }
 
     // Override to use our custom status bar style

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-inappbrowser",
-  "version": "8.7.0-beta.pr596.340.1",
+  "version": "8.7.0-beta.pr598.346.1",
   "description": "Capacitor plugin in app browser",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",