@capgo/capacitor-inappbrowser 8.6.31 → 8.6.34

package/ios/Sources/InAppBrowserPlugin/WKWebViewController.swift

@@ -236,6 +236,49 @@ enum WebViewViewportLayoutSupport {
     }
 }
 
+enum WebViewSafeAreaLayoutSupport {
+    static func contentInsetAdjustmentBehavior(enabledSafeBottomMargin: Bool) -> UIScrollView.ContentInsetAdjustmentBehavior {
+        enabledSafeBottomMargin ? .automatic : .never
+    }
+
+    static func shouldInsetLayoutMarginsFromSafeArea(enabledSafeBottomMargin: Bool) -> Bool {
+        enabledSafeBottomMargin
+    }
+
+    static func rawSystemBottomInset(effectiveBottomInset: CGFloat, additionalBottomInset: CGFloat) -> CGFloat {
+        max(0, effectiveBottomInset - additionalBottomInset)
+    }
+
+    static func additionalBottomSafeAreaOffset(enabledSafeBottomMargin: Bool, safeAreaBottomInset: CGFloat) -> CGFloat {
+        guard !enabledSafeBottomMargin, safeAreaBottomInset > 0 else {
+            return 0
+        }
+
+        return -safeAreaBottomInset
+    }
+
+    static func cssBottomInset(enabledSafeBottomMargin: Bool, safeAreaBottomInset: CGFloat) -> CGFloat {
+        enabledSafeBottomMargin ? safeAreaBottomInset : 0
+    }
+
+    static func cssTopInset(enabledSafeTopMargin: Bool, safeAreaTopInset: CGFloat) -> CGFloat {
+        enabledSafeTopMargin ? safeAreaTopInset : 0
+    }
+
+    static func safeAreaCssVariablesScript(top: CGFloat, bottom: CGFloat, left: CGFloat, right: CGFloat) -> String {
+        let topValue = Int(top.rounded())
+        let bottomValue = Int(bottom.rounded())
+        let leftValue = Int(left.rounded())
+        let rightValue = Int(right.rounded())
+
+        return "(function(){var root=document.documentElement;" +
+            "root.style.setProperty('--safe-area-inset-top','\(topValue)px');" +
+            "root.style.setProperty('--safe-area-inset-bottom','\(bottomValue)px');" +
+            "root.style.setProperty('--safe-area-inset-left','\(leftValue)px');" +
+            "root.style.setProperty('--safe-area-inset-right','\(rightValue)px');})();"
+    }
+}
+
 open class WKWebViewController: UIViewController, WKScriptMessageHandler {
 
     public init() {
@@ -311,7 +354,7 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
         self.initWebview(isInspectable: isInspectable)
     }
 
-    public init(url: URL, headers: [String: String], isInspectable: Bool, credentials: WKWebViewCredentials? = nil, preventDeeplink: Bool, blankNavigationTab: Bool, enabledSafeBottomMargin: Bool, enabledSafeTopMargin: Bool = true, blockedHosts: [String], authorizedAppLinks: [String], allowWebViewJsVisibilityControl: Bool = false, allowScreenshotsFromWebPage: Bool = false, captureConsoleLogs: Bool = false, proxyRequests: Bool = false, proxySchemeHandler: ProxySchemeHandler? = nil, documentStartUserScripts: [String] = [], openBlankTargetInWebView: Bool = false) {
+    public init(url: URL, headers: [String: String], isInspectable: Bool, credentials: WKWebViewCredentials? = nil, preventDeeplink: Bool, blankNavigationTab: Bool, enabledSafeBottomMargin: Bool, enabledSafeTopMargin: Bool = true, blockedHosts: [String], authorizedAppLinks: [String], allowWebViewJsVisibilityControl: Bool = false, allowScreenshotsFromWebPage: Bool = false, captureConsoleLogs: Bool = false, proxyRequests: Bool = false, proxySchemeHandler: ProxySchemeHandler? = nil, proxyBridge: ProxyBridge? = nil, proxyBridgeAccessToken: String? = nil, legacyProxyRequestURLRegexPattern: String? = nil, documentStartUserScripts: [String] = [], openBlankTargetInWebView: Bool = false) {
         super.init(nibName: nil, bundle: nil)
         self.blankNavigationTab = blankNavigationTab
         self.enabledSafeBottomMargin = enabledSafeBottomMargin
@@ -323,6 +366,9 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
         self.captureConsoleLogs = captureConsoleLogs
         self.proxyRequests = proxyRequests
         self.proxySchemeHandler = proxySchemeHandler
+        self.proxyBridge = proxyBridge
+        self.proxyBridgeAccessToken = proxyBridgeAccessToken
+        self.legacyProxyRequestURLRegexPattern = legacyProxyRequestURLRegexPattern
         self.openBlankTargetInWebView = openBlankTargetInWebView
         self.setHeaders(headers: headers)
         self.setPreventDeeplink(preventDeeplink: preventDeeplink)
@@ -379,6 +425,9 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
     var disableOverscroll: Bool = false
     var proxyRequests: Bool = false
     var proxySchemeHandler: ProxySchemeHandler?
+    var proxyBridge: ProxyBridge?
+    var proxyBridgeAccessToken: String?
+    var legacyProxyRequestURLRegexPattern: String?
     var initialWebConfiguration: WKWebViewConfiguration?
     var waitsForPopupNavigation = false
     var hiddenPopupWindow = false
@@ -395,6 +444,14 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
     private var isWebViewInitialized = false
     private var isObservingKeyboardViewportChanges = false
     private var lastViewportRefreshSize: CGSize?
+    private struct InjectedSafeAreaInsets: Equatable {
+        let top: Int
+        let bottom: Int
+        let left: Int
+        let right: Int
+    }
+
+    private var lastInjectedSafeAreaInsets: InjectedSafeAreaInsets?
     private var downloadStates: [ObjectIdentifier: WKDownloadState] = [:]
     private var previewItemURL: URL?
 
@@ -904,9 +961,15 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
 
     override open func viewDidLayoutSubviews() {
         super.viewDidLayoutSubviews()
+        syncWebViewSafeAreaLayout()
         refreshWebViewViewportIfNeeded()
     }
 
+    override open func viewSafeAreaInsetsDidChange() {
+        super.viewSafeAreaInsetsDidChange()
+        syncWebViewSafeAreaLayout()
+    }
+
     func updateButtonTintColors() {
         // Ensure all button items use the navigation bar's tint color
         if let tintColor = navigationController?.navigationBar.tintColor {
@@ -1064,6 +1127,72 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
         webView.evaluateJavaScript("window.dispatchEvent(new Event('resize'));", completionHandler: nil)
     }
 
+    private func configureWebViewScrollViewSafeArea(_ webView: WKWebView) {
+        if #available(iOS 11.0, *) {
+            webView.scrollView.contentInsetAdjustmentBehavior = WebViewSafeAreaLayoutSupport
+                .contentInsetAdjustmentBehavior(enabledSafeBottomMargin: enabledSafeBottomMargin)
+        }
+
+        webView.insetsLayoutMarginsFromSafeArea = WebViewSafeAreaLayoutSupport
+            .shouldInsetLayoutMarginsFromSafeArea(enabledSafeBottomMargin: enabledSafeBottomMargin)
+
+        if !enabledSafeBottomMargin {
+            webView.scrollView.contentInset = .zero
+            webView.scrollView.scrollIndicatorInsets = .zero
+        }
+    }
+
+    private func syncWebViewSafeAreaLayout() {
+        guard let webView = self.webView, webView.superview != nil else {
+            return
+        }
+
+        let rawSafeAreaBottomInset = WebViewSafeAreaLayoutSupport.rawSystemBottomInset(
+            effectiveBottomInset: view.safeAreaInsets.bottom,
+            additionalBottomInset: additionalSafeAreaInsets.bottom
+        )
+
+        let bottomOffset = WebViewSafeAreaLayoutSupport.additionalBottomSafeAreaOffset(
+            enabledSafeBottomMargin: enabledSafeBottomMargin,
+            safeAreaBottomInset: rawSafeAreaBottomInset
+        )
+        if additionalSafeAreaInsets.bottom != bottomOffset {
+            additionalSafeAreaInsets.bottom = bottomOffset
+        }
+
+        configureWebViewScrollViewSafeArea(webView)
+
+        let topInset = WebViewSafeAreaLayoutSupport.cssTopInset(
+            enabledSafeTopMargin: enabledSafeTopMargin,
+            safeAreaTopInset: view.safeAreaInsets.top
+        )
+        let bottomInset = WebViewSafeAreaLayoutSupport.cssBottomInset(
+            enabledSafeBottomMargin: enabledSafeBottomMargin,
+            safeAreaBottomInset: rawSafeAreaBottomInset
+        )
+        let leftInset = view.safeAreaInsets.left
+        let rightInset = view.safeAreaInsets.right
+
+        let roundedInsets = InjectedSafeAreaInsets(
+            top: Int(topInset.rounded()),
+            bottom: Int(bottomInset.rounded()),
+            left: Int(leftInset.rounded()),
+            right: Int(rightInset.rounded())
+        )
+        if lastInjectedSafeAreaInsets == roundedInsets {
+            return
+        }
+        lastInjectedSafeAreaInsets = roundedInsets
+
+        let script = WebViewSafeAreaLayoutSupport.safeAreaCssVariablesScript(
+            top: topInset,
+            bottom: bottomInset,
+            left: leftInset,
+            right: rightInset
+        )
+        webView.evaluateJavaScript(script, completionHandler: nil)
+    }
+
     private func jsonString(from object: Any) -> String? {
         guard JSONSerialization.isValidJSONObject(object),
               let data = try? JSONSerialization.data(withJSONObject: object),
@@ -1175,6 +1304,25 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
             }
             print("[InAppBrowser - preShowScriptError]: Error!!!!")
             semaphore.signal()
+        } else if message.name == "capgoProxyBridge" {
+            guard let messageBody = message.body as? [String: Any],
+                  let token = messageBody["token"] as? String,
+                  let requestId = messageBody["requestId"] as? String,
+                  let method = messageBody["method"] as? String,
+                  let headersJson = messageBody["headersJson"] as? String else {
+                return
+            }
+
+            let base64Body = messageBody["base64Body"] as? String ?? ""
+            let credentialsMode = messageBody["credentialsMode"] as? String ?? "same-origin"
+            proxyBridge?.storeRequest(
+                token: token,
+                requestId: requestId,
+                method: method,
+                headersJson: headersJson,
+                base64Body: base64Body,
+                credentialsMode: credentialsMode
+            )
         } else if message.name == "close" {
             closeView()
         } else if message.name == "hide" {
@@ -1309,6 +1457,35 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
         userContentController.addUserScript(script)
     }
 
+    private func addProxyBridgeUserScripts(to userContentController: WKUserContentController) {
+        guard let accessToken = proxyBridgeAccessToken else {
+            return
+        }
+
+        let bootstrapScript = WKUserScript(
+            source: ProxyBridgeSupport.bootstrapScriptSource(),
+            injectionTime: .atDocumentStart,
+            forMainFrameOnly: false
+        )
+        userContentController.addUserScript(bootstrapScript)
+
+        let proxyRegexSource = legacyProxyRequestURLRegexPattern ?? ""
+        guard let bridgeScriptSource = ProxyBridgeSupport.loadBundledBridgeScript(
+            accessToken: accessToken,
+            proxyRegexSource: proxyRegexSource
+        ) else {
+            print("[InAppBrowser][Proxy] WARNING: Failed to load proxy-bridge.js for iOS injection")
+            return
+        }
+
+        let bridgeScript = WKUserScript(
+            source: bridgeScriptSource,
+            injectionTime: .atDocumentStart,
+            forMainFrameOnly: false
+        )
+        userContentController.addUserScript(bridgeScript)
+    }
+
     func injectJavaScriptInterface() {
         let script = mobileAppScriptSource()
         DispatchQueue.main.async {
@@ -1347,6 +1524,7 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
         userContentController.removeScriptMessageHandler(forName: "takeScreenshot")
         userContentController.removeScriptMessageHandler(forName: "consoleMessageHandler")
         userContentController.removeScriptMessageHandler(forName: "magicPrint")
+        userContentController.removeScriptMessageHandler(forName: "capgoProxyBridge")
 
         if proxyRequests || proxySchemeHandler != nil, let handler = proxySchemeHandler {
             WKWebView.enableCustomSchemeHandling(for: ["https", "http"])
@@ -1358,6 +1536,10 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
             }
         }
 
+        if ProxyBridgeSupport.shouldInjectBridge(hasProxySchemeHandler: proxySchemeHandler != nil) {
+            addProxyBridgeUserScripts(to: userContentController)
+        }
+
         let weakHandler = WeakScriptMessageHandler(self)
         userContentController.add(weakHandler, name: "messageHandler")
         userContentController.add(weakHandler, name: "preShowScriptError")
@@ -1393,6 +1575,9 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
                 )
             )
         }
