diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/PointerEvents.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/PointerEvents.java index 3e8dfa5730d..bf97d45b502 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/PointerEvents.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/PointerEvents.java @@ -29,7 +29,11 @@ public enum PointerEvents { ; public static PointerEvents parsePointerEvents(String pointerEventsStr) { - return PointerEvents.valueOf(pointerEventsStr.toUpperCase(Locale.US).replace("-", "_")); + if (pointerEventsStr == null) { + return PointerEvents.AUTO; + } else { + return PointerEvents.valueOf(pointerEventsStr.toUpperCase(Locale.US).replace("-", "_")); + } } public static boolean canBeTouchTarget(PointerEvents pointerEvents) { diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java index 7c6a1891532..ddd60f19ac0 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java @@ -325,10 +325,6 @@ public class ReactHorizontalScrollViewManager extends ViewGroupManager @ReactProp(name = ViewProps.POINTER_EVENTS) public void setPointerEvents(ReactScrollView view, @Nullable String pointerEventsStr) { - if (pointerEventsStr == null) { - view.setPointerEvents(PointerEvents.AUTO); - } else { - view.setPointerEvents(PointerEvents.parsePointerEvents(pointerEventsStr)); - } + view.setPointerEvents(PointerEvents.parsePointerEvents(pointerEventsStr)); } } diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java index 0208ce47568..8ec0f5660ae 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java @@ -31,7 +31,6 @@ import com.facebook.react.uimanager.annotations.ReactProp; import com.facebook.react.uimanager.annotations.ReactPropGroup; import com.facebook.react.uimanager.events.EventDispatcher; import com.facebook.yoga.YogaConstants; -import java.util.Locale; import java.util.Map; /** View manager for AndroidViews (plain React Views). */ @@ -161,13 +160,7 @@ public class ReactViewManager extends ReactClippingViewManager { @ReactProp(name = ViewProps.POINTER_EVENTS) public void setPointerEvents(ReactViewGroup view, @Nullable String pointerEventsStr) { - if (pointerEventsStr == null) { - view.setPointerEvents(PointerEvents.AUTO); - } else { - PointerEvents pointerEvents = - PointerEvents.valueOf(pointerEventsStr.toUpperCase(Locale.US).replace("-", "_")); - view.setPointerEvents(pointerEvents); - } + view.setPointerEvents(PointerEvents.parsePointerEvents(pointerEventsStr)); } @ReactProp(name = "nativeBackgroundAndroid")