@capgo/capacitor-inappbrowser 8.6.15 → 8.6.17

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

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

package/ios/Sources/InAppBrowserPlugin/InAppBrowserPlugin.swift

@@ -77,7 +77,7 @@ public class InAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         case aware = "AWARE"
         case fakeVisible = "FAKE_VISIBLE"
     }
-    private let pluginVersion: String = "8.6.15"
+    private let pluginVersion: String = "8.6.17"
     public let identifier = "InAppBrowserPlugin"
     public let jsName = "InAppBrowser"
     public let pluginMethods: [CAPPluginMethod] = [
@@ -342,12 +342,18 @@ public class InAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
             return
         }
 
+        dismissActiveKeyboard()
         let presenter = self.bridge?.viewController?.presentedViewController ?? self.bridge?.viewController
         presenter?.present(navigationController, animated: isAnimated, completion: {
             self.currentPluginCall?.resolve()
         })
     }
 
+    private func dismissActiveKeyboard() {
+        self.bridge?.webView?.endEditing(true)
+        UIApplication.shared.sendAction(#selector(UIResponder.resignFirstResponder), to: nil, from: nil, for: nil)
+    }
+
     private func activeWindow() -> UIWindow? {
         return UIApplication.shared.connectedScenes
             .compactMap { $0 as? UIWindowScene }

package/ios/Sources/InAppBrowserPlugin/ProxySchemeHandler.swift

@@ -403,6 +403,7 @@ enum ProxySchemeRequestSupport {
 }
 
 final class PendingProxyTask {
+    let requestId: String
     let schemeTask: WKURLSchemeTask
     var requestContext: NativeRequestContext
     var responseData: NativeResponseData?
@@ -411,12 +412,32 @@ final class PendingProxyTask {
     var redirectRequest: URLRequest?
     var timeoutToken: UUID?
     var canceled = false
-
-    init(schemeTask: WKURLSchemeTask, requestContext: NativeRequestContext, phase: String) {
+    /// Set true when WebKit calls `webView(_:stop:)` for this task. Once stopped,
+    /// the `WKURLSchemeTask` must never receive `didReceive`/`didFinish`/`didFailWithError`
+    /// again or WebKit raises an uncatchable NSException.
+    var isStopped = false
+    /// Set true the first time a terminal scheme-task call sequence is committed.
+    /// Guarantees at-most-once completion even when multiple async sources
+    /// (URLSession delegate queue, cookie-sync main hop, global timeout, cancel-all)
+    /// race to finish the same request.
+    private var isComplete = false
+
+    init(requestId: String, schemeTask: WKURLSchemeTask, requestContext: NativeRequestContext, phase: String) {
+        self.requestId = requestId
         self.schemeTask = schemeTask
         self.requestContext = requestContext
         self.phase = phase
     }
+
+    /// Claims the right to issue the single allowed terminal call sequence on the
+    /// scheme task. Returns true exactly once, and only while the task is live
+    /// (not stopped). Callers MUST hold the handler's `taskLock` so the claim is
+    /// atomic with respect to `webView(_:stop:)` marking the task stopped.
+    func beginCompletionIfLive() -> Bool {
+        if isComplete || isStopped { return false }
+        isComplete = true
+        return true
+    }
 }
 
 // swiftlint:disable type_body_length
@@ -491,7 +512,7 @@ public class ProxySchemeHandler: NSObject, WKURLSchemeHandler, URLSessionTaskDel
             base64Body: extractBody(from: urlSchemeTask.request),
             isMainFrame: ProxySchemeRequestSupport.isMainFrameRequest(urlSchemeTask.request)
         )
-        let pendingTask = PendingProxyTask(schemeTask: urlSchemeTask, requestContext: requestContext, phase: "outbound")
+        let pendingTask = PendingProxyTask(requestId: requestId, schemeTask: urlSchemeTask, requestContext: requestContext, phase: "outbound")
 
         taskLock.lock()
         pendingTasks[requestId] = pendingTask
@@ -503,6 +524,7 @@ public class ProxySchemeHandler: NSObject, WKURLSchemeHandler, URLSessionTaskDel
     public func webView(_ webView: WKWebView, stop urlSchemeTask: WKURLSchemeTask) {
         taskLock.lock()
         if let entry = pendingTasks.first(where: { $0.value.schemeTask === urlSchemeTask }) {
+            entry.value.isStopped = true
             pendingTasks.removeValue(forKey: entry.key)
             let cleanupToken = UUID()
             stoppedRequests[entry.key] = cleanupToken
@@ -573,7 +595,6 @@ public class ProxySchemeHandler: NSObject, WKURLSchemeHandler, URLSessionTaskDel
 
         if pendingTask.canceled {
             finishWithCanceledResponse(task: pendingTask)
-            removePendingTask(requestId: requestId)
             return
         }
 
@@ -583,7 +604,6 @@ public class ProxySchemeHandler: NSObject, WKURLSchemeHandler, URLSessionTaskDel
         ) {
         case .finishCachedResponse:
             guard let responseData = pendingTask.responseData else { return }
-            removePendingTask(requestId: requestId)
             syncResponseCookies(from: responseData, fallbackURL: pendingTask.requestContext.url) {
                 self.finish(task: pendingTask, with: responseData)
             }
@@ -600,14 +620,14 @@ public class ProxySchemeHandler: NSObject, WKURLSchemeHandler, URLSessionTaskDel
         do {
             request = try makeURLRequest(from: pendingTask.requestContext)
         } catch {
-            pendingTask.schemeTask.didFailWithError(
-                NSError(
+            failSchemeTask(
+                pendingTask,
+                with: NSError(
                     domain: "ProxySchemeHandler",
                     code: -3,
                     userInfo: [NSLocalizedDescriptionKey: error.localizedDescription]
                 )
             )
-            removePendingTask(requestId: requestId)
             return
         }
         let task = session.dataTask(with: request) { [weak self] data, response, error in
@@ -615,13 +635,18 @@ public class ProxySchemeHandler: NSObject, WKURLSchemeHandler, URLSessionTaskDel
             guard let pendingTask = self.pendingTask(for: requestId) else { return }
 
             if let error {
-                if (error as NSError).code == NSURLErrorCancelled, pendingTask.redirectRequest != nil {
+                if (error as NSError).code == NSURLErrorCancelled {
+                    // The data task is only canceled by webView(_:stop:) or
+                    // cancelAllPendingTasks(), and both own the task's lifecycle: stop has
+                    // already removed it (and marked it stopped) before canceling, while
+                    // cancelAll routes a terminal failSchemeTask through completeSchemeTask,
+                    // which removes it on the main queue. Removing it here on the URLSession
+                    // background queue would unhook it from pendingTasks before a racing
+                    // stop could mark it stopped, reopening the post-stop completion crash.
+                    // So just stop processing and let the owning path complete it.
                     return
                 }
-                if (error as NSError).code != NSURLErrorCancelled {
-                    pendingTask.schemeTask.didFailWithError(error)
-                }
-                self.removePendingTask(requestId: requestId)
+                self.failSchemeTask(pendingTask, with: error)
                 return
             }
 
@@ -680,13 +705,11 @@ public class ProxySchemeHandler: NSObject, WKURLSchemeHandler, URLSessionTaskDel
             switch inboundRule.action {
             case .cancel:
                 finishWithCanceledResponse(task: pendingTask)
-                removePendingTask(requestId: requestId)
             case .continue:
                 if pendingTask.redirectRequest != nil {
                     followPendingRedirect(requestId: requestId)
                 } else {
                     finish(task: pendingTask, with: responseData)
-                    removePendingTask(requestId: requestId)
                 }
             case .delegateToJs:
                 emitProxyEvent(requestId: requestId, pendingTask: pendingTask)
@@ -697,7 +720,6 @@ public class ProxySchemeHandler: NSObject, WKURLSchemeHandler, URLSessionTaskDel
                 followPendingRedirect(requestId: requestId)
             } else {
                 finish(task: pendingTask, with: responseData)
-                removePendingTask(requestId: requestId)
             }
         }
     }
@@ -759,7 +781,6 @@ public class ProxySchemeHandler: NSObject, WKURLSchemeHandler, URLSessionTaskDel
                 self.fallbackToNativePipeline(requestId: requestId)
                 return
             case .finishCachedResponse:
-                self.pendingTasks.removeValue(forKey: requestId)
                 self.taskLock.unlock()
                 guard let responseData else { return }
                 self.syncResponseCookies(from: responseData, fallbackURL: pendingTask.requestContext.url) {
@@ -767,12 +788,12 @@ public class ProxySchemeHandler: NSObject, WKURLSchemeHandler, URLSessionTaskDel
                 }
                 return
             case .failRequest:
-                self.pendingTasks.removeValue(forKey: requestId)
                 self.taskLock.unlock()
             }
 
-            pendingTask.schemeTask.didFailWithError(
-                NSError(
+            self.failSchemeTask(
+                pendingTask,
+                with: NSError(
                     domain: "ProxySchemeHandler",
                     code: NSURLErrorTimedOut,
                     userInfo: [NSLocalizedDescriptionKey: "Proxy handler did not respond within \(Int(self.proxyTimeoutSeconds)) seconds"]
@@ -825,14 +846,6 @@ public class ProxySchemeHandler: NSObject, WKURLSchemeHandler, URLSessionTaskDel
         return task
     }
 
-    private func removePendingTask(requestId: String) {
-        taskLock.lock()
-        pendingTasks.removeValue(forKey: requestId)
-        stoppedRequests.removeValue(forKey: requestId)
-        timedOutRequests.removeValue(forKey: requestId)
-        taskLock.unlock()
-    }
-
     private func routeCurrentRequest(requestId: String) {
         guard let pendingTask = pendingTask(for: requestId) else { return }
         pendingTask.phase = "outbound"
@@ -842,7 +855,6 @@ public class ProxySchemeHandler: NSObject, WKURLSchemeHandler, URLSessionTaskDel
             switch outboundRule.action {
             case .cancel:
                 finishWithCanceledResponse(task: pendingTask)
-                removePendingTask(requestId: requestId)
             case .continue:
                 executeNativePipeline(requestId: requestId)
             case .delegateToJs:
@@ -1022,27 +1034,73 @@ public class ProxySchemeHandler: NSObject, WKURLSchemeHandler, URLSessionTaskDel
         )
     }
 
+    /// Runs a terminal `WKURLSchemeTask` call sequence at most once, and never after
+    /// the task has been stopped.
+    ///
+    /// `WKURLSchemeTask` raises an uncatchable NSException if `didReceive`/`didFinish`/
+    /// `didFailWithError` is called after `webView(_:stop:)`, after the task already
+    /// completed, or out of order. Completion can be triggered from several racing
+    /// sources — the URLSession delegate queue, the cookie-sync main-thread hop, the
+    /// global timeout closure, `webView(_:stop:)`, and `cancelAllPendingTasks()`. This
+    /// helper funnels every terminal call onto the main thread (the same queue WebKit
+    /// uses for `start`/`stop`) and gates it behind `beginCompletionIfLive()`, so the
+    /// liveness check and the actual call cannot be separated by a `stop`.
+    ///
+    /// This helper is also the single owner of task removal. Callers MUST NOT remove
+    /// the task from `pendingTasks` eagerly on a background thread before calling a
+    /// terminal method: doing so creates a window where `webView(_:stop:)` (which only
+    /// finds tasks via `pendingTasks`) can no longer mark the task stopped, so a queued
+    /// completion would then call `didReceive`/`didFinish`/`didFailWithError` on an
+    /// already-stopped task and crash. Keeping the task tracked until this main-queue
+    /// block runs lets a racing `stop` win the liveness claim.
+    private func completeSchemeTask(_ task: PendingProxyTask, _ body: @escaping (WKURLSchemeTask) -> Void) {
+        let runBody: () -> Void = { [weak self] in
+            guard let self else { return }
+            self.taskLock.lock()
+            let isLive = task.beginCompletionIfLive()
+            self.pendingTasks.removeValue(forKey: task.requestId)
+            self.stoppedRequests.removeValue(forKey: task.requestId)
+            self.timedOutRequests.removeValue(forKey: task.requestId)
+            self.taskLock.unlock()
+            guard isLive else { return }
+            body(task.schemeTask)
+        }
+        if Thread.isMainThread {
+            runBody()
+        } else {
+            DispatchQueue.main.async(execute: runBody)
+        }
+    }
+
+    private func failSchemeTask(_ task: PendingProxyTask, with error: Error) {
+        completeSchemeTask(task) { schemeTask in
+            schemeTask.didFailWithError(error)
+        }
+    }
+
     private func finish(task: PendingProxyTask, with responseData: NativeResponseData) {
-        guard let url = URL(string: task.requestContext.url),
-              let httpResponse = HTTPURLResponse(
-                url: url,
-                statusCode: responseData.statusCode,
-                httpVersion: "HTTP/1.1",
-                headerFields: responseData.headers
-              )
-        else {
-            task.schemeTask.didFailWithError(
-                NSError(
-                    domain: "ProxySchemeHandler",
-                    code: -2,
-                    userInfo: [NSLocalizedDescriptionKey: "Failed to create response"]
+        completeSchemeTask(task) { schemeTask in
+            guard let url = URL(string: task.requestContext.url),
+                  let httpResponse = HTTPURLResponse(
+                    url: url,
+                    statusCode: responseData.statusCode,
+                    httpVersion: "HTTP/1.1",
+                    headerFields: responseData.headers
+                  )
+            else {
+                schemeTask.didFailWithError(
+                    NSError(
+                        domain: "ProxySchemeHandler",
+                        code: -2,
+                        userInfo: [NSLocalizedDescriptionKey: "Failed to create response"]
+                    )
                 )
-            )
-            return
+                return
+            }
+            schemeTask.didReceive(httpResponse)
+            schemeTask.didReceive(responseData.body)
+            schemeTask.didFinish()
         }
-        task.schemeTask.didReceive(httpResponse)
-        task.schemeTask.didReceive(responseData.body)
-        task.schemeTask.didFinish()
     }
 
     private func finishWithCanceledResponse(task: PendingProxyTask) {
@@ -1138,15 +1196,19 @@ public class ProxySchemeHandler: NSObject, WKURLSchemeHandler, URLSessionTaskDel
     func cancelAllPendingTasks() {
         taskLock.lock()
         let pending = pendingTasks
-        pendingTasks.removeAll()
+        // Do not clear pendingTasks here. completeSchemeTask removes each task on the
+        // main queue once its failure is claimed, so a concurrent webView(_:stop:) can
+        // still find and mark the task stopped before the queued failure runs. Clearing
+        // eagerly would reopen the post-stop completion crash this fix closes.
         stoppedRequests.removeAll()
         taskLock.unlock()
         session.invalidateAndCancel()
 
         for (_, task) in pending {
             task.urlSessionTask?.cancel()
-            task.schemeTask.didFailWithError(
-                NSError(
+            failSchemeTask(
+                task,
+                with: NSError(
                     domain: "ProxySchemeHandler",
                     code: NSURLErrorCancelled,
                     userInfo: [NSLocalizedDescriptionKey: "WebView closed"]

package/ios/Sources/InAppBrowserPlugin/WKWebViewController.swift

@@ -226,6 +226,16 @@ enum ConsoleMessageSupport {
     }
 }
 
+enum WebViewViewportLayoutSupport {
+    static func shouldRefreshViewport(previousSize: CGSize?, currentSize: CGSize, force: Bool = false) -> Bool {
+        guard currentSize.width > 0, currentSize.height > 0 else {
+            return false
+        }
+
+        return force || previousSize != currentSize
+    }
+}
+
 open class WKWebViewController: UIViewController, WKScriptMessageHandler {
 
     public init() {
@@ -343,9 +353,6 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
     var shareDisclaimer: [String: Any]?
     var shareSubject: String?
     var didpageInit = false
-    var viewHeightLandscape: CGFloat?
-    var viewHeightPortrait: CGFloat?
-    var currentViewHeight: CGFloat?
     open var closeModal = false
     open var closeModalTitle = ""
     open var closeModalDescription = ""
@@ -386,6 +393,8 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
     internal var preShowSemaphore: DispatchSemaphore?
     internal var preShowError: String?
     private var isWebViewInitialized = false
+    private var isObservingKeyboardViewportChanges = false
+    private var lastViewportRefreshSize: CGSize?
     private var downloadStates: [ObjectIdentifier: WKDownloadState] = [:]
     private var previewItemURL: URL?
 
@@ -432,10 +441,10 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
 
     private func attachmentDispositionType(_ response: URLResponse) -> String? {
         guard let disposition = attachmentDisposition(response)?
-            .split(separator: ";", maxSplits: 1)
-            .first?
-            .trimmingCharacters(in: .whitespacesAndNewlines)
-            .lowercased(),
+                .split(separator: ";", maxSplits: 1)
+                .first?
+                .trimmingCharacters(in: .whitespacesAndNewlines)
+                .lowercased(),
               !disposition.isEmpty else {
             return nil
         }
@@ -527,7 +536,7 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
             "application/download",
             "application/x-download",
             "application/binary",
-            "application/x-binary",
+            "application/x-binary"
         ]
 
         if let candidate, !candidate.isEmpty, !genericMimeTypes.contains(candidate) {
@@ -590,7 +599,7 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
             "fileName": fileURL.lastPathComponent,
             "path": fileURL.path,
             "localUrl": fileURL.absoluteString,
-            "handledBy": handledBy,
+            "handledBy": handledBy
         ]
         if let sourceURL {
             data["sourceUrl"] = sourceURL
@@ -842,6 +851,7 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
     }
 
     deinit {
+        NotificationCenter.default.removeObserver(self)
         webView?.removeObserver(self, forKeyPath: estimatedProgressKeyPath)
         if websiteTitleInNavigationBar {
             webView?.removeObserver(self, forKeyPath: titleKeyPath)
@@ -886,6 +896,11 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
         }
     }
 
+    override open func viewDidLayoutSubviews() {
+        super.viewDidLayoutSubviews()
+        refreshWebViewViewportIfNeeded()
+    }
+
     func updateButtonTintColors() {
         // Ensure all button items use the navigation bar's tint color
         if let tintColor = navigationController?.navigationBar.tintColor {
@@ -986,6 +1001,63 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
         capBrowserPlugin?.notifyListeners(eventName, data: payload(with: data))
     }
 
+    private func startObservingKeyboardViewportChanges() {
+        guard !isObservingKeyboardViewportChanges else {
+            return
+        }
+
+        isObservingKeyboardViewportChanges = true
+        let center = NotificationCenter.default
+        center.addObserver(self, selector: #selector(keyboardViewportDidChange(_:)), name: UIResponder.keyboardWillHideNotification, object: nil)
+        center.addObserver(self, selector: #selector(keyboardViewportDidChange(_:)), name: UIResponder.keyboardDidHideNotification, object: nil)
+        center.addObserver(self, selector: #selector(keyboardViewportDidChange(_:)), name: UIResponder.keyboardDidChangeFrameNotification, object: nil)
+    }
+
+    @objc private func keyboardViewportDidChange(_ notification: Notification) {
+        scheduleWebViewViewportRefresh(force: true, delay: viewportRefreshDelay(from: notification))
+    }
+
+    private func viewportRefreshDelay(from notification: Notification) -> TimeInterval {
+        guard let duration = notification.userInfo?[UIResponder.keyboardAnimationDurationUserInfoKey] as? NSNumber else {
+            return 0.05
+        }
+
+        return max(0.05, duration.doubleValue)
+    }
+
+    private func scheduleWebViewViewportRefresh(force: Bool = false, delay: TimeInterval = 0.05) {
+        DispatchQueue.main.asyncAfter(deadline: .now() + delay) { [weak self] in
+            self?.refreshWebViewViewportIfNeeded(force: force)
+        }
+    }
+
+    private func refreshWebViewViewportIfNeeded(force: Bool = false) {
+        guard let webView = self.webView, webView.superview != nil else {
+            return
+        }
+
+        if force {
+            self.view.setNeedsLayout()
+            self.view.layoutIfNeeded()
+        }
+
+        let currentSize = webView.bounds.size
+        guard WebViewViewportLayoutSupport.shouldRefreshViewport(
+            previousSize: lastViewportRefreshSize,
+            currentSize: currentSize,
+            force: force
+        ) else {
+            return
+        }
+
+        lastViewportRefreshSize = currentSize
+        webView.setNeedsLayout()
+        webView.layoutIfNeeded()
+        webView.scrollView.setNeedsLayout()
+        webView.scrollView.layoutIfNeeded()
+        webView.evaluateJavaScript("window.dispatchEvent(new Event('resize'));", completionHandler: nil)
+    }
+
     private func jsonString(from object: Any) -> String? {
         guard JSONSerialization.isValidJSONObject(object),
               let data = try? JSONSerialization.data(withJSONObject: object),
@@ -1251,6 +1323,7 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
             return
         }
         self.isWebViewInitialized = true
+        self.startObservingKeyboardViewportChanges()
         self.view.backgroundColor = UIColor.white
 
         self.extendedLayoutIncludesOpaqueBars = true
@@ -1540,47 +1613,6 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
         return self.capableWebView
     }
 
-    @objc func restateViewHeight() {
-        var bottomPadding = CGFloat(0.0)
-        var topPadding = CGFloat(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 {
-                self.viewHeightPortrait = self.view.safeAreaLayoutGuide.layoutFrame.size.height
-                self.viewHeightPortrait! += bottomPadding
-                if self.navigationController?.navigationBar.isHidden == true {
-                    self.viewHeightPortrait! += topPadding
-                }
-            }
-            self.currentViewHeight = self.viewHeightPortrait
-        } else if UIDevice.current.orientation.isLandscape {
-            // Don't force toolbar visibility
-            if self.viewHeightLandscape == nil {
-                self.viewHeightLandscape = self.view.safeAreaLayoutGuide.layoutFrame.size.height
-                self.viewHeightLandscape! += bottomPadding
-                if self.navigationController?.navigationBar.isHidden == true {
-                    self.viewHeightLandscape! += topPadding
-                }
-            }
-            self.currentViewHeight = self.viewHeightLandscape
-        }
-    }
-
-    override open func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
-        //        self.view.frame.size.height = self.currentViewHeight!
-    }
-
-    override open func viewWillLayoutSubviews() {
-        restateViewHeight()
-        // Don't override frame height when enabledSafeBottomMargin is true, as it would override our constraints
-        if self.currentViewHeight != nil && !self.enabledSafeBottomMargin {
-            self.view.frame.size.height = self.currentViewHeight!
-        }
-    }
-
     override open func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         if !self.viewWasPresented {
@@ -1620,6 +1652,8 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
 
     override open func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
+        refreshWebViewViewportIfNeeded(force: true)
+        scheduleWebViewViewportRefresh(force: true, delay: 0.25)
 
         // Force add buttonNearDone if it's not visible yet
         if buttonNearDoneIcon != nil {
@@ -2907,6 +2941,7 @@ extension WKWebViewController: WKNavigationDelegate {
             webView.topAnchor.constraint(equalTo: topAnchor)
         ])
         self.view.layoutIfNeeded()
+        refreshWebViewViewportIfNeeded(force: true)
     }
 
     open func updateSafeBottomMargin(_ enabled: Bool) {
@@ -2927,6 +2962,7 @@ extension WKWebViewController: WKNavigationDelegate {
             webView.bottomAnchor.constraint(equalTo: bottomAnchor)
         ])
         self.view.layoutIfNeeded()
+        refreshWebViewViewportIfNeeded(force: true)
     }
 }
 

package/package.json

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