@capgo/capacitor-inappbrowser 8.12.2-beta.pr634.543.1 → 8.12.2-beta.pr634.550.1

package/ios/Sources/InAppBrowserPlugin/InAppBrowserPlugin.swift

@@ -250,6 +250,11 @@ enum CustomWebViewFrameSupport {
 }
 
 enum ReloadGestureSupport {
+    /// Ordinary page finishes must not clear an armed pull still held by the user.
+    static func shouldApplyStopReloadGesture(reloadFromGestureInProgress: Bool) -> Bool {
+        reloadFromGestureInProgress
+    }
+
     /// UIRefreshControl may fire valueChanged while the finger is still down.
     /// Match browser UX: commit reload only after touch end.
     static func shouldDeferReloadUntilTouchEnd(isTracking: Bool, isDragging: Bool) -> Bool {
@@ -273,18 +278,18 @@ enum ReloadGestureSupport {
         return currentPullDistance >= armedPullDistance * 0.9
     }
 
-    /// Resting offset for the current adjusted top inset (safe-area aware).
-    /// - Parameter forceToRestingTop: After gesture reload, always snap to resting top (fixes clipped header).
-    ///   Otherwise only un-overscroll after a cancelled pull.
+    /// Resting offset after gesture reload.
+    /// Plugin safe-area uses CSS variables with `contentInset = .zero`, so forced reset is always `0`.
+    /// - Parameter forceToRestingTop: After gesture reload, snap to top. Otherwise only un-overscroll.
     static func contentOffsetYAfterReloadReset(
         currentY: CGFloat,
         adjustedContentInsetTop: CGFloat,
         forceToRestingTop: Bool = false
     ) -> CGFloat {
-        let restingY = -adjustedContentInsetTop
         if forceToRestingTop {
-            return restingY
+            return 0
         }
+        let restingY = -adjustedContentInsetTop
         return currentY < restingY ? restingY : currentY
     }
 }

package/ios/Sources/InAppBrowserPlugin/WKWebViewController+ReloadGesture.swift

@@ -9,6 +9,10 @@ extension WKWebViewController {
             targetWebView.scrollView.refreshControl = nil
         }
 
+        // UIRefreshControl can leave sticky insets that clip the page header after reload.
+        targetWebView.scrollView.contentInset = .zero
+        targetWebView.scrollView.scrollIndicatorInsets = .zero
+
         guard enableReloadGesture, !disableOverscroll else {
             pendingReloadFromGesture = false
             reloadGestureArmedPullDistance = 0
@@ -41,7 +45,6 @@ extension WKWebViewController {
             isDragging: scrollView.isDragging
         ) {
             pendingReloadFromGesture = true
-            // Capture the real activation pull distance from UIRefreshControl.
             reloadGestureArmedPullDistance = ReloadGestureSupport.pullDistance(
                 contentOffsetY: scrollView.contentOffset.y,
                 adjustedContentInsetTop: scrollView.adjustedContentInset.top
@@ -75,18 +78,16 @@ extension WKWebViewController {
             } else if !reloadFromGestureInProgress,
                       scrollView.refreshControl?.isRefreshing == true {
                 scrollView.refreshControl?.endRefreshing()
-                resetReloadGestureScrollState(on: scrollView, forceToRestingTop: false)
+                hardResetReloadGestureScroll(on: scrollView)
             }
 
         case .cancelled, .failed:
-            // System interruption — never commit a reload.
             pendingReloadFromGesture = false
             reloadGestureArmedPullDistance = 0
-            // Don't touch an in-flight gesture reload's spinner / scroll.
             guard !reloadFromGestureInProgress else { break }
             if scrollView.refreshControl?.isRefreshing == true {
                 scrollView.refreshControl?.endRefreshing()
-                resetReloadGestureScrollState(on: scrollView, forceToRestingTop: false)
+                hardResetReloadGestureScroll(on: scrollView)
             }
 
         default:
@@ -98,29 +99,43 @@ extension WKWebViewController {
         pendingReloadFromGesture = false
         reloadGestureArmedPullDistance = 0
         reloadFromGestureInProgress = true
-        // Track this navigation so cancelled prior loads don't clear gesture state early.
-        reloadGestureNavigation = self.capableWebView?.reload()
+
+        guard let webView = self.capableWebView else {
+            stopReloadGesture()
+            return
+        }
+
+        // `reload()` preserves broken scroll/inset state after UIRefreshControl.
+        // A fresh URL load matches a normal navigation and resets scroll like the reporter's "proper" reload.
+        if let url = webView.url {
+            reloadGestureNavigation = webView.load(URLRequest(url: url))
+        } else {
+            reloadGestureNavigation = webView.reload()
+        }
+
         if reloadGestureNavigation == nil {
             stopReloadGesture()
         }
     }
 
-    private func resetReloadGestureScrollState(on scrollView: UIScrollView, forceToRestingTop: Bool) {
+    private func hardResetReloadGestureScroll(on scrollView: UIScrollView) {
+        scrollView.contentInset = .zero
+        scrollView.scrollIndicatorInsets = .zero
         let resetY = ReloadGestureSupport.contentOffsetYAfterReloadReset(
             currentY: scrollView.contentOffset.y,
-            adjustedContentInsetTop: scrollView.adjustedContentInset.top,
-            forceToRestingTop: forceToRestingTop
+            adjustedContentInsetTop: 0,
+            forceToRestingTop: true
         )
-        if resetY != scrollView.contentOffset.y {
-            scrollView.setContentOffset(CGPoint(x: scrollView.contentOffset.x, y: resetY), animated: false)
+        if scrollView.contentOffset.y != resetY || scrollView.contentOffset.x != 0 {
+            scrollView.setContentOffset(CGPoint(x: 0, y: resetY), animated: false)
         }
     }
 
     func stopReloadGesture(for navigation: WKNavigation? = nil) {
-        // Ordinary page finishes must not clear an armed pull the user is still holding.
-        guard reloadFromGestureInProgress else { return }
+        guard ReloadGestureSupport.shouldApplyStopReloadGesture(
+            reloadFromGestureInProgress: reloadFromGestureInProgress
+        ) else { return }
 
-        // Ignore unrelated navigation callbacks while a gesture reload is in flight.
         if let expected = reloadGestureNavigation,
            let navigation,
            expected !== navigation {
@@ -133,22 +148,23 @@ extension WKWebViewController {
         reloadGestureArmedPullDistance = 0
 
         guard let activeWebView = self.capableWebView else { return }
-        let scrollView = activeWebView.scrollView
-        scrollView.refreshControl?.endRefreshing()
+        activeWebView.scrollView.refreshControl?.endRefreshing()
 
-        // UIRefreshControl + WKWebView.reload() often leave offset at 0 instead of
-        // -adjustedContentInset.top (clips header ~safe-area) and block the next pull.
+        // Reset after the current runloop so WKWebView finishes applying navigation scroll state.
         DispatchQueue.main.async { [weak self] in
             guard let self, let activeWebView = self.capableWebView else { return }
             let scrollView = activeWebView.scrollView
             scrollView.refreshControl?.endRefreshing()
-            self.resetReloadGestureScrollState(on: scrollView, forceToRestingTop: true)
+            self.hardResetReloadGestureScroll(on: scrollView)
             self.configureReloadGesture(for: activeWebView)
-            // Rebind can change adjusted insets; snap again to the new resting top.
-            self.resetReloadGestureScrollState(
-                on: activeWebView.scrollView,
-                forceToRestingTop: true
-            )
+            self.hardResetReloadGestureScroll(on: activeWebView.scrollView)
+            activeWebView.evaluateJavaScript("window.scrollTo(0, 0);", completionHandler: nil)
+
+            // One more pass after layout / JS scroll restoration.
+            DispatchQueue.main.async { [weak self] in
+                guard let self, let activeWebView = self.capableWebView else { return }
+                self.hardResetReloadGestureScroll(on: activeWebView.scrollView)
+            }
         }
     }
 }

package/ios/Sources/InAppBrowserPlugin/WKWebViewController.swift

@@ -3523,10 +3523,11 @@ extension WKWebViewController: WKNavigationDelegate {
             delegate?.webViewController?(self, didFinish: url)
         }
         self.injectJavaScriptInterface()
+        // End refresh + clear sticky insets before safe-area sync zeroes contentInset.
+        stopReloadGesture(for: navigation)
         lastInjectedSafeAreaInsets = nil
         syncWebViewSafeAreaLayout()
         emit("browserPageLoaded")
-        stopReloadGesture(for: navigation)
     }
 
     public func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {
@@ -3677,10 +3678,16 @@ extension WKWebViewController: WKNavigationDelegate {
 
     public func webView(_ webView: WKWebView, navigationAction: WKNavigationAction, didBecome download: WKDownload) {
         register(download: download, response: nil, sourceURL: navigationAction.request.url?.absoluteString)
+        stopReloadGesture()
     }
 
     public func webView(_ webView: WKWebView, navigationResponse: WKNavigationResponse, didBecome download: WKDownload) {
         register(download: download, response: navigationResponse.response)
+        stopReloadGesture()
+    }
+
+    public func webViewWebContentProcessDidTerminate(_ webView: WKWebView) {
+        stopReloadGesture()
     }
 
     // MARK: - Dimension Management

package/package.json

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