@capgo/inappbrowser 8.0.1 → 8.0.2

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

@@ -50,7 +50,7 @@ import org.json.JSONObject;
 )
 public class InAppBrowserPlugin extends Plugin implements WebViewDialog.PermissionHandler {
 
-    private final String pluginVersion = "8.0.1";
+    private final String pluginVersion = "8.0.2";
 
     public static final String CUSTOM_TAB_PACKAGE_NAME = "com.android.chrome"; // Change when in stable
     private CustomTabsClient customTabsClient;

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

@@ -386,9 +386,7 @@ public class WebViewDialog extends Dialog {
             _webView.getSettings().setGeolocationEnabled(true);
 
             // Ensure secure context for Payment Request API
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                _webView.getSettings().setMixedContentMode(android.webkit.WebSettings.MIXED_CONTENT_COMPATIBILITY_MODE);
-            }
+            _webView.getSettings().setMixedContentMode(android.webkit.WebSettings.MIXED_CONTENT_COMPATIBILITY_MODE);
 
             // Enable Payment Request API only if feature is supported
             if (WebViewFeature.isFeatureSupported(WebViewFeature.PAYMENT_REQUEST)) {

package/ios/Sources/InAppBrowserPlugin/Enums.swift

@@ -16,23 +16,23 @@ public enum WKWebSource: Equatable {
 
     public var url: URL? {
         switch self {
-        case .remote(let u): return u
-        case .file(let u, access: _): return u
+        case .remote(let urlValue): return urlValue
+        case .file(let urlValue, access: _): return urlValue
         default: return nil
         }
     }
 
     public var remoteURL: URL? {
         switch self {
-        case .remote(let u): return u
+        case .remote(let urlValue): return urlValue
         default: return nil
         }
     }
 
     public var absoluteString: String? {
         switch self {
-        case .remote(let u): return u.absoluteString
-        case .file(let u, access: _): return u.absoluteString
+        case .remote(let urlValue): return urlValue.absoluteString
+        case .file(let urlValue, access: _): return urlValue.absoluteString
         default: return nil
         }
     }

package/ios/Sources/InAppBrowserPlugin/InAppBrowserPlugin.swift

@@ -24,7 +24,7 @@ extension UIColor {
  */
 @objc(InAppBrowserPlugin)
 public class InAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
-    private let pluginVersion: String = "8.0.1"
+    private let pluginVersion: String = "8.0.2"
     public let identifier = "InAppBrowserPlugin"
     public let jsName = "InAppBrowser"
     public let pluginMethods: [CAPPluginMethod] = [
@@ -174,11 +174,10 @@ public class InAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
                 call.reject("IOS settings not found")
                 return
             }
-            if !(iosSettingsRaw is JSObject) {
+            guard let iosSettings = iosSettingsRaw as? JSObject else {
                 call.reject("IOS settings are not an object")
                 return
             }
-            let iosSettings = iosSettingsRaw as! JSObject
 
             guard let iconType = iosSettings["iconType"] as? String else {
                 call.reject("buttonNearDone.iconType is empty")
@@ -371,8 +370,8 @@ public class InAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         // Read dimension options
         let width = call.getFloat("width")
         let height = call.getFloat("height")
-        let x = call.getFloat("x")
-        let y = call.getFloat("y")
+        let xPos = call.getFloat("x")
+        let yPos = call.getFloat("y")
 
         // Validate dimension parameters
         if width != nil && height == nil {
@@ -410,11 +409,11 @@ public class InAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
             if let height = height {
                 webViewController.customHeight = CGFloat(height)
             }
-            if let x = x {
-                webViewController.customX = CGFloat(x)
+            if let xPos = xPos {
+                webViewController.customX = CGFloat(xPos)
             }
-            if let y = y {
-                webViewController.customY = CGFloat(y)
+            if let yPos = yPos {
+                webViewController.customY = CGFloat(yPos)
             }
 
             // Set native navigation gestures before view loads
@@ -618,24 +617,24 @@ public class InAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
                 containerView.backgroundColor = .clear
 
                 // Calculate dimensions - use screen width if only height is provided
-                let finalWidth = width != nil ? CGFloat(width!) : UIScreen.main.bounds.width
-                let finalHeight = height != nil ? CGFloat(height!) : UIScreen.main.bounds.height
+                let finalWidth = width.map { CGFloat($0) } ?? UIScreen.main.bounds.width
+                let finalHeight = height.map { CGFloat($0) } ?? UIScreen.main.bounds.height
 
                 containerView.targetFrame = CGRect(
-                    x: CGFloat(x ?? 0),
-                    y: CGFloat(y ?? 0),
+                    x: CGFloat(xPos ?? 0),
+                    y: CGFloat(yPos ?? 0),
                     width: finalWidth,
                     height: finalHeight
                 )
 
                 // Replace the navigation controller's view with our pass-through container
-                if let navController = self.navigationWebViewController {
-                    let originalView = navController.view!
+                if let navController = self.navigationWebViewController,
+                   let originalView = navController.view {
                     navController.view = containerView
                     containerView.addSubview(originalView)
                     originalView.frame = CGRect(
-                        x: CGFloat(x ?? 0),
-                        y: CGFloat(y ?? 0),
+                        x: CGFloat(xPos ?? 0),
+                        y: CGFloat(yPos ?? 0),
                         width: finalWidth,
                         height: finalHeight
                     )
@@ -760,7 +759,7 @@ public class InAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         do {
             let regex = try NSRegularExpression(pattern: hexColorRegex)
             let range = NSRange(location: 0, length: input.utf16.count)
-            if let _ = regex.firstMatch(in: input, options: [], range: range) {
+            if regex.firstMatch(in: input, options: [], range: range) != nil {
                 return true
             }
         } catch {
@@ -876,20 +875,23 @@ public class InAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
 
     private func showPrivacyScreen() {
         if privacyScreen == nil {
-            self.privacyScreen = UIImageView()
+            let newPrivacyScreen = UIImageView()
+            self.privacyScreen = newPrivacyScreen
             if let launchImage = UIImage(named: "LaunchImage") {
-                privacyScreen!.image = launchImage
-                privacyScreen!.frame = UIScreen.main.bounds
-                privacyScreen!.contentMode = .scaleAspectFill
-                privacyScreen!.isUserInteractionEnabled = false
+                newPrivacyScreen.image = launchImage
+                newPrivacyScreen.frame = UIScreen.main.bounds
+                newPrivacyScreen.contentMode = .scaleAspectFill
+                newPrivacyScreen.isUserInteractionEnabled = false
             } else if let launchImage = UIImage(named: "Splash") {
-                privacyScreen!.image = launchImage
-                privacyScreen!.frame = UIScreen.main.bounds
-                privacyScreen!.contentMode = .scaleAspectFill
-                privacyScreen!.isUserInteractionEnabled = false
+                newPrivacyScreen.image = launchImage
+                newPrivacyScreen.frame = UIScreen.main.bounds
+                newPrivacyScreen.contentMode = .scaleAspectFill
+                newPrivacyScreen.isUserInteractionEnabled = false
             }
         }
-        self.navigationWebViewController?.view.addSubview(self.privacyScreen!)
+        if let screen = self.privacyScreen {
+            self.navigationWebViewController?.view.addSubview(screen)
+        }
     }
 
     private func hidePrivacyScreen() {
@@ -929,8 +931,8 @@ public class InAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
     @objc func updateDimensions(_ call: CAPPluginCall) {
         let width = call.getFloat("width")
         let height = call.getFloat("height")
-        let x = call.getFloat("x")
-        let y = call.getFloat("y")
+        let xPos = call.getFloat("x")
+        let yPos = call.getFloat("y")
 
         DispatchQueue.main.async {
             guard let webViewController = self.webViewController else {
@@ -939,10 +941,10 @@ public class InAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
             }
 
             webViewController.updateDimensions(
-                width: width != nil ? CGFloat(width!) : nil,
-                height: height != nil ? CGFloat(height!) : nil,
-                x: x != nil ? CGFloat(x!) : nil,
-                y: y != nil ? CGFloat(y!) : nil
+                width: width.map { CGFloat($0) },
+                height: height.map { CGFloat($0) },
+                xPos: xPos.map { CGFloat($0) },
+                yPos: yPos.map { CGFloat($0) }
             )
 
             call.resolve()

package/ios/Sources/InAppBrowserPlugin/WKWebViewController.swift

@@ -735,8 +735,8 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
             self.previousToolbarState = (navigation.toolbar.tintColor, navigation.toolbar.isHidden)
         }
 
-        if let s = self.source {
-            self.load(source: s)
+        if let sourceValue = self.source {
+            self.load(source: sourceValue)
         } else {
             print("[\(type(of: self))][Error] Invalid url")
         }
@@ -753,11 +753,9 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
     @objc func restateViewHeight() {
         var bottomPadding = CGFloat(0.0)
         var topPadding = CGFloat(0.0)
-        if #available(iOS 11.0, *) {
-            let window = UIApplication.shared.windows.first(where: { $0.isKeyWindow })
-            bottomPadding = window?.safeAreaInsets.bottom ?? 0.0
-            topPadding = window?.safeAreaInsets.top ?? 0.0
-        }
+        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 {
             // Don't force toolbar visibility
             if self.viewHeightPortrait == nil {
@@ -909,8 +907,8 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
 // MARK: - Public Methods
 public extension WKWebViewController {
 
-    func load(source s: WKWebSource) {
-        switch s {
+    func load(source sourceValue: WKWebSource) {
+        switch sourceValue {
         case .remote(let url):
             self.load(remote: url)
         case .file(let url, access: let access):
@@ -1188,16 +1186,14 @@ fileprivate extension WKWebViewController {
         forwardBarButtonItem.isEnabled = webView?.canGoForward ?? false
 
         let updateReloadBarButtonItem: (UIBarButtonItem, Bool) -> UIBarButtonItem = {
-            [unowned self] barButtonItem, isLoading in
+            [weak self] barButtonItem, isLoading in
+            guard let self = self else { return barButtonItem }
             switch barButtonItem {
-            case self.reloadBarButtonItem:
-                fallthrough
-            case self.stopBarButtonItem:
+            case self.reloadBarButtonItem, self.stopBarButtonItem:
                 return isLoading ? self.stopBarButtonItem : self.reloadBarButtonItem
             default:
-                break
+                return barButtonItem
             }
-            return barButtonItem
         }
 
         let isLoading = webView?.isLoading ?? false
@@ -1295,9 +1291,9 @@ fileprivate extension WKWebViewController {
     }
 
     private func normalizeHost(_ host: String?) -> String? {
-        guard var h = host?.lowercased() else { return nil }
-        if h.hasPrefix("www.") { h.removeFirst(4) }
-        return h
+        guard var hostValue = host?.lowercased() else { return nil }
+        if hostValue.hasPrefix("www.") { hostValue.removeFirst(4) }
+        return hostValue
     }
 
     func isUrlAuthorized(_ url: URL, authorizedLinks: [String]) -> Bool {
@@ -1411,8 +1407,8 @@ fileprivate extension WKWebViewController {
         webView?.stopLoading()
         if webView?.url != nil {
             webView?.reload()
-        } else if let s = self.source {
-            self.load(source: s)
+        } else if let sourceValue = self.source {
+            self.load(source: sourceValue)
         }
     }
 
@@ -1423,17 +1419,17 @@ fileprivate extension WKWebViewController {
     @objc func activityDidClick(sender: AnyObject) {
         print("[DEBUG] Activity button clicked, shareSubject: \(self.shareSubject ?? "nil")")
 
-        guard let s = self.source else {
+        guard let sourceValue = self.source else {
             print("[DEBUG] Activity button: No source available")
             return
         }
 
         let items: [Any]
-        switch s {
-        case .remote(let u):
-            items = [u]
-        case .file(let u, access: _):
-            items = [u]
+        switch sourceValue {
+        case .remote(let urlValue):
+            items = [urlValue]
+        case .file(let urlValue, access: _):
+            items = [urlValue]
         case .string(let str, base: _):
             items = [str]
         }
@@ -1482,7 +1478,9 @@ fileprivate extension WKWebViewController {
     private func showShareSheet(items: [Any], sender: AnyObject) {
         let activityViewController = UIActivityViewController(activityItems: items, applicationActivities: nil)
         activityViewController.setValue(self.shareSubject ?? self.title, forKey: "subject")
-        activityViewController.popoverPresentationController?.barButtonItem = (sender as! UIBarButtonItem)
+        if let barButtonItem = sender as? UIBarButtonItem {
+            activityViewController.popoverPresentationController?.barButtonItem = barButtonItem
+        }
         self.present(activityViewController, animated: true, completion: nil)
     }
 
@@ -1763,16 +1761,15 @@ extension WKWebViewController: WKNavigationDelegate {
     public func webView(_ webView: WKWebView, didStartProvisionalNavigation navigation: WKNavigation!) {
         updateBarButtonItems()
         self.progressView?.progress = 0
-        if let u = webView.url {
-            self.url = u
-            delegate?.webViewController?(self, didStart: u)
+        if let urlValue = webView.url {
+            self.url = urlValue
+            delegate?.webViewController?(self, didStart: urlValue)
         }
     }
     public func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
         if !didpageInit && self.capBrowserPlugin?.isPresentAfterPageLoad == true {
             // Only inject preShowScript if it wasn't already injected at document start
-            let shouldInjectScript = self.preShowScript != nil &&
-                !self.preShowScript!.isEmpty &&
+            let shouldInjectScript = self.preShowScript.map { !$0.isEmpty } ?? false &&
                 self.preShowScriptInjectionTime != "documentStart"
 
             if shouldInjectScript {
@@ -1927,26 +1924,26 @@ extension WKWebViewController: WKNavigationDelegate {
 
         // Apply custom dimensions if both width and height are specified
         if let width = customWidth, let height = customHeight {
-            let x = customX ?? 0
-            let y = customY ?? 0
+            let xPos = customX ?? 0
+            let yPos = customY ?? 0
 
             // Set the frame for the navigation controller's view
-            navigationController.view.frame = CGRect(x: x, y: y, width: width, height: height)
+            navigationController.view.frame = CGRect(x: xPos, y: yPos, width: width, height: height)
         }
         // If only height is specified, use fullscreen width
         else if let height = customHeight, customWidth == nil {
-            let x = customX ?? 0
-            let y = customY ?? 0
+            let xPos = customX ?? 0
+            let yPos = customY ?? 0
             let screenWidth = UIScreen.main.bounds.width
 
             // Set the frame with fullscreen width and custom height
-            navigationController.view.frame = CGRect(x: x, y: y, width: screenWidth, height: height)
+            navigationController.view.frame = CGRect(x: xPos, y: yPos, width: screenWidth, height: height)
         }
         // Otherwise, use default fullscreen behavior (no action needed)
     }
 
     /// Update dimensions at runtime
-    open func updateDimensions(width: CGFloat?, height: CGFloat?, x: CGFloat?, y: CGFloat?) {
+    open func updateDimensions(width: CGFloat?, height: CGFloat?, xPos: CGFloat?, yPos: CGFloat?) {
         // Update stored dimensions
         if let width = width {
             customWidth = width
@@ -1954,11 +1951,11 @@ extension WKWebViewController: WKNavigationDelegate {
         if let height = height {
             customHeight = height
         }
-        if let x = x {
-            customX = x
+        if let xPos = xPos {
+            customX = xPos
         }
-        if let y = y {
-            customY = y
+        if let yPos = yPos {
+            customY = yPos
         }
 
         // Apply the new dimensions

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/inappbrowser",
-  "version": "8.0.1",
+  "version": "8.0.2",
   "description": "Capacitor plugin in app browser",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -23,6 +23,7 @@
   "bugs": {
     "url": "https://github.com/Cap-go/capacitor-inappbrowser/issues"
   },
+  "homepage": "https://capgo.app/docs/plugins/inappbrowser/",
   "keywords": [
     "capacitor",
     "plugin",
@@ -37,7 +38,7 @@
     "lint": "npm run eslint && npm run prettier -- --check && npm run swiftlint -- lint",
     "fmt": "npm run eslint -- --fix && npm run prettier -- --write && npm run swiftlint -- --fix --format",
     "eslint": "eslint .",
-    "prettier": "prettier \"**/*.{css,html,ts,js,java}\" --plugin=prettier-plugin-java",
+    "prettier": "prettier-pretty-check \"**/*.{css,html,ts,js,java}\" --plugin=prettier-plugin-java",
     "swiftlint": "node-swiftlint",
     "docgen": "docgen --api InAppBrowserPlugin --output-readme README.md --output-json dist/docs.json",
     "build": "npm run clean && npm run docgen && tsc && rollup -c rollup.config.mjs",
@@ -63,7 +64,8 @@
     "rimraf": "^6.1.0",
     "rollup": "^4.53.2",
     "swiftlint": "^2.0.0",
-    "typescript": "^5.9.3"
+    "typescript": "^5.9.3",
+    "prettier-pretty-check": "^0.2.0"
   },
   "peerDependencies": {
     "@capacitor/core": ">=8.0.0"