@capgo/capacitor-inappbrowser 8.6.34 → 8.6.35

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.34"
+    private let pluginVersion: String = "8.6.35"
     public let identifier = "CapgoInAppBrowserPlugin"
     public let jsName = "CapgoInAppBrowser"
     public let pluginMethods: [CAPPluginMethod] = [
@@ -138,9 +138,6 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
     private var proxyBridges: [String: ProxyBridge] = [:]
     private var webViewStack: [String] = []
     private var activeWebViewId: String?
-    private weak var presentationContainerView: UIView?
-    private var presentationContainerWasInteractive = true
-    private var presentationContainerPreviousAlpha: CGFloat = 1
     private var hiddenWebViewContainers: [ObjectIdentifier: UIView] = [:]
     private var closeModalTitle: String?
     private var closeModalDescription: String?
@@ -181,6 +178,13 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         }
     }
 
+    private func dismissNavigationControllerIfPresented(_ navigationController: UINavigationController?) {
+        guard let navigationController, navigationController.presentingViewController != nil else {
+            return
+        }
+        navigationController.dismiss(animated: false)
+    }
+
     private func unregisterWebView(id: String) {
         if let webView = webViewControllers[id]?.capableWebView {
             cleanupHiddenWebViewContainer(for: webView)
@@ -1334,24 +1338,11 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
             self.isHidden = hidden
 
             if hidden {
-                if let navController = navigationController, navController.presentingViewController != nil {
-                    navController.view.isHidden = true
-                    navController.view.isUserInteractionEnabled = false
-                    if let containerView = navController.view.superview {
-                        if self.presentationContainerView == nil || self.presentationContainerView !== containerView {
-                            self.presentationContainerView = containerView
-                            self.presentationContainerWasInteractive = containerView.isUserInteractionEnabled
-                            self.presentationContainerPreviousAlpha = containerView.alpha
-                        }
-                        containerView.isUserInteractionEnabled = false
-                        containerView.alpha = 0
-                    }
-                }
-
                 if !self.attachWebViewToWindow(webView) {
                     call?.reject("Failed to get active window for hidden webview")
                     return
                 }
+                self.dismissNavigationControllerIfPresented(navigationController)
             } else {
                 if webView.superview !== webViewController.view {
                     self.attachWebViewToController(webViewController, webView: webView)
@@ -1361,15 +1352,6 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
                     if let resolvedId {
                         self.setActiveWebView(id: resolvedId, webView: webViewController, navigationController: navController)
                     }
-                    navController.view.isHidden = false
-                    navController.view.isUserInteractionEnabled = true
-                    if let containerView = self.presentationContainerView {
-                        containerView.isUserInteractionEnabled = self.presentationContainerWasInteractive
-                        containerView.alpha = self.presentationContainerPreviousAlpha
-                        self.presentationContainerView = nil
-                        self.presentationContainerWasInteractive = true
-                        self.presentationContainerPreviousAlpha = 1
-                    }
 
                     if navController.presentingViewController == nil {
                         let presenter = self.bridge?.viewController?.presentedViewController ?? self.bridge?.viewController

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-inappbrowser",
-  "version": "8.6.34",
+  "version": "8.6.35",
   "description": "Capacitor plugin in app browser",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",