+        if ProxyBridgeSupport.shouldInjectBridge(hasProxySchemeHandler: proxySchemeHandler != nil) {
+            userContentController.add(weakHandler, name: "capgoProxyBridge")
+        }
         userContentController.add(weakHandler, name: "magicPrint")
 
         // Inject JavaScript to override window.print
@@ -1504,6 +1689,7 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
 
         // Disable bounce effect by setting scrollView.bounces to false when disableOverscroll is true
         webView.scrollView.bounces = !self.disableOverscroll
+        configureWebViewScrollViewSafeArea(webView)
 
         webView.addObserver(self, forKeyPath: estimatedProgressKeyPath, options: .new, context: nil)
         if websiteTitleInNavigationBar {
@@ -1580,7 +1766,9 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
         self.disableOverscroll = parent.disableOverscroll
         self.proxyRequests = parent.proxyRequests
         self.proxySchemeHandler = proxySchemeHandler
-        self.initialWebConfiguration = configuration
+        self.proxyBridge = parent.proxyBridge
+        self.proxyBridgeAccessToken = parent.proxyBridgeAccessToken
+        self.legacyProxyRequestURLRegexPattern = parent.legacyProxyRequestURLRegexPattern
         self.waitsForPopupNavigation = true
         self.hiddenPopupWindow = parent.hiddenPopupWindow
         self.opensHidden = parent.hiddenPopupWindow
@@ -1860,6 +2048,7 @@ public extension WKWebViewController {
         webView.configuration.userContentController.removeScriptMessageHandler(forName: "preShowScriptSuccess")
         webView.configuration.userContentController.removeScriptMessageHandler(forName: "preShowScriptError")
         webView.configuration.userContentController.removeScriptMessageHandler(forName: "magicPrint")
+        webView.configuration.userContentController.removeScriptMessageHandler(forName: "capgoProxyBridge")
 
         webView.removeFromSuperview()
         // Also clean progress bar view if present
@@ -2075,10 +2264,10 @@ fileprivate extension WKWebViewController {
     }
 
     func setUpState() {
-        navigationController?.setNavigationBarHidden(false, animated: true)
+        navigationController?.setNavigationBarHidden(blankNavigationTab, animated: false)
 
         // Always hide toolbar since we never want it
-        navigationController?.setToolbarHidden(true, animated: true)
+        navigationController?.setToolbarHidden(true, animated: false)
 
         // Set tint colors but don't override specific colors
         if tintColor == nil {
@@ -2730,6 +2919,8 @@ extension WKWebViewController: WKNavigationDelegate {
             delegate?.webViewController?(self, didFinish: url)
         }
         self.injectJavaScriptInterface()
+        lastInjectedSafeAreaInsets = nil
+        syncWebViewSafeAreaLayout()
         emit("browserPageLoaded")
     }
 
@@ -2944,6 +3135,7 @@ extension WKWebViewController: WKNavigationDelegate {
             webView.topAnchor.constraint(equalTo: topAnchor)
         ])
         self.view.layoutIfNeeded()
+        syncWebViewSafeAreaLayout()
         refreshWebViewViewportIfNeeded(force: true)
     }
 
@@ -2965,6 +3157,7 @@ extension WKWebViewController: WKNavigationDelegate {
             webView.bottomAnchor.constraint(equalTo: bottomAnchor)
         ])
         self.view.layoutIfNeeded()
