@capgo/capacitor-inappbrowser 8.10.3-beta.pr621.476.1 → 8.10.4

package/ios/Sources/InAppBrowserPlugin/InAppBrowserPlugin.swift

@@ -199,7 +199,7 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         case aware = "AWARE"
         case fakeVisible = "FAKE_VISIBLE"
     }
-    private let pluginVersion: String = "8.10.3"
+    private let pluginVersion: String = "8.10.4"
     public let identifier = "CapgoInAppBrowserPlugin"
     public let jsName = "CapgoInAppBrowser"
     public let pluginMethods: [CAPPluginMethod] = [

package/ios/Sources/InAppBrowserPlugin/WKWebViewController.swift

@@ -47,35 +47,6 @@ private enum BlobDownloadSupport {
     static let chunkBytes = 64 * 1024
 }
 
-/// Script message handlers registered on every in-app browser WKWebView.
-/// Popup configs from `createWebViewWith` copy parent handlers, so we must
-/// remove these names before re-adding or WKWebView raises NSInvalidArgumentException.
-enum ScriptMessageHandlerSupport {
-    static let allNames = [
-        "messageHandler",
-        "preShowScriptError",
-        "preShowScriptSuccess",
-        "close",
-        "hide",
-        "show",
-        "blobDownload",
-        "blobDownloadStart",
-        "blobDownloadChunk",
-        "blobDownloadFinish",
-        "blobDownloadAbort",
-        "takeScreenshot",
-        "consoleMessageHandler",
-        "magicPrint",
-        "capgoProxyBridge"
-    ]
-
-    static func removeAll(from userContentController: WKUserContentController) {
-        for name in allNames {
-            userContentController.removeScriptMessageHandler(forName: name)
-        }
-    }
-}
-
 private struct BlobDownloadSession {
     let destinationURL: URL
     let sourceURL: String?
@@ -2037,7 +2008,16 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
         }
         let userContentController = webConfiguration.userContentController
         userContentController.removeAllUserScripts()
-        ScriptMessageHandlerSupport.removeAll(from: userContentController)
+        userContentController.removeScriptMessageHandler(forName: "messageHandler")
+        userContentController.removeScriptMessageHandler(forName: "preShowScriptError")
+        userContentController.removeScriptMessageHandler(forName: "preShowScriptSuccess")
+        userContentController.removeScriptMessageHandler(forName: "close")
+        userContentController.removeScriptMessageHandler(forName: "hide")
+        userContentController.removeScriptMessageHandler(forName: "show")
+        userContentController.removeScriptMessageHandler(forName: "takeScreenshot")
+        userContentController.removeScriptMessageHandler(forName: "consoleMessageHandler")
+        userContentController.removeScriptMessageHandler(forName: "magicPrint")
+        userContentController.removeScriptMessageHandler(forName: "capgoProxyBridge")
 
         if proxyRequests || proxySchemeHandler != nil, let handler = proxySchemeHandler {
             WKWebView.enableCustomSchemeHandling(for: ["https", "http"])
@@ -2284,9 +2264,7 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
         self.enabledSafeTopMargin = parent.enabledSafeTopMargin
         self.blockedHosts = parent.blockedHosts
         self.authorizedAppLinks = parent.authorizedAppLinks
-        // createWebViewWith configs copy parent script handlers; start clean so
-        // initWebview can register blobDownload/etc without NSInvalidArgumentException.
-        configuration.userContentController = WKUserContentController()
+        self.activeNativeNavigationForWebview = parent.activeNativeNavigationForWebview
         self.initialWebConfiguration = configuration
         self.persistWebViewData = parent.persistWebViewData
         self.disableOverscroll = parent.disableOverscroll
@@ -2570,7 +2548,20 @@ public extension WKWebViewController {
         webView.loadHTMLString("", baseURL: nil)
 
         webView.configuration.userContentController.removeAllUserScripts()
-        ScriptMessageHandlerSupport.removeAll(from: webView.configuration.userContentController)
+        webView.configuration.userContentController.removeScriptMessageHandler(forName: "messageHandler")
+        webView.configuration.userContentController.removeScriptMessageHandler(forName: "close")
+        webView.configuration.userContentController.removeScriptMessageHandler(forName: "hide")
+        webView.configuration.userContentController.removeScriptMessageHandler(forName: "show")
+        if allowScreenshotsFromWebPage {
+            webView.configuration.userContentController.removeScriptMessageHandler(forName: "takeScreenshot")
+        }
+        if captureConsoleLogs {
+            webView.configuration.userContentController.removeScriptMessageHandler(forName: "consoleMessageHandler")
+        }
+        webView.configuration.userContentController.removeScriptMessageHandler(forName: "preShowScriptSuccess")
+        webView.configuration.userContentController.removeScriptMessageHandler(forName: "preShowScriptError")
+        webView.configuration.userContentController.removeScriptMessageHandler(forName: "magicPrint")
+        webView.configuration.userContentController.removeScriptMessageHandler(forName: "capgoProxyBridge")
 
         webView.removeFromSuperview()
         // Also clean progress bar view if present

package/package.json

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