From ecdc3429cd25c0d305627897a076910f33368bb8 Mon Sep 17 00:00:00 2001 From: Andy Street Date: Thu, 3 Dec 2015 09:24:01 -0800 Subject: [PATCH] Fork v4 support library NestedScrollView to fix fling bug Reviewed By: oli, lexs Differential Revision: D2707733 fb-gh-sync-id: c9b375a6aa1010d60d21ca7500e862a6ff91a49b --- .../facebook/react/views/scroll/ReactScrollViewHelper.java | 2 +- .../facebook/react/views/scroll/ReactScrollViewManager.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.java index 12f5606fc..c8e7fa22e 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.java @@ -24,7 +24,7 @@ public class ReactScrollViewHelper { /** * Shared by {@link ReactScrollView} and {@link ReactHorizontalScrollView}. */ - /* package */ static void emitScrollEvent(ViewGroup scrollView, int scrollX, int scrollY) { + public static void emitScrollEvent(ViewGroup scrollView, int scrollX, int scrollY) { View contentView = scrollView.getChildAt(0); ReactContext reactContext = (ReactContext) scrollView.getContext(); reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher().dispatchEvent( diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java index 2c3363f8e..6de7da6bc 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java @@ -81,6 +81,10 @@ public class ReactScrollViewManager @Override public @Nullable Map getExportedCustomDirectEventTypeConstants() { + return createExportedCustomDirectEventTypeConstants(); + } + + public static Map createExportedCustomDirectEventTypeConstants() { return MapBuilder.builder() .put(ScrollEvent.EVENT_NAME, MapBuilder.of("registrationName", "onScroll")) .put("topScrollBeginDrag", MapBuilder.of("registrationName", "onScrollBeginDrag"))