+        syncWebViewSafeAreaLayout()
         refreshWebViewViewportIfNeeded(force: true)
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-inappbrowser",
-  "version": "8.6.31",
+  "version": "8.6.34",
   "description": "Capacitor plugin in app browser",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -32,7 +32,7 @@
   ],
   "scripts": {
     "verify": "bun run verify:ios && bun run verify:android && bun run verify:web",
-    "verify:ios": "xcodebuild -scheme CapgoCapacitorInappbrowser -destination generic/platform=iOS",
+    "verify:ios": "bun run build:proxy-bridge && xcodebuild -scheme CapgoCapacitorInappbrowser -destination generic/platform=iOS",
     "verify:android": "cd android && ./gradlew clean build test && cd ..",
     "verify:web": "bun run build && bun run test:web",
     "test:web": "bun test src/proxy-bridge-support.test.ts",
@@ -43,7 +43,7 @@
     "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:proxy-bridge": "esbuild src/proxy-bridge.ts --bundle --outfile=android/src/main/assets/proxy-bridge.js --format=iife --target=es2015",
+    "build:proxy-bridge": "esbuild src/proxy-bridge.ts --bundle --outfile=android/src/main/assets/proxy-bridge.js --format=iife --target=es2015 && mkdir -p ios/Sources/InAppBrowserPlugin/Resources && cp android/src/main/assets/proxy-bridge.js ios/Sources/InAppBrowserPlugin/Resources/proxy-bridge.js",
     "build": "bun run clean && bun run docgen && tsc && rollup -c rollup.config.mjs && bun run build:proxy-bridge",
     "clean": "rimraf ./dist",
     "watch": "tsc --watch",