@capgo/inappbrowser 6.13.2 → 6.14.1

package/ios/Plugin/WKWebViewController.swift

@@ -165,7 +165,6 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
     open var preShowScript: String?
     open var leftNavigationBarItemTypes: [BarButtonItemType] = []
     open var rightNavigaionBarItemTypes: [BarButtonItemType] = []
-    open var toolbarItemTypes: [BarButtonItemType] = [.back, .forward, .activity]
 
     // Status bar style to be applied
     open var statusBarStyle: UIStatusBarStyle = .default
@@ -374,14 +373,6 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
             stopBarButtonItem.tintColor = tintColor
             activityBarButtonItem.tintColor = tintColor
             doneBarButtonItem.tintColor = tintColor
-            flexibleSpaceBarButtonItem.tintColor = tintColor
-
-            // Update toolbar items
-            if let items = toolbarItems {
-                for item in items {
-                    item.tintColor = tintColor
-                }
-            }
 
             // Update navigation items
             if let leftItems = navigationItem.leftBarButtonItems {
@@ -433,13 +424,6 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
                     updateButtonTintColors()
                 }
             }
-
-            if let toolbar = navigationController?.toolbar {
-                if toolbar.backgroundColor == UIColor.black || toolbar.backgroundColor == UIColor.white {
-                    toolbar.backgroundColor = isDarkMode ? UIColor.black : UIColor.white
-                    toolbar.tintColor = textColor
-                }
-            }
         }
     }
 
@@ -521,6 +505,7 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
         userContentController.add(self, name: "close")
         webConfiguration.allowsInlineMediaPlayback = true
         webConfiguration.userContentController = userContentController
