@capgo/inappbrowser 7.10.9 → 7.10.11

package/Package.swift

@@ -10,7 +10,7 @@ let package = Package(
             targets: ["InappbrowserPlugin"])
     ],
     dependencies: [
-        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "7.2.0")
+        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "7.4.2")
     ],
     targets: [
         .target(

package/android/src/main/java/ee/forgr/capacitor_inappbrowser/WebViewDialog.java

@@ -512,43 +512,48 @@ public class WebViewDialog extends Dialog {
 
             // Fixed JavaScript with proper error handling
             String js =
-              "try {" +
-              "  (function() {" +
-              "    var captureAttr = null;" +
-              "    // Check active element first" +
-              "    if (document.activeElement && " +
-              "        document.activeElement.tagName === 'INPUT' && " +
-              "        document.activeElement.type === 'file') {" +
-              "      if (document.activeElement.hasAttribute('capture')) {" +
-              "        captureAttr = document.activeElement.getAttribute('capture') || 'environment';" +
-              "        return captureAttr;" +
-              "      }" +
-              "    }" +
-              "    // Try to find any input with capture attribute" +
-              "    var inputs = document.querySelectorAll('input[type=\"file\"][capture]');" +
-              "    if (inputs && inputs.length > 0) {" +
-              "      captureAttr = inputs[0].getAttribute('capture') || 'environment';" +
-              "      return captureAttr;" +
-              "    }" +
-              "    // Try to extract from HTML attributes" +
-              "    var allInputs = document.getElementsByTagName('input');" +
-              "    for (var i = 0; i < allInputs.length; i++) {" +
-              "      var input = allInputs[i];" +
-              "      if (input.type === 'file') {" +
-              "        if (input.hasAttribute('capture')) {" +
-              "          captureAttr = input.getAttribute('capture') || 'environment';" +
-              "          return captureAttr;" +
-              "        }" +
-              "        // Look for the accept attribute containing image/* as this might be a camera input" +
-              "        var acceptAttr = input.getAttribute('accept');" +
-              "        if (acceptAttr && acceptAttr.indexOf('image/*') >= 0) {" +
-              "          console.log('Found input with image/* accept');" +
-              "        }" +
-              "      }" +
-              "    }" +
-              "    return '';" +
-              "  })();" +
-              "} catch(e) { console.error('Capture detection error:', e); return ''; }";
+              """
+              try {
+                (function() {
+                  var captureAttr = null;
+                  // Check active element first
+                  if (document.activeElement &&
+                      document.activeElement.tagName === 'INPUT' &&
+                      document.activeElement.type === 'file') {
+                    if (document.activeElement.hasAttribute('capture')) {
+                      captureAttr = document.activeElement.getAttribute('capture') || 'environment';
+                      return captureAttr;
+                    }
+                  }
+                  // Try to find any input with capture attribute
+                  var inputs = document.querySelectorAll('input[type="file"][capture]');
+                  if (inputs && inputs.length > 0) {
+                    captureAttr = inputs[0].getAttribute('capture') || 'environment';
+                    return captureAttr;
+                  }
+                  // Try to extract from HTML attributes
+                  var allInputs = document.getElementsByTagName('input');
+                  for (var i = 0; i < allInputs.length; i++) {
+                    var input = allInputs[i];
+                    if (input.type === 'file') {
+                      if (input.hasAttribute('capture')) {
+                        captureAttr = input.getAttribute('capture') || 'environment';
+                        return captureAttr;
+                      }
+                      // Look for the accept attribute containing image/* as this might be a camera input
+                      var acceptAttr = input.getAttribute('accept');
+                      if (acceptAttr && acceptAttr.indexOf('image/*') >= 0) {
+                        console.log('Found input with image/* accept');
+                      }
+                    }
+                  }
+                  return '';
+                })();
+              } catch(e) {
+                console.error('Capture detection error:', e);
+                return '';
+              }
+              """;
 
             webView.evaluateJavascript(js, value -> {
               Log.d("InAppBrowser", "Capture attribute JS result: " + value);

package/ios/Plugin/WKWebViewController.swift

@@ -443,11 +443,20 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
 
     // Method to send a message from Swift to JavaScript
     open func postMessageToJS(message: [String: Any]) {
-        if let jsonData = try? JSONSerialization.data(withJSONObject: message, options: []),
-           let jsonString = String(data: jsonData, encoding: .utf8) {
-            let script = "window.dispatchEvent(new CustomEvent('messageFromNative', { detail: \(jsonString) }));"
-            DispatchQueue.main.async {
-                self.webView?.evaluateJavaScript(script, completionHandler: nil)
+        guard let jsonData = try? JSONSerialization.data(withJSONObject: message, options: []),
+              let jsonString = String(data: jsonData, encoding: .utf8) else {
+            print("[InAppBrowser] Failed to serialize message to JSON")
+            return
+        }
+        
+        // Safely build the script to avoid any potential issues
+        let script = "window.dispatchEvent(new CustomEvent('messageFromNative', { detail: \(jsonString) }));"
+        
+        DispatchQueue.main.async {
+            self.webView?.evaluateJavaScript(script) { result, error in
+                if let error = error {
+                    print("[InAppBrowser] JavaScript evaluation error in postMessageToJS: \(error)")
+                }
             }
         }
     }
@@ -1339,20 +1348,25 @@ extension WKWebViewController: WKNavigationDelegate {
             return
         }
 
-        // TODO: implement interface
-        let script = """
-                        async function preShowFunction() {
-                        \(self.preShowScript ?? "")
-                        };
-                        preShowFunction().then(
-                                () => window.webkit.messageHandlers.preShowScriptSuccess.postMessage({})
-                        ).catch(
-                                err => {
-                                        console.error('Preshow error', err);
-                                        window.webkit.messageHandlers.preShowScriptError.postMessage(JSON.stringify(err, Object.getOwnPropertyNames(err)));
-                                }
-                        )
-                        """
+        // Safely construct script template with proper escaping
+        let userScript = self.preShowScript ?? ""
+        
+        // Build script using safe concatenation to avoid multi-line string issues
+        let scriptTemplate = [
+            "async function preShowFunction() {",
+            userScript,
+            "}",
+            "preShowFunction().then(",
+            "    () => window.webkit.messageHandlers.preShowScriptSuccess.postMessage({})",
+            ").catch(",
+            "    err => {",
+            "        console.error('Preshow error', err);",
+            "        window.webkit.messageHandlers.preShowScriptError.postMessage(JSON.stringify(err, Object.getOwnPropertyNames(err)));",
+            "    }",
+            ")"
+        ]
+        
+        let script = scriptTemplate.joined(separator: "\n")
         print("[InAppBrowser - InjectPreShowScript] PreShowScript script: \(script)")
 
         self.preShowSemaphore = DispatchSemaphore(value: 0)

package/package.json

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