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

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

@@ -3868,12 +3868,8 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
             if (_webView != webView) {
                 return;
             }
-            int targetY = ReloadGestureSupport.webViewScrollYAfterGestureReload(webView.getScrollY());
-            if (webView.getScrollY() != targetY) {
-                webView.scrollTo(webView.getScrollX(), targetY);
-            }
-            if (swipeRefreshLayout != null) {
-                swipeRefreshLayout.setRefreshing(false);
+            if (webView.getScrollY() != 0) {
+                webView.scrollTo(webView.getScrollX(), 0);
             }
         });
     }

package/ios/Sources/InAppBrowserPlugin/InAppBrowserPlugin.swift

@@ -250,9 +250,6 @@ enum CustomWebViewFrameSupport {
 }
 
 enum ReloadGestureSupport {
-    /// Approximate UIRefreshControl activation distance in points.
-    static let defaultPullThreshold: CGFloat = 60
-
     /// 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 {
@@ -264,25 +261,30 @@ enum ReloadGestureSupport {
         max(0, -(contentOffsetY + adjustedContentInsetTop))
     }
 
-    static func isPullPastRefreshThreshold(
-        contentOffsetY: CGFloat,
-        adjustedContentInsetTop: CGFloat,
-        threshold: CGFloat = defaultPullThreshold
+    /// After intentional touch end, reload only if still near the activation pull distance
+    /// captured when UIRefreshControl fired `.valueChanged` (not a fixed constant).
+    static func shouldReloadOnTouchEnd(
+        pendingReload: Bool,
+        currentPullDistance: CGFloat,
+        armedPullDistance: CGFloat
     ) -> Bool {
-        pullDistance(contentOffsetY: contentOffsetY, adjustedContentInsetTop: adjustedContentInsetTop) >= threshold
-    }
-
-    /// After intentional touch end, reload only if pull is still past the threshold.
-    static func shouldReloadOnTouchEnd(pendingReload: Bool, isPullPastThreshold: Bool) -> Bool {
-        pendingReload && isPullPastThreshold
+        guard pendingReload, armedPullDistance > 0 else { return false }
+        // Allow slight finger jitter below the exact activation point.
+        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.
     static func contentOffsetYAfterReloadReset(
         currentY: CGFloat,
-        adjustedContentInsetTop: CGFloat
+        adjustedContentInsetTop: CGFloat,
+        forceToRestingTop: Bool = false
     ) -> CGFloat {
         let restingY = -adjustedContentInsetTop
+        if forceToRestingTop {
+            return restingY
+        }
         return currentY < restingY ? restingY : currentY
     }
 }

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

@@ -11,6 +11,7 @@ extension WKWebViewController {
 
         guard enableReloadGesture, !disableOverscroll else {
             pendingReloadFromGesture = false
+            reloadGestureArmedPullDistance = 0
             return
         }
 
@@ -40,6 +41,11 @@ 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
+            )
             return
         }
 
@@ -52,30 +58,35 @@ extension WKWebViewController {
 
         switch gesture.state {
         case .ended:
-            let pastThreshold = ReloadGestureSupport.isPullPastRefreshThreshold(
+            let pullDistance = ReloadGestureSupport.pullDistance(
                 contentOffsetY: scrollView.contentOffset.y,
                 adjustedContentInsetTop: scrollView.adjustedContentInset.top
             )
             let shouldReload = ReloadGestureSupport.shouldReloadOnTouchEnd(
                 pendingReload: pendingReloadFromGesture,
-                isPullPastThreshold: pastThreshold
+                currentPullDistance: pullDistance,
+                armedPullDistance: reloadGestureArmedPullDistance
             )
             pendingReloadFromGesture = false
+            reloadGestureArmedPullDistance = 0
 
             if shouldReload {
                 performReloadFromGesture()
             } else if !reloadFromGestureInProgress,
                       scrollView.refreshControl?.isRefreshing == true {
                 scrollView.refreshControl?.endRefreshing()
-                resetReloadGestureScrollState(on: scrollView)
+                resetReloadGestureScrollState(on: scrollView, forceToRestingTop: false)
             }
 
         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)
+                resetReloadGestureScrollState(on: scrollView, forceToRestingTop: false)
             }
 
         default:
@@ -85,40 +96,59 @@ extension WKWebViewController {
 
     private func performReloadFromGesture() {
         pendingReloadFromGesture = false
+        reloadGestureArmedPullDistance = 0
         reloadFromGestureInProgress = true
-        reload()
+        // Track this navigation so cancelled prior loads don't clear gesture state early.
+        reloadGestureNavigation = self.capableWebView?.reload()
+        if reloadGestureNavigation == nil {
+            stopReloadGesture()
+        }
     }
 
-    private func resetReloadGestureScrollState(on scrollView: UIScrollView) {
-        // Keep baseline/safe-area insets; only clamp sticky refresh overscroll.
+    private func resetReloadGestureScrollState(on scrollView: UIScrollView, forceToRestingTop: Bool) {
         let resetY = ReloadGestureSupport.contentOffsetYAfterReloadReset(
             currentY: scrollView.contentOffset.y,
-            adjustedContentInsetTop: scrollView.adjustedContentInset.top
+            adjustedContentInsetTop: scrollView.adjustedContentInset.top,
+            forceToRestingTop: forceToRestingTop
         )
         if resetY != scrollView.contentOffset.y {
             scrollView.setContentOffset(CGPoint(x: scrollView.contentOffset.x, y: resetY), animated: false)
         }
     }
 
-    func stopReloadGesture() {
+    func stopReloadGesture(for navigation: WKNavigation? = nil) {
+        // Ordinary page finishes must not clear an armed pull the user is still holding.
+        guard reloadFromGestureInProgress else { return }
+
+        // Ignore unrelated navigation callbacks while a gesture reload is in flight.
+        if let expected = reloadGestureNavigation,
+           let navigation,
+           expected !== navigation {
+            return
+        }
+
         pendingReloadFromGesture = false
-        let shouldResetScroll = reloadFromGestureInProgress
         reloadFromGestureInProgress = false
+        reloadGestureNavigation = nil
+        reloadGestureArmedPullDistance = 0
 
         guard let activeWebView = self.capableWebView else { return }
         let scrollView = activeWebView.scrollView
         scrollView.refreshControl?.endRefreshing()
 
-        guard shouldResetScroll else { return }
-
-        // UIRefreshControl + WKWebView.reload() often leave a top gap and block the next pull
-        // until a full document navigation recreates scroll state.
+        // UIRefreshControl + WKWebView.reload() often leave offset at 0 instead of
+        // -adjustedContentInset.top (clips header ~safe-area) and block the next pull.
         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)
+            self.resetReloadGestureScrollState(on: scrollView, forceToRestingTop: true)
             self.configureReloadGesture(for: activeWebView)
+            // Rebind can change adjusted insets; snap again to the new resting top.
+            self.resetReloadGestureScrollState(
+                on: activeWebView.scrollView,
+                forceToRestingTop: true
+            )
         }
     }
 }

package/ios/Sources/InAppBrowserPlugin/WKWebViewController.swift

@@ -474,6 +474,8 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
     var enableReloadGesture: Bool = false
     var pendingReloadFromGesture = false
     var reloadFromGestureInProgress = false
+    var reloadGestureNavigation: WKNavigation?
+    var reloadGestureArmedPullDistance: CGFloat = 0
     var reloadPanObserverInstalled = false
     var disableOverscroll: Bool = false
     var proxyRequests: Bool = false
@@ -2576,6 +2578,8 @@ public extension WKWebViewController {
         }
         pendingReloadFromGesture = false
         reloadFromGestureInProgress = false
+        reloadGestureNavigation = nil
+        reloadGestureArmedPullDistance = 0
 
         // Remove KVO observers FIRST, before any operation that could trigger them
         webView.removeObserver(self, forKeyPath: estimatedProgressKeyPath)
@@ -3522,7 +3526,7 @@ extension WKWebViewController: WKNavigationDelegate {
         lastInjectedSafeAreaInsets = nil
         syncWebViewSafeAreaLayout()
         emit("browserPageLoaded")
-        stopReloadGesture()
+        stopReloadGesture(for: navigation)
     }
 
     public func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {
@@ -3532,7 +3536,7 @@ extension WKWebViewController: WKNavigationDelegate {
             self.url = url
             delegate?.webViewController?(self, didFail: url, withError: error)
         }
-        stopReloadGesture()
+        stopReloadGesture(for: navigation)
         emit("pageLoadError")
     }
 
@@ -3543,7 +3547,7 @@ extension WKWebViewController: WKNavigationDelegate {
             self.url = url
             delegate?.webViewController?(self, didFail: url, withError: error)
         }
-        stopReloadGesture()
+        stopReloadGesture(for: navigation)
         emit("pageLoadError")
     }
 

package/package.json

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

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

@@ -1,16 +0,0 @@
-package ee.forgr.capacitor_inappbrowser;
-
-/**
- * Pure helpers for pull-to-refresh reset after a gesture reload.
- * Sticky scrollY greater than 0 makes SwipeRefreshLayout think the child can scroll up,
- * which disables the next pull until a full document navigation.
- */
-final class ReloadGestureSupport {
-
-    private ReloadGestureSupport() {}
-
-    /** Pin vertical scroll to top after a gesture reload so the next pull can start. */
-    static int webViewScrollYAfterGestureReload(int currentScrollY) {
-        return 0;
-    }
-}