From d583cb8def50fdc9cbcec6a1a3792bab4ead7398 Mon Sep 17 00:00:00 2001 From: David Vacca Date: Wed, 5 May 2021 09:11:11 -0700 Subject: [PATCH] Dispatch switch events using the proper UIModule Summary: This diff ensures that the dispatch of switch events is performed using the proper UIModule changelog: [internal] internal Reviewed By: JoshuaGross Differential Revision: D28204930 fbshipit-source-id: 625b536ab3106efa7dbf583589dfe268b880a6a0 --- .../react/views/switchview/ReactSwitchManager.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.java index e1a20562ae1..40750ff9ced 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.java @@ -21,7 +21,6 @@ import com.facebook.react.uimanager.PixelUtil; import com.facebook.react.uimanager.SimpleViewManager; import com.facebook.react.uimanager.ThemedReactContext; import com.facebook.react.uimanager.UIManagerHelper; -import com.facebook.react.uimanager.UIManagerModule; import com.facebook.react.uimanager.ViewManagerDelegate; import com.facebook.react.uimanager.ViewProps; import com.facebook.react.uimanager.annotations.ReactProp; @@ -82,17 +81,11 @@ public class ReactSwitchManager extends SimpleViewManager public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { ReactContext reactContext = (ReactContext) buttonView.getContext(); - UIManagerModule uiManager = reactContext.getNativeModule(UIManagerModule.class); - - if (uiManager == null) { - return; - } - - uiManager - .getEventDispatcher() + int reactTag = buttonView.getId(); + UIManagerHelper.getEventDispatcherForReactTag(reactContext, reactTag) .dispatchEvent( new ReactSwitchEvent( - UIManagerHelper.getSurfaceId(reactContext), buttonView.getId(), isChecked)); + UIManagerHelper.getSurfaceId(reactContext), reactTag, isChecked)); } };