@capgo/inappbrowser 6.9.38 → 6.10.0

package/android/src/main/AndroidManifest.xml

@@ -7,5 +7,6 @@
         <data android:scheme="http" />
       </intent>
     </queries>
+  <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
   <uses-permission android:name="android.permission.CAMERA"/>
 </manifest>

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

@@ -38,6 +38,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.Toolbar;
 import androidx.annotation.RequiresApi;
+import androidx.core.view.WindowInsetsControllerCompat;
 import com.caverock.androidsvg.SVG;
 import com.caverock.androidsvg.SVGParseException;
 import com.getcapacitor.JSObject;
@@ -132,6 +133,21 @@ public class WebViewDialog extends Dialog {
       // Handle message from JavaScript
       _options.getCallbacks().javascriptCallback(message);
     }
+
+    @JavascriptInterface
+    public void close() {
+      // close webview
+      activity.runOnUiThread(
+        new Runnable() {
+          @Override
+          public void run() {
+            dismiss();
+            _options.getCallbacks().closeEvent(_webView.getUrl());
+            _webView.destroy();
+          }
+        }
+      );
+    }
   }
 
   public class PreShowScriptInterface {
@@ -163,6 +179,17 @@ public class WebViewDialog extends Dialog {
       WindowManager.LayoutParams.FLAG_FULLSCREEN
     );
     setContentView(R.layout.activity_browser);
+    getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+
+    WindowInsetsControllerCompat insetsController =
+      new WindowInsetsControllerCompat(getWindow(), getWindow().getDecorView());
+    insetsController.setAppearanceLightStatusBars(false);
+    getWindow()
+      .getDecorView()
+      .post(() -> {
+        getWindow().setStatusBarColor(Color.BLACK);
+      });
+
     getWindow()
       .setLayout(
         WindowManager.LayoutParams.MATCH_PARENT,
@@ -318,6 +345,9 @@ public class WebViewDialog extends Dialog {
       "            if (window.AndroidInterface) { " +
       "                window.AndroidInterface.postMessage(JSON.stringify(message)); " +
       "            } " +
+      "        }, " +
+      "        close: function() { " +
+      "            window.AndroidInterface.close(); " +
       "        } " +
       "    }; " +
       "}";
@@ -487,7 +517,7 @@ public class WebViewDialog extends Dialog {
       }
     );
 
-    View closeButton = _toolbar.findViewById(R.id.closeButton);
+    ImageButton closeButton = _toolbar.findViewById(R.id.closeButton);
     closeButton.setOnClickListener(
       new View.OnClickListener() {
         @Override
@@ -520,7 +550,7 @@ public class WebViewDialog extends Dialog {
     );
 
     if (_options.showArrow()) {
-      closeButton.setBackgroundResource(R.drawable.arrow_forward_enabled);
+      closeButton.setImageResource(R.drawable.arrow_back_enabled);
     }
 
     if (_options.getShowReloadButton()) {
@@ -1031,6 +1061,8 @@ public class WebViewDialog extends Dialog {
     ) {
       _webView.goBack();
     } else if (!_options.getDisableGoBackOnNativeApplication()) {
+      _options.getCallbacks().closeEvent(_webView.getUrl());
+      _webView.destroy();
       super.onBackPressed();
     }
   }

package/ios/Plugin/InAppBrowserPlugin.swift

@@ -23,7 +23,23 @@ extension UIColor {
  * here: https://capacitorjs.com/docs/plugins/ios
  */
 @objc(InAppBrowserPlugin)
-public class InAppBrowserPlugin: CAPPlugin {
+public class InAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
+    public let identifier = "InAppBrowserPlugin"
+    public let jsName = "InAppBrowser"
+    public let pluginMethods: [CAPPluginMethod] = [
+        CAPPluginMethod(name: "open", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "openWebView", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "clearCookies", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "getCookies", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "clearAllCookies", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "clearCache", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "reload", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "setUrl", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "show", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "close", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "executeScript", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "postMessage", returnType: CAPPluginReturnPromise)
+    ]
     var navigationWebViewController: UINavigationController?
     private var privacyScreen: UIImageView?
     private var isSetupDone = false
@@ -196,9 +212,8 @@ public class InAppBrowserPlugin: CAPPlugin {
 
         DispatchQueue.main.async {
             let url = URL(string: urlString)
-
             if self.isPresentAfterPageLoad {
-                self.webViewController = WKWebViewController.init(url: url!, headers: headers, isInspectable: isInspectable, credentials: credentials, preventDeeplink: preventDeeplink)
+                self.webViewController = WKWebViewController.init(url: url!, headers: headers, isInspectable: isInspectable, credentials: credentials, preventDeeplink: preventDeeplink, blankNavigationTab: toolbarType == "blank")
             } else {
                 self.webViewController = WKWebViewController.init()
                 self.webViewController?.setHeaders(headers: headers)
@@ -241,6 +256,7 @@ public class InAppBrowserPlugin: CAPPlugin {
             self.navigationWebViewController?.modalPresentationStyle = .fullScreen
             if toolbarType == "blank" {
                 self.navigationWebViewController?.navigationBar.isHidden = true
+                self.webViewController?.blankNavigationTab = true
             }
             if showReloadButton {
                 let toolbarItems = self.getToolbarItems(toolbarType: toolbarType)
@@ -289,8 +305,10 @@ public class InAppBrowserPlugin: CAPPlugin {
             call.reject("Cannot get script to execute")
             return
         }
-        self.webViewController?.executeScript(script: script)
-        call.resolve()
+        DispatchQueue.main.async {
+            self.webViewController?.executeScript(script: script)
+            call.resolve()
+        }
     }
 
     @objc func postMessage(_ call: CAPPluginCall) {
@@ -302,7 +320,9 @@ public class InAppBrowserPlugin: CAPPlugin {
         }
         print("Event data: \(eventData)")
 
-        self.webViewController?.postMessageToJS(message: eventData)
+        DispatchQueue.main.async {
+            self.webViewController?.postMessageToJS(message: eventData)
+        }
         call.resolve()
     }
 

package/ios/Plugin/WKWebViewController.swift

@@ -75,6 +75,16 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
         self.setPreventDeeplink(preventDeeplink: preventDeeplink)
         self.initWebview(isInspectable: isInspectable)
     }
+    
+    public init(url: URL, headers: [String: String], isInspectable: Bool, credentials: WKWebViewCredentials? = nil, preventDeeplink: Bool, blankNavigationTab: Bool) {
+        super.init(nibName: nil, bundle: nil)
+        self.blankNavigationTab = blankNavigationTab
+        self.source = .remote(url)
+        self.credentials = credentials
+        self.setHeaders(headers: headers)
+        self.setPreventDeeplink(preventDeeplink: preventDeeplink)
+        self.initWebview(isInspectable: isInspectable)
+    }
 
     open var hasDynamicTitle = false
     open var source: WKWebSource?
@@ -101,6 +111,7 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
     open var ignoreUntrustedSSLError = false
     var viewWasPresented = false
     var preventDeeplink: Bool = false
+    var blankNavigationTab: Bool = false;
 
     internal var preShowSemaphore: DispatchSemaphore?
     internal var preShowError: String?
@@ -239,7 +250,9 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
         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) }));"
-            webView?.evaluateJavaScript(script, completionHandler: nil)
+            DispatchQueue.main.async {
+                self.webView?.evaluateJavaScript(script, completionHandler: nil)
+            }
         }
     }
 
@@ -267,6 +280,8 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
             }
             print("[InAppBrowser - preShowScriptError]: Error!!!!")
             semaphore.signal()
+        } else if message.name == "close" {
+            closeView()
         }
     }
 
