@capgo/inappbrowser 6.0.0 → 6.0.3

package/ios/Plugin/WKWebViewController.swift

@@ -28,6 +28,16 @@ private struct UrlsHandledByApp {
     @objc optional func webViewController(_ controller: WKWebViewController, decidePolicy url: URL, navigationType: NavigationType) -> Bool
 }
 
+extension Dictionary {
+    func mapKeys<T>(_ transform: (Key) throws -> T) rethrows -> [T: Value] {
+        var dictionary = [T: Value]()
+        for (key, value) in self {
+            dictionary[try transform(key)] = value
+        }
+        return dictionary
+    }
+}
+
 open class WKWebViewController: UIViewController {
 
     public init() {
@@ -50,11 +60,11 @@ open class WKWebViewController: UIViewController {
         self.initWebview()
     }
 
-    public init(url: URL, headers: [String: String]) {
+    public init(url: URL, headers: [String: String], isInspectable: Bool) {
         super.init(nibName: nil, bundle: nil)
         self.source = .remote(url)
         self.setHeaders(headers: headers)
-        self.initWebview()
+        self.initWebview(isInspectable: isInspectable)
     }
 
     open var hasDynamicTitle = false
@@ -74,12 +84,20 @@ open class WKWebViewController: UIViewController {
     var viewHeightLandscape: CGFloat?
     var viewHeightPortrait: CGFloat?
     var currentViewHeight: CGFloat?
+    open var closeModal = false
+    open var closeModalTitle = ""
+    open var closeModalDescription = ""
+    open var closeModalOk = ""
+    open var closeModalCancel = ""
 
     func setHeaders(headers: [String: String]) {
         self.headers = headers
-        let userAgent = self.headers?["User-Agent"]
+        let lowercasedHeaders = headers.mapKeys { $0.lowercased() }
+        let userAgent = lowercasedHeaders["user-agent"]
         self.headers?.removeValue(forKey: "User-Agent")
-        if userAgent != nil {
+        self.headers?.removeValue(forKey: "user-agent")
+
+        if let userAgent = userAgent {
             self.customUserAgent = userAgent
         }
     }
@@ -188,7 +206,7 @@ open class WKWebViewController: UIViewController {
         }
     }
 
-    open func initWebview() {
+    open func initWebview(isInspectable: Bool = true) {
 
         self.view.backgroundColor = UIColor.white
 
@@ -198,6 +216,11 @@ open class WKWebViewController: UIViewController {
         let webConfiguration = WKWebViewConfiguration()
         let webView = WKWebView(frame: .zero, configuration: webConfiguration)
 
+        if webView.responds(to: Selector(("setInspectable:"))) {
+            // Fix: https://stackoverflow.com/questions/76216183/how-to-debug-wkwebview-in-ios-16-4-1-using-xcode-14-2/76603043#76603043
+            webView.perform(Selector(("setInspectable:")), with: isInspectable)
+        }
+
         webView.uiDelegate = self
         webView.navigationDelegate = self
 
@@ -223,8 +246,6 @@ open class WKWebViewController: UIViewController {
             self.previousToolbarState = (navigation.toolbar.tintColor, navigation.toolbar.isHidden)
         }
 
-        //        self.restateViewHeight()
-
         if let s = self.source {
             self.load(source: s)
         } else {
@@ -242,19 +263,19 @@ open class WKWebViewController: UIViewController {
         var bottomPadding = CGFloat(0.0)
         var topPadding = CGFloat(0.0)
         if #available(iOS 11.0, *) {
-            let window = UIApplication.shared.keyWindow
-            bottomPadding = (window?.safeAreaInsets.bottom)!
-            topPadding = (window?.safeAreaInsets.top)!
+            let window = UIApplication.shared.windows.first(where: { $0.isKeyWindow })
+            bottomPadding = window?.safeAreaInsets.bottom ?? 0.0
+            topPadding = window?.safeAreaInsets.top ?? 0.0
         }
         if UIDevice.current.orientation.isPortrait {
             self.navigationController?.toolbar.isHidden = false
             if self.viewHeightPortrait == nil {
                 self.viewHeightPortrait = self.view.safeAreaLayoutGuide.layoutFrame.size.height
                 if toolbarItemTypes.count == 0 {
-                    self.viewHeightPortrait! = self.viewHeightPortrait! + bottomPadding
+                    self.viewHeightPortrait! += bottomPadding
                 }
                 if self.navigationController?.navigationBar.isHidden == true {
-                    self.viewHeightPortrait = self.viewHeightPortrait! + topPadding
+                    self.viewHeightPortrait! += topPadding
                 }
             }
             self.currentViewHeight = self.viewHeightPortrait
@@ -263,10 +284,10 @@ open class WKWebViewController: UIViewController {
             if self.viewHeightLandscape == nil {
                 self.viewHeightLandscape = self.view.safeAreaLayoutGuide.layoutFrame.size.height
                 if toolbarItemTypes.count == 0 {
-                    self.viewHeightLandscape! = self.viewHeightLandscape! + bottomPadding
+                    self.viewHeightLandscape! += bottomPadding
                 }
                 if self.navigationController?.navigationBar.isHidden == true {
-                    self.viewHeightLandscape = self.viewHeightLandscape! + topPadding
+                    self.viewHeightLandscape! += topPadding
                 }
             }
             self.currentViewHeight = self.viewHeightLandscape
@@ -295,11 +316,6 @@ open class WKWebViewController: UIViewController {
         rollbackState()
     }
 
-    override open func didReceiveMemoryWarning() {
-        super.didReceiveMemoryWarning()
-        // Dispose of any resources that can be recreated.
-    }
-
     override open func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey: Any]?, context: UnsafeMutableRawPointer?) {
         switch keyPath {
         case estimatedProgressKeyPath?:
@@ -360,6 +376,13 @@ public extension WKWebViewController {
             webView?.go(to: firstPageItem)
         }
     }
+    func reload() {
+        webView?.reload()
+    }
+
+    func executeScript(script: String, completion: ((Any?, Error?) -> Void)? = nil) {
+        webView?.evaluateJavaScript(script, completionHandler: completion)
+    }
 }
 
 // MARK: - Fileprivate Methods
@@ -672,7 +695,7 @@ fileprivate extension WKWebViewController {
         }
     }
 
-    @objc func doneDidClick(sender: AnyObject) {
+    func closeView () {
         var canDismiss = true
         if let url = self.source?.url {
             canDismiss = delegate?.webViewController?(self, canDismiss: url) ?? true
@@ -684,6 +707,21 @@ fileprivate extension WKWebViewController {
         }
     }
 
+    @objc func doneDidClick(sender: AnyObject) {
+        // check if closeModal is true, if true display alert before close
+        if self.closeModal {
+            let alert = UIAlertController(title: self.closeModalTitle, message: self.closeModalDescription, preferredStyle: UIAlertController.Style.alert)
+            alert.addAction(UIAlertAction(title: self.closeModalOk, style: UIAlertAction.Style.default, handler: { _ in
+                self.closeView()
+            }))
+            alert.addAction(UIAlertAction(title: self.closeModalCancel, style: UIAlertAction.Style.default, handler: nil))
+            self.present(alert, animated: true, completion: nil)
+        } else {
+            self.closeView()
+        }
+
+    }
+
     @objc func customDidClick(sender: BlockBarButtonItem) {
         sender.block?(self)
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/inappbrowser",
-  "version": "6.0.0",
+  "version": "6.0.3",
   "description": "Capacitor plugin in app browser",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -30,12 +30,12 @@
   ],
   "scripts": {
     "verify": "npm run verify:ios && npm run verify:android && npm run verify:web",
-    "verify:ios": "cd ios && pod install && xcodebuild -workspace Plugin.xcworkspace -scheme Plugin && cd ..",
+    "verify:ios": "cd ios && pod install && xcodebuild -workspace Plugin.xcworkspace -sdk iphoneos -scheme Plugin && cd ..",
     "verify:android": "cd android && ./gradlew clean build test && cd ..",
     "verify:web": "npm run build",
     "lint": "npm run eslint && npm run prettier -- --check && npm run swiftlint -- lint",
     "fmt": "npm run eslint -- --fix && npm run prettier -- --write && npm run swiftlint -- --autocorrect --format",
-    "eslint": "eslint . --ext ts",
+    "eslint": "eslint .",
     "prettier": "prettier --config .prettierrc.js \"**/*.{css,html,ts,js,java}\"",
     "swiftlint": "node-swiftlint",
     "docgen": "docgen --api InAppBrowserPlugin --output-readme README.md --output-json dist/docs.json",
@@ -45,34 +45,32 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "^5.0.3",
-    "@capacitor/cli": "^5.0.3",
-    "@capacitor/core": "^5.0.3",
-    "@capacitor/docgen": "^0.2.1",
-    "@capacitor/ios": "^5.0.3",
+    "@capacitor/android": "^6.0.0",
+    "@capacitor/cli": "^6.0.0",
+    "@capacitor/core": "^6.0.0",
+    "@capacitor/docgen": "^0.2.2",
+    "@capacitor/ios": "^6.0.0",
     "@ionic/eslint-config": "^0.3.0",
-    "@ionic/prettier-config": "^3.0.0",
+    "@ionic/prettier-config": "^4.0.0",
     "@ionic/swiftlint-config": "^1.1.2",
-    "@typescript-eslint/eslint-plugin": "^5.59.7",
-    "@typescript-eslint/parser": "^5.59.7",
-    "eslint": "^8.41.0",
-    "eslint-plugin-import": "^2.27.5",
-    "husky": "^8.0.3",
-    "prettier": "^2.8.8",
-    "prettier-plugin-java": "^2.1.0",
-    "rimraf": "^5.0.1",
-    "rollup": "^3.23.0",
+    "@types/node": "^20.12.7",
+    "@typescript-eslint/eslint-plugin": "^7.8.0",
+    "@typescript-eslint/parser": "^7.8.0",
+    "eslint": "^9.1.1",
+    "eslint-plugin-import": "^2.29.1",
+    "husky": "^9.0.11",
+    "prettier": "^3.2.5",
+    "prettier-plugin-java": "^2.6.0",
+    "rimraf": "^5.0.5",
+    "rollup": "^4.17.1",
     "swiftlint": "^1.0.2",
-    "typescript": "^5.0.4"
+    "typescript": "^5.4.5"
   },
   "peerDependencies": {
-    "@capacitor/core": "^5.0.0"
+    "@capacitor/core": "^6.0.0"
   },
   "prettier": "@ionic/prettier-config",
   "swiftlint": "@ionic/swiftlint-config",
-  "eslintConfig": {
-    "extends": "@ionic/eslint-config/recommended"
-  },
   "capacitor": {
     "ios": {
       "src": "ios"