+        webConfiguration.allowsInlineMediaPlayback = true
         let webView = WKWebView(frame: .zero, configuration: webConfiguration)
 
         if webView.responds(to: Selector(("setInspectable:"))) {
@@ -595,9 +580,7 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
             // Don't force toolbar visibility
             if self.viewHeightPortrait == nil {
                 self.viewHeightPortrait = self.view.safeAreaLayoutGuide.layoutFrame.size.height
-                if toolbarItemTypes.count == 0 {
-                    self.viewHeightPortrait! += bottomPadding
-                }
+                self.viewHeightPortrait! += bottomPadding
                 if self.navigationController?.navigationBar.isHidden == true {
                     self.viewHeightPortrait! += topPadding
                 }
@@ -607,9 +590,7 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
             // Don't force toolbar visibility
             if self.viewHeightLandscape == nil {
                 self.viewHeightLandscape = self.view.safeAreaLayoutGuide.layoutFrame.size.height
-                if toolbarItemTypes.count == 0 {
-                    self.viewHeightLandscape! += bottomPadding
-                }
+                self.viewHeightLandscape! += bottomPadding
                 if self.navigationController?.navigationBar.isHidden == true {
                     self.viewHeightLandscape! += topPadding
                 }
@@ -956,79 +937,6 @@ fileprivate extension WKWebViewController {
 
         navigationItem.rightBarButtonItems = rightBarButtons
 
-        // Create toolbar items
-        if !toolbarItemTypes.isEmpty {
-            // Check if toolbar has back and forward buttons
-            let hasBackButton = toolbarItemTypes.contains(where: {
-                if case .back = $0 { return true }
-                return false
-            })
-
-            let hasForwardButton = toolbarItemTypes.contains(where: {
-                if case .forward = $0 { return true }
-                return false
-            })
-
-            let hasReloadButton = toolbarItemTypes.contains(where: {
-                if case .reload = $0 { return true }
-                return false
-            })
-
-            if hasBackButton && hasForwardButton {
-                // Create Android-like toolbar with evenly spaced buttons
-                var items: [UIBarButtonItem] = []
-                let flexSpace = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil)
-
-                // Add spacing before back button
-                items.append(flexSpace)
-
-                // Add back button
-                items.append(backBarButtonItem)
-
-                // Add spacing between buttons
-                items.append(flexSpace)
-
-                // Add forward button
-                items.append(forwardBarButtonItem)
-
-                // Add spacing between buttons
-                items.append(flexSpace)
-
-                // Add reload button if present
-                if hasReloadButton {
-                    items.append(reloadBarButtonItem)
-                    items.append(flexSpace)
-                }
-
-                setToolbarItems(items, animated: true)
-            } else {
-                // For other toolbar types, map the items directly
-                let items = toolbarItemTypes.map { type -> UIBarButtonItem in
-                    switch type {
-                    case .back:
-                        return backBarButtonItem
-                    case .forward:
-                        return forwardBarButtonItem
-                    case .reload:
-                        return reloadBarButtonItem
-                    case .stop:
-                        return stopBarButtonItem
-                    case .activity:
-                        return activityBarButtonItem
-                    case .done:
-                        return doneBarButtonItem
-                    case .flexibleSpace:
-                        return flexibleSpaceBarButtonItem
-                    case .custom:
-                        return UIBarButtonItem()
-                    }
-                }
-                setToolbarItems(items, animated: true)
-            }
-        } else {
-            setToolbarItems([], animated: false)
-        }
-
         // After all buttons are set up, apply tint color
         updateButtonTintColors()
     }
@@ -1052,11 +960,6 @@ fileprivate extension WKWebViewController {
         }
 
         let isLoading = webView?.isLoading ?? false
-        toolbarItems = toolbarItems?.map {
-            barButtonItem -> UIBarButtonItem in
-            return updateReloadBarButtonItem(barButtonItem, isLoading)
-        }
-
         navigationItem.leftBarButtonItems = navigationItem.leftBarButtonItems?.map {
             barButtonItem -> UIBarButtonItem in
             return updateReloadBarButtonItem(barButtonItem, isLoading)
@@ -1071,9 +974,8 @@ fileprivate extension WKWebViewController {
     func setUpState() {
         navigationController?.setNavigationBarHidden(false, animated: true)
 
-        // Only show toolbar if there are toolbar items
-        let hideToolbar = toolbarItemTypes.isEmpty
-        navigationController?.setToolbarHidden(hideToolbar, animated: true)
+        // Always hide toolbar since we never want it
+        navigationController?.setToolbarHidden(true, animated: true)
 
         // Set tint colors but don't override specific colors
         if tintColor == nil {
@@ -1082,12 +984,10 @@ fileprivate extension WKWebViewController {
             let textColor = isDarkMode ? UIColor.white : UIColor.black
 
             navigationController?.navigationBar.tintColor = textColor
-            navigationController?.toolbar.tintColor = textColor
             progressView?.progressTintColor = textColor
         } else {
             progressView?.progressTintColor = tintColor
             navigationController?.navigationBar.tintColor = tintColor
-            navigationController?.toolbar.tintColor = tintColor
         }
     }
 
@@ -1095,9 +995,7 @@ fileprivate extension WKWebViewController {
         progressView?.progress = 0
 
         navigationController?.navigationBar.tintColor = previousNavigationBarState.tintColor
-        navigationController?.toolbar.tintColor = previousToolbarState.tintColor
 
-        navigationController?.setToolbarHidden(previousToolbarState.hidden, animated: true)
         navigationController?.setNavigationBarHidden(previousNavigationBarState.hidden, animated: true)
     }
 
@@ -1136,11 +1034,23 @@ fileprivate extension WKWebViewController {
     }
 
     func handleURLWithApp(_ url: URL, targetFrame: WKFrameInfo?) -> Bool {
+        // If preventDeeplink is true, don't try to open URLs in external apps
+        if self.preventDeeplink {
+            return false
+        }
+
         let hosts = UrlsHandledByApp.hosts
         let schemes = UrlsHandledByApp.schemes
         let blank = UrlsHandledByApp.blank
 
         var tryToOpenURLWithApp = false
+
+        // Handle all non-http(s) schemes by default
+        if let scheme = url.scheme?.lowercased(), !scheme.hasPrefix("http") {
+            tryToOpenURLWithApp = true
+        }
+
+        // Also handle specific hosts and schemes from UrlsHandledByApp
         if let host = url.host, hosts.contains(host) {
             tryToOpenURLWithApp = true
         }
@@ -1333,13 +1243,38 @@ fileprivate extension WKWebViewController {
 // MARK: - WKUIDelegate
 extension WKWebViewController: WKUIDelegate {
     public func webView(_ webView: WKWebView, runJavaScriptAlertPanelWithMessage message: String, initiatedByFrame frame: WKFrameInfo, completionHandler: @escaping () -> Void) {
+        // Create a strong reference to the completion handler to ensure it's called
+        let strongCompletionHandler = completionHandler
+
         // Ensure UI updates are on the main thread
-        DispatchQueue.main.async {
+        DispatchQueue.main.async { [weak self] in
+            guard let self = self else {
+                // View controller was deallocated
+                strongCompletionHandler()
+                return
+            }
+
+            // Check if view is available and ready for presentation
+            guard self.view.window != nil, !self.isBeingDismissed, !self.isMovingFromParent else {
+                print("[InAppBrowser] Cannot present alert - view not in window hierarchy or being dismissed")
+                strongCompletionHandler()
+                return
+            }
+
             let alertController = UIAlertController(title: nil, message: message, preferredStyle: .alert)
             alertController.addAction(UIAlertAction(title: "OK", style: .default, handler: { _ in
-                completionHandler()
+                strongCompletionHandler()
             }))
-            self.present(alertController, animated: true, completion: nil)
+
+            // Try to present the alert
+            do {
+                self.present(alertController, animated: true, completion: nil)
+            } catch {
+                // This won't typically be triggered as present doesn't throw,
+                // but adding as a safeguard
+                print("[InAppBrowser] Error presenting alert: \(error)")
+                strongCompletionHandler()
+            }
         }
     }
 }

package/package.json

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

package/ios/Plugin/Assets.xcassets/Contents.json

@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}