expo-scroll-forwarder 0.1.5 → 0.1.6

package/android/build.gradle

@@ -41,3 +41,8 @@ android {
     abortOnError false
   }
 }
+
+// Add the dependencies block here
+dependencies {
+  implementation 'com.facebook.react:react-android'
+}

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

@@ -1,19 +1,17 @@
 package expo.modules.scrollforwarder
 
-import com.facebook.react.views.scroll.ReactScrollView
-import com.facebook.react.views.scroll.ReactScrollViewManager
-import expo.modules.core.Module
-import expo.modules.core.ModuleDefinition
-import expo.modules.core.ViewManagerDefinition
+import expo.modules.kotlin.modules.Module
+import expo.modules.kotlin.modules.ModuleDefinition
+import expo.modules.kotlin.views.ExpoView
 
 class ExpoScrollForwarderModule : Module() {
-    override fun definition(): ModuleDefinition {
-        Name("ExpoScrollForwarder")
+  override fun definition() = ModuleDefinition {
+    Name("ExpoScrollForwarder")
 
-        View(ExpoScrollForwarderView::class.java) {
-            Prop("scrollViewTag") { view: ExpoScrollForwarderView, prop: Int? ->
-                view.scrollViewTag = prop
-            }
-        }
+    View(ExpoScrollForwarderView::class) {
+      Prop("scrollViewTag") { view: ExpoScrollForwarderView, prop: Int ->
+        view.scrollViewTag = prop
+      }
     }
-}
+  }
+}

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

@@ -1,38 +1,223 @@
 package expo.modules.scrollforwarder
 
+import android.animation.ValueAnimator
 import android.content.Context
-import android.view.View
-import android.widget.ScrollView
-import androidx.core.widget.NestedScrollView
-import expo.modules.core.views.ExpoView
+import android.view.GestureDetector
+import android.view.MotionEvent
+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
 
