expo-scroll-forwarder 0.1.2 → 0.1.4

package/android/src/main/java/expo/modules/scrollforwarder/ExpoScrollForwarderView.kt

@@ -4,10 +4,9 @@ import android.animation.ValueAnimator
 import android.content.Context
 import android.view.GestureDetector
 import android.view.MotionEvent
-import android.view.View
-import android.widget.ScrollView
 import android.view.animation.DecelerateInterpolator
 import androidx.core.view.GestureDetectorCompat
+import com.facebook.react.views.scroll.ReactScrollView
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.views.ExpoView
 import kotlin.math.abs
@@ -20,7 +19,7 @@ class ExpoScrollForwarderView(context: Context, appContext: AppContext) : ExpoVi
       tryFindScrollView()
     }
 
-  private var targetScrollView: ScrollView? = null
+  private var reactScrollView: ReactScrollView? = null
   private var gestureDetector: GestureDetectorCompat
   private var isScrolling = false
   private var initialScrollY = 0
@@ -33,7 +32,7 @@ class ExpoScrollForwarderView(context: Context, appContext: AppContext) : ExpoVi
   }
 
   override fun onInterceptTouchEvent(ev: MotionEvent): Boolean {
-    val scrollView = targetScrollView ?: return super.onInterceptTouchEvent(ev)
+    val scrollView = reactScrollView ?: return super.onInterceptTouchEvent(ev)
     
     when (ev.action) {
       MotionEvent.ACTION_DOWN -> {
@@ -65,7 +64,7 @@ class ExpoScrollForwarderView(context: Context, appContext: AppContext) : ExpoVi
   }
 
   override fun onTouchEvent(event: MotionEvent): Boolean {
-    val scrollView = targetScrollView ?: return super.onTouchEvent(event)
+    val scrollView = reactScrollView ?: return super.onTouchEvent(event)
     
     gestureDetector.onTouchEvent(event)
     
@@ -135,7 +134,7 @@ class ExpoScrollForwarderView(context: Context, appContext: AppContext) : ExpoVi
     }
   }
 
-  private fun startDecayAnimation(scrollView: ScrollView, velocity: Float) {
+  private fun startDecayAnimation(scrollView: ReactScrollView, velocity: Float) {
     var currentVelocity = velocity.coerceIn(-5000f, 5000f)
     val startOffset = scrollView.scrollY
     var currentOffset = startOffset.toFloat()
@@ -180,9 +179,22 @@ class ExpoScrollForwarderView(context: Context, appContext: AppContext) : ExpoVi
     }
   }
 
-  private fun triggerRefresh(scrollView: ScrollView) {
-    // Simply scroll to refresh position and let React Native's RefreshControl handle it
-    scrollView.scrollY = -140
+  private fun triggerRefresh(scrollView: ReactScrollView) {
+    // Trigger refresh by finding and activating the refresh control
+    try {
+      for (i in 0 until scrollView.childCount) {
+        val child = scrollView.getChildAt(i)
+        if (child.javaClass.simpleName.contains("Refresh")) {
+          // Try to invoke setRefreshing via reflection
+          val method = child.javaClass.getMethod("setRefreshing", Boolean::class.javaPrimitiveType)
+          method.invoke(child, true)
+          break
+        }
+      }
+    } catch (e: Exception) {
+      // Fallback: just scroll to trigger position
+      scrollView.scrollY = -140
+    }
   }
 
   private fun stopDecayAnimation() {
@@ -193,7 +205,7 @@ class ExpoScrollForwarderView(context: Context, appContext: AppContext) : ExpoVi
   private fun tryFindScrollView() {
     val tag = scrollViewTag ?: return
     
-    targetScrollView = appContext?.findView(tag) as? ScrollView
+    reactScrollView = appContext?.findView(tag) as? ReactScrollView
   }
 
   inner class GestureListener : GestureDetector.SimpleOnGestureListener() {

package/ios/ExpoScrollForwarderView.swift

@@ -1,4 +1,5 @@
 import ExpoModulesCore
+import UIKit
 
 class ExpoScrollForwarderView: ExpoView, UIGestureRecognizerDelegate {
   var scrollViewTag: Int? {
@@ -8,6 +9,7 @@ class ExpoScrollForwarderView: ExpoView, UIGestureRecognizerDelegate {
   }
 
   private var rctScrollView: RCTScrollView?
+  private var rctRefreshCtrl: UIRefreshControl?
   private var cancelGestureRecognizers: [UIGestureRecognizer]?
   private var animTimer: Timer?
   private var initialOffset: CGFloat = 0.0
@@ -36,7 +38,6 @@ class ExpoScrollForwarderView: ExpoView, UIGestureRecognizerDelegate {
     if gestureRecognizer is UIPanGestureRecognizer, otherGestureRecognizer is UIPanGestureRecognizer {
       return false
     }
-
     return true
   }
 
@@ -68,7 +69,6 @@ class ExpoScrollForwarderView: ExpoView, UIGestureRecognizerDelegate {
       if sv.contentOffset.y < 0 {
         sv.contentOffset.y = 0
       }
-
       self.initialOffset = sv.contentOffset.y
     }
 
@@ -78,7 +78,6 @@ class ExpoScrollForwarderView: ExpoView, UIGestureRecognizerDelegate {
       if sv.contentOffset.y <= -130, !didImpact {
         let generator = UIImpactFeedbackGenerator(style: .light)
         generator.impactOccurred()
-
         self.didImpact = true
       }
     }
@@ -88,8 +87,7 @@ class ExpoScrollForwarderView: ExpoView, UIGestureRecognizerDelegate {
       self.didImpact = false
 
       if sv.contentOffset.y <= -130 {
-        // Trigger refresh by setting content offset
-        sv.setContentOffset(CGPoint(x: 0, y: -140), animated: true)
+        self.triggerRefresh()
         return
       }
 
@@ -101,23 +99,43 @@ class ExpoScrollForwarderView: ExpoView, UIGestureRecognizerDelegate {
     }
   }
 
+  func triggerRefresh() {
+    guard let sv = self.rctScrollView?.scrollView,
+          let refreshControl = sv.refreshControl else {
+      return
+    }
+
+    // Animate to the proper refresh position
+    UIView.animate(withDuration: 0.3, delay: 0, options: .beginFromCurrentState, animations: {
+      sv.contentOffset = CGPoint(x: 0, y: -65)
+    }, completion: { [weak self] _ in
+      // Begin refreshing and trigger the control changed event
+      refreshControl.beginRefreshing()
+      
+      // Use the proper RCT method if available (for React Native refresh control)
+      if refreshControl.responds(to: Selector(("forwarderBeginRefreshing"))) {
+        refreshControl.perform(Selector(("forwarderBeginRefreshing")))
+      } else {
+        // Fallback: trigger the valueChanged action manually
+        refreshControl.sendActions(for: .valueChanged)
+      }
+    })
+  }
+
   func startDecayAnimation(_ translation: CGFloat, _ velocity: CGFloat) {
     guard let sv = self.rctScrollView?.scrollView else {
       return
     }
 
     var velocity = velocity
-
     self.enableCancelGestureRecognizers()
 
-    if velocity > 0 {
-      velocity = min(velocity, 5000)
-    } else {
-      velocity = max(velocity, -5000)
-    }
+    velocity = velocity > 0 ? min(velocity, 5000) : max(velocity, -5000)
 
     var animTranslation = -translation
-    self.animTimer = Timer.scheduledTimer(withTimeInterval: 1.0 / 120, repeats: true) { _ in
+    self.animTimer = Timer.scheduledTimer(withTimeInterval: 1.0 / 120, repeats: true) { [weak self] _ in
+      guard let self = self else { return }
+      
       velocity *= 0.9875
       animTranslation = (-velocity / 120) + animTranslation
 
@@ -129,7 +147,6 @@ class ExpoScrollForwarderView: ExpoView, UIGestureRecognizerDelegate {
         } else {
           sv.contentOffset.y = 0
         }
-
         self.stopTimer()
         return
       } else {
@@ -146,7 +163,6 @@ class ExpoScrollForwarderView: ExpoView, UIGestureRecognizerDelegate {
     if offset < 0 {
       return offset - (offset * 0.55)
     }
-
     return offset
   }
 
@@ -159,6 +175,8 @@ class ExpoScrollForwarderView: ExpoView, UIGestureRecognizerDelegate {
 
     self.rctScrollView = self.appContext?
       .findView(withTag: scrollViewTag, ofType: RCTScrollView.self)
+    
+    self.rctRefreshCtrl = self.rctScrollView?.scrollView?.refreshControl
 
     self.addCancelGestureRecognizers()
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-scroll-forwarder",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Forward scroll gestures from any view to a ScrollView in React Native and Expo.",
   "main": "build/index.js",
   "types": "build/index.d.ts",