@@ -278,6 +293,9 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
                                         if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.messageHandler) {
                                                 window.webkit.messageHandlers.messageHandler.postMessage(message);
                                         }
+                                },
+                                close: function() {
+                                        window.webkit.messageHandlers.close.postMessage(null);
                                 }
                         };
                 }
@@ -288,7 +306,6 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
     }
 
     open func initWebview(isInspectable: Bool = true) {
-
         self.view.backgroundColor = UIColor.white
 
         self.extendedLayoutIncludesOpaqueBars = true
@@ -299,8 +316,9 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
         userContentController.add(self, name: "messageHandler")
         userContentController.add(self, name: "preShowScriptError")
         userContentController.add(self, name: "preShowScriptSuccess")
-        webConfiguration.userContentController = userContentController
+        userContentController.add(self, name: "close")
         webConfiguration.allowsInlineMediaPlayback = true
+        webConfiguration.userContentController = userContentController
         let webView = WKWebView(frame: .zero, configuration: webConfiguration)
 
         if webView.responds(to: Selector(("setInspectable:"))) {
@@ -308,6 +326,20 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
             webView.perform(Selector(("setInspectable:")), with: isInspectable)
         }
 
+        if (self.blankNavigationTab) {
+            // First add the webView to view hierarchy
+            self.view.addSubview(webView)
+            
+            // Then set up constraints
+            webView.translatesAutoresizingMaskIntoConstraints = false
+            NSLayoutConstraint.activate([
+                webView.topAnchor.constraint(equalTo: self.view.safeAreaLayoutGuide.topAnchor),
+                webView.leadingAnchor.constraint(equalTo: self.view.leadingAnchor),
+                webView.trailingAnchor.constraint(equalTo: self.view.trailingAnchor),
+                webView.bottomAnchor.constraint(equalTo: self.view.bottomAnchor)
+            ])
+        }
+
         webView.uiDelegate = self
         webView.navigationDelegate = self
 
@@ -319,9 +351,10 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
             webView.addObserver(self, forKeyPath: titleKeyPath, options: .new, context: nil)
         }
         webView.addObserver(self, forKeyPath: #keyPath(WKWebView.url), options: .new, context: nil)
-        //        NotificationCenter.default.addObserver(self, selector: #selector(restateViewHeight), name: UIDevice.orientationDidChangeNotification, object: nil)
 
-        self.view = webView
+        if (!self.blankNavigationTab) {
+            self.view = webView
+        }
         self.webView = webView
 
         self.webView?.customUserAgent = self.customUserAgent ?? self.userAgent ?? self.originalUserAgent
@@ -796,7 +829,6 @@ fileprivate extension WKWebViewController {
             self.present(alert, animated: true, completion: nil)
         } else {
             let activityViewController = UIActivityViewController(activityItems: items, applicationActivities: nil)
-            #imageLiteral(resourceName: "simulator_screenshot_B8B44B8D-EB30-425C-9BF4-1F37697A8459.png")
             activityViewController.setValue(self.shareSubject ?? self.title, forKey: "subject")
             activityViewController.popoverPresentationController?.barButtonItem = (sender as! UIBarButtonItem)
             self.present(activityViewController, animated: true, completion: nil)
@@ -839,7 +871,16 @@ fileprivate extension WKWebViewController {
 
 // MARK: - WKUIDelegate
 extension WKWebViewController: WKUIDelegate {
-
+    public func webView(_ webView: WKWebView, runJavaScriptAlertPanelWithMessage message: String, initiatedByFrame frame: WKFrameInfo, completionHandler: @escaping () -> Void) {
+        // Ensure UI updates are on the main thread
+        DispatchQueue.main.async {
+            let alertController = UIAlertController(title: nil, message: message, preferredStyle: .alert)
+            alertController.addAction(UIAlertAction(title: "OK", style: .default, handler: { _ in
+                completionHandler()
+            }))
+            self.present(alertController, animated: true, completion: nil)
+        }
+    }
 }
 
 // MARK: - WKNavigationDelegate

package/package.json

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

package/ios/Plugin/InAppBrowserPlugin.h

@@ -1,10 +0,0 @@
-#import <UIKit/UIKit.h>
-
-//! Project version number for Plugin.
-FOUNDATION_EXPORT double PluginVersionNumber;
-
-//! Project version string for Plugin.
-FOUNDATION_EXPORT const unsigned char PluginVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <Plugin/PublicHeader.h>
-

package/ios/Plugin/InAppBrowserPlugin.m

@@ -1,21 +0,0 @@
-#import <Foundation/Foundation.h>
-#import <Capacitor/Capacitor.h>
-
-// Define the plugin using the CAP_PLUGIN Macro, and
-// each method the plugin supports using the CAP_PLUGIN_METHOD macro.
-CAP_PLUGIN(InAppBrowserPlugin, "InAppBrowser",
-           CAP_PLUGIN_METHOD(openWebView, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(clearCookies, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(getCookies, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(clearAllCookies, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(clearCache, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(reload, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(open, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(setUrl, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(show, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(close, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(hide, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(executeScript, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(postMessage, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(insertCSS, CAPPluginReturnPromise);
-)