From b39f69d4b7b76f108bba3ed0c3b9acec5a0794a3 Mon Sep 17 00:00:00 2001 From: David Vacca Date: Thu, 2 Jan 2020 18:37:30 -0800 Subject: [PATCH] Backout migration of events on ScrollView to be bridgeless Summary: This diff back out the migration of events on ScrollView to be bridgeless (D18862857) This is causing the bug: T59882485 and the migration is not necessary in production yet. Heads-up ejanzer this diff will affect events for scroll in Venice, I will create another diff to figure it out the root cause. But we need the land and pick this diff in v252 Changelog: [internal] Reviewed By: ejanzer Differential Revision: D19269906 fbshipit-source-id: d61e67975d508cddafc3af34b0f7dfe83bda6bd7 --- .../facebook/react/views/scroll/ReactScrollViewHelper.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 3f7b829d4ee..a27a71bcc45 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 @@ -11,7 +11,7 @@ import android.view.View; import android.view.ViewGroup; import com.facebook.react.bridge.JSApplicationIllegalArgumentException; import com.facebook.react.bridge.ReactContext; -import com.facebook.react.uimanager.UIManagerHelper; +import com.facebook.react.uimanager.UIManagerModule; /** Helper class that deals with emitting Scroll Events. */ public class ReactScrollViewHelper { @@ -57,7 +57,9 @@ public class ReactScrollViewHelper { } ReactContext reactContext = (ReactContext) scrollView.getContext(); - UIManagerHelper.getEventDispatcherForReactTag(reactContext, scrollView.getId()) + reactContext + .getNativeModule(UIManagerModule.class) + .getEventDispatcher() .dispatchEvent( ScrollEvent.obtain( scrollView.getId(),