-class ExpoScrollForwarderView(context: Context) : ExpoView(context) {
+class ExpoScrollForwarderView(context: Context, appContext: AppContext) : ExpoView(context, appContext) {
+  
+  var scrollViewTag: Int? = null
+    set(value) {
+      field = value
+      tryFindScrollView()
+    }
+
+  private var reactScrollView: ReactScrollView? = null
+  private var gestureDetector: GestureDetectorCompat
+  private var isScrolling = false
+  private var initialScrollY = 0
+  private var lastY = 0f
+  private var decayAnimator: ValueAnimator? = null
+  private var didImpact = false
+
+  init {
+    gestureDetector = GestureDetectorCompat(context, GestureListener())
+  }
 
-    var scrollViewTag: Int? = null
-        set(value) {
-            field = value
-            tryFindScrollView()
+  override fun onInterceptTouchEvent(ev: MotionEvent): Boolean {
+    val scrollView = reactScrollView ?: return super.onInterceptTouchEvent(ev)
+    
+    when (ev.action) {
+      MotionEvent.ACTION_DOWN -> {
+        stopDecayAnimation()
+        lastY = ev.rawY
+        initialScrollY = scrollView.scrollY
+        isScrolling = false
+      }
+      MotionEvent.ACTION_MOVE -> {
+        val deltaY = lastY - ev.rawY
+        
+        // Check if this is a vertical scroll gesture
+        if (!isScrolling && abs(deltaY) > 10) {
+          // Calculate if the gesture is more vertical than horizontal
+          val initialX = if (ev.historySize > 0) ev.getHistoricalX(0) else ev.x
+          val initialY = if (ev.historySize > 0) ev.getHistoricalY(0) else ev.y
+          val deltaX = ev.x - initialX
+          val deltaYCheck = ev.y - initialY
+          
+          if (abs(deltaYCheck) > abs(deltaX)) {
+            isScrolling = true
+            return true
+          }
         }
+      }
+    }
+    
+    return isScrolling || super.onInterceptTouchEvent(ev)
+  }
 
-    private var scrollView: NestedScrollView? = null
+  override fun onTouchEvent(event: MotionEvent): Boolean {
+    val scrollView = reactScrollView ?: return super.onTouchEvent(event)
+    
+    gestureDetector.onTouchEvent(event)
+    
+    when (event.action) {
+      MotionEvent.ACTION_DOWN -> {
+        stopDecayAnimation()
+        lastY = event.rawY
+        initialScrollY = scrollView.scrollY
+        if (scrollView.scrollY < 0) {
+          scrollView.scrollTo(0, 0)
+        }
+        return true
+      }
+      
+      MotionEvent.ACTION_MOVE -> {
+        val deltaY = (lastY - event.rawY).toInt()
+        val newOffset = dampenOffset(initialScrollY + deltaY)
+        
+        scrollView.scrollTo(0, newOffset)
+        
+        // Haptic feedback at refresh threshold
+        if (newOffset <= -130 && !didImpact) {
+          performHapticFeedback(android.view.HapticFeedbackConstants.LONG_PRESS)
+          didImpact = true
+        }
+        
+        return true
+      }
+      
+      MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
+        val velocityY = calculateVelocity(event)
+        didImpact = false
+        
+        // Check for pull-to-refresh threshold
+        if (scrollView.scrollY <= -130) {
+          triggerRefresh(scrollView)
+          return true
+        }
+        
+        // Don't animate if velocity is too low and we're at a valid position
+        if (abs(velocityY) < 250 && scrollView.scrollY >= 0) {
+          isScrolling = false
+          return true
+        }
+        
+        startDecayAnimation(scrollView, velocityY.toFloat())
+        isScrolling = false
+        return true
+      }
+    }
+    
+    return super.onTouchEvent(event)
+  }
+
+  private fun calculateVelocity(event: MotionEvent): Int {
+    if (event.historySize == 0) return 0
+    
+    val lastHistoricalY = event.getHistoricalY(event.historySize - 1)
+    val lastHistoricalTime = event.getHistoricalEventTime(event.historySize - 1)
+    val deltaY = event.y - lastHistoricalY
+    val deltaTime = (event.eventTime - lastHistoricalTime) / 1000f
+    
+    return if (deltaTime > 0) {
+      (-deltaY / deltaTime).toInt()
+    } else {
+      0
+    }
+  }
 
-    private fun tryFindScrollView() {
-        scrollViewTag?.let { tag ->
-            val parentView = rootView
-            val found = parentView.findViewById<View>(tag)
-            if (found is NestedScrollView) {
-                scrollView = found
-            }
+  private fun startDecayAnimation(scrollView: ReactScrollView, velocity: Float) {
+    var currentVelocity = velocity.coerceIn(-5000f, 5000f)
+    val startOffset = scrollView.scrollY
+    var currentOffset = startOffset.toFloat()
+    
+    decayAnimator = ValueAnimator.ofFloat(0f, 1f).apply {
+      duration = 3000
+      interpolator = DecelerateInterpolator()
+      
+      addUpdateListener { animator ->
+        currentVelocity *= 0.9875f
+        currentOffset += (-currentVelocity / 120f)
+        
+        val newOffset = dampenOffset(currentOffset.toInt())
+        
+        when {
+          newOffset <= 0 -> {
+            scrollView.smoothScrollTo(0, 0)
+            cancel()
+          }
+          else -> {
+            scrollView.scrollTo(0, newOffset)
+          }
         }
+        
+        if (abs(currentVelocity) < 5) {
+          cancel()
+        }
+      }
+    }
+    decayAnimator?.start()
+  }
+
+  private fun dampenOffset(offset: Int): Int {
+    return if (offset < 0) {
+      (offset - (offset * 0.55)).toInt()
+    } else {
+      offset
     }
+  }
 
-    fun scrollToOffset(offset: Int, animated: Boolean = true) {
-        scrollView?.let {
-            if (animated) {
-                it.smoothScrollTo(0, offset)
-            } else {
-                it.scrollTo(0, offset)
-            }
+  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.scrollTo(0, -140)
+    }
+  }
+
+  private fun stopDecayAnimation() {
+    decayAnimator?.cancel()
+    decayAnimator = null
+  }
+
+  private fun tryFindScrollView() {
+    val tag = scrollViewTag ?: return
+    
+    reactScrollView = appContext?.findView(tag) as? ReactScrollView
+  }
+
+  inner class GestureListener : GestureDetector.SimpleOnGestureListener() {
+    override fun onDown(e: MotionEvent): Boolean {
+      stopDecayAnimation()
+      return true
     }
-}
+
+    override fun onSingleTapUp(e: MotionEvent): Boolean {
+      stopDecayAnimation()
+      return true
+    }
+  }
+
+  override fun onDetachedFromWindow() {
+    super.onDetachedFromWindow()
+    stopDecayAnimation()
+  }
+}

package/build/ExpoScrollForwarderView.d.ts

@@ -1,3 +1,4 @@
-import { type ExpoScrollForwarderViewProps } from './ExpoScrollForwarder.types';
-export declare function ExpoScrollForwarderView({ children, }: React.PropsWithChildren<ExpoScrollForwarderViewProps>): import("react").ReactNode;
+import * as React from "react";
+import { ExpoScrollForwarderViewProps } from "./ExpoScrollForwarder.types";
+export declare function ExpoScrollForwarderView({ children, ...rest }: ExpoScrollForwarderViewProps): React.JSX.Element;
 //# sourceMappingURL=ExpoScrollForwarderView.d.ts.map

package/build/ExpoScrollForwarderView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoScrollForwarderView.d.ts","sourceRoot":"","sources":["../src/ExpoScrollForwarderView.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,4BAA4B,EAAC,MAAM,6BAA6B,CAAA;AAE7E,wBAAgB,uBAAuB,CAAC,EACtC,QAAQ,GACT,EAAE,KAAK,CAAC,iBAAiB,CAAC,4BAA4B,CAAC,6BAEvD"}
+{"version":3,"file":"ExpoScrollForwarderView.d.ts","sourceRoot":"","sources":["../src/ExpoScrollForwarderView.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,4BAA4B,EAAE,MAAM,6BAA6B,CAAC;AAK3E,wBAAgB,uBAAuB,CAAC,EACtC,QAAQ,EACR,GAAG,IAAI,EACR,EAAE,4BAA4B,qBAE9B"}

package/build/ExpoScrollForwarderView.js

@@ -1,4 +1,7 @@
-export function ExpoScrollForwarderView({ children, }) {
-    return children;
+import { requireNativeViewManager } from "expo-modules-core";
+import * as React from "react";
+const NativeView = requireNativeViewManager("ExpoScrollForwarder");
+export function ExpoScrollForwarderView({ children, ...rest }) {
+    return <NativeView {...rest}>{children}</NativeView>;
 }
 //# sourceMappingURL=ExpoScrollForwarderView.js.map

package/build/ExpoScrollForwarderView.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoScrollForwarderView.js","sourceRoot":"","sources":["../src/ExpoScrollForwarderView.tsx"],"names":[],"mappings":"AAEA,MAAM,UAAU,uBAAuB,CAAC,EACtC,QAAQ,GAC8C;IACtD,OAAO,QAAQ,CAAA;AACjB,CAAC","sourcesContent":["import {type ExpoScrollForwarderViewProps} from './ExpoScrollForwarder.types'\n\nexport function ExpoScrollForwarderView({\n  children,\n}: React.PropsWithChildren<ExpoScrollForwarderViewProps>) {\n  return children\n}\n"]}
+{"version":3,"file":"ExpoScrollForwarderView.js","sourceRoot":"","sources":["../src/ExpoScrollForwarderView.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,MAAM,UAAU,GACd,wBAAwB,CAAC,qBAAqB,CAAC,CAAC;AAElD,MAAM,UAAU,uBAAuB,CAAC,EACtC,QAAQ,EACR,GAAG,IAAI,EACsB;IAC7B,OAAO,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,UAAU,CAAC,CAAC;AACvD,CAAC","sourcesContent":["import { requireNativeViewManager } from \"expo-modules-core\";\nimport * as React from \"react\";\nimport { ExpoScrollForwarderViewProps } from \"./ExpoScrollForwarder.types\";\n\nconst NativeView: React.ComponentType<ExpoScrollForwarderViewProps> =\n  requireNativeViewManager(\"ExpoScrollForwarder\");\n\nexport function ExpoScrollForwarderView({\n  children,\n  ...rest\n}: ExpoScrollForwarderViewProps) {\n  return <NativeView {...rest}>{children}</NativeView>;\n}\n"]}

package/package.json

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

package/src/ExpoScrollForwarderView.tsx

@@ -1,7 +1,13 @@
-import {type ExpoScrollForwarderViewProps} from './ExpoScrollForwarder.types'
+import { requireNativeViewManager } from "expo-modules-core";
+import * as React from "react";
+import { ExpoScrollForwarderViewProps } from "./ExpoScrollForwarder.types";
+
+const NativeView: React.ComponentType<ExpoScrollForwarderViewProps> =
+  requireNativeViewManager("ExpoScrollForwarder");
 
 export function ExpoScrollForwarderView({
   children,
-}: React.PropsWithChildren<ExpoScrollForwarderViewProps>) {
-  return children
+  ...rest
+}: ExpoScrollForwarderViewProps) {
+  return <NativeView {...rest}>{children}</NativeView>;
 }

package/build/ExpoScrollForwarderView.android.d.ts

@@ -1,3 +0,0 @@
-import { ExpoScrollForwarderViewProps } from "./ExpoScrollForwarder.types";
-export declare function ExpoScrollForwarderView({ children, ...rest }: ExpoScrollForwarderViewProps): import("react").JSX.Element;
-//# sourceMappingURL=ExpoScrollForwarderView.android.d.ts.map

package/build/ExpoScrollForwarderView.android.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ExpoScrollForwarderView.android.d.ts","sourceRoot":"","sources":["../src/ExpoScrollForwarderView.android.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,4BAA4B,EAAE,MAAM,6BAA6B,CAAC;AAK3E,wBAAgB,uBAAuB,CAAC,EACtC,QAAQ,EACR,GAAG,IAAI,EACR,EAAE,4BAA4B,+BAE9B"}

package/build/ExpoScrollForwarderView.android.js

@@ -1,6 +0,0 @@
-import { requireNativeViewManager } from "expo-modules-core";
-const NativeView = requireNativeViewManager("ExpoScrollForwarder");
-export function ExpoScrollForwarderView({ children, ...rest }) {
-    return <NativeView {...rest}>{children}</NativeView>;
-}
-//# sourceMappingURL=ExpoScrollForwarderView.android.js.map

package/build/ExpoScrollForwarderView.android.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ExpoScrollForwarderView.android.js","sourceRoot":"","sources":["../src/ExpoScrollForwarderView.android.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAG7D,MAAM,UAAU,GACd,wBAAwB,CAAC,qBAAqB,CAAC,CAAC;AAElD,MAAM,UAAU,uBAAuB,CAAC,EACtC,QAAQ,EACR,GAAG,IAAI,EACsB;IAC7B,OAAO,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,UAAU,CAAC,CAAC;AACvD,CAAC","sourcesContent":["import { requireNativeViewManager } from \"expo-modules-core\";\r\nimport { ExpoScrollForwarderViewProps } from \"./ExpoScrollForwarder.types\";\r\n\r\nconst NativeView: React.ComponentType<ExpoScrollForwarderViewProps> =\r\n  requireNativeViewManager(\"ExpoScrollForwarder\");\r\n\r\nexport function ExpoScrollForwarderView({\r\n  children,\r\n  ...rest\r\n}: ExpoScrollForwarderViewProps) {\r\n  return <NativeView {...rest}>{children}</NativeView>;\r\n}\r\n"]}

package/build/ExpoScrollForwarderView.ios.d.ts

@@ -1,3 +0,0 @@
-import { type ExpoScrollForwarderViewProps } from './ExpoScrollForwarder.types';
-export declare function ExpoScrollForwarderView({ children, ...rest }: ExpoScrollForwarderViewProps): import("react").JSX.Element;
-//# sourceMappingURL=ExpoScrollForwarderView.ios.d.ts.map

package/build/ExpoScrollForwarderView.ios.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ExpoScrollForwarderView.ios.d.ts","sourceRoot":"","sources":["../src/ExpoScrollForwarderView.ios.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAC,KAAK,4BAA4B,EAAC,MAAM,6BAA6B,CAAA;AAK7E,wBAAgB,uBAAuB,CAAC,EACtC,QAAQ,EACR,GAAG,IAAI,EACR,EAAE,4BAA4B,+BAE9B"}

package/build/ExpoScrollForwarderView.ios.js

@@ -1,6 +0,0 @@
-import { requireNativeViewManager } from 'expo-modules-core';
-const NativeView = requireNativeViewManager('ExpoScrollForwarder');
-export function ExpoScrollForwarderView({ children, ...rest }) {
-    return <NativeView {...rest}>{children}</NativeView>;
-}
-//# sourceMappingURL=ExpoScrollForwarderView.ios.js.map

package/build/ExpoScrollForwarderView.ios.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ExpoScrollForwarderView.ios.js","sourceRoot":"","sources":["../src/ExpoScrollForwarderView.ios.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAC,wBAAwB,EAAC,MAAM,mBAAmB,CAAA;AAI1D,MAAM,UAAU,GACd,wBAAwB,CAAC,qBAAqB,CAAC,CAAA;AAEjD,MAAM,UAAU,uBAAuB,CAAC,EACtC,QAAQ,EACR,GAAG,IAAI,EACsB;IAC7B,OAAO,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,UAAU,CAAC,CAAA;AACtD,CAAC","sourcesContent":["import {requireNativeViewManager} from 'expo-modules-core'\n\nimport {type ExpoScrollForwarderViewProps} from './ExpoScrollForwarder.types'\n\nconst NativeView: React.ComponentType<ExpoScrollForwarderViewProps> =\n  requireNativeViewManager('ExpoScrollForwarder')\n\nexport function ExpoScrollForwarderView({\n  children,\n  ...rest\n}: ExpoScrollForwarderViewProps) {\n  return <NativeView {...rest}>{children}</NativeView>\n}\n"]}

package/src/ExpoScrollForwarderView.android.tsx

@@ -1,12 +0,0 @@
-import { requireNativeViewManager } from "expo-modules-core";
-import { ExpoScrollForwarderViewProps } from "./ExpoScrollForwarder.types";
-
-const NativeView: React.ComponentType<ExpoScrollForwarderViewProps> =
-  requireNativeViewManager("ExpoScrollForwarder");
-
-export function ExpoScrollForwarderView({
-  children,
-  ...rest
-}: ExpoScrollForwarderViewProps) {
-  return <NativeView {...rest}>{children}</NativeView>;
-}

package/src/ExpoScrollForwarderView.ios.tsx

@@ -1,13 +0,0 @@
-import {requireNativeViewManager} from 'expo-modules-core'
-
-import {type ExpoScrollForwarderViewProps} from './ExpoScrollForwarder.types'
-
-const NativeView: React.ComponentType<ExpoScrollForwarderViewProps> =
-  requireNativeViewManager('ExpoScrollForwarder')
-
-export function ExpoScrollForwarderView({
-  children,
-  ...rest
-}: ExpoScrollForwarderViewProps) {
-  return <NativeView {...rest}>{children}</NativeView>
-}