From 752086c08b244e585901643df62772fc90d4700b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateo=20Guzm=C3=A1n?= Date: Wed, 9 Apr 2025 03:41:46 -0700 Subject: [PATCH] Make `PointerEventHelper` internal (#50577) Summary: This class can be internalized as part of the initiative to reduce the public API surface. I've checked there are [no relevant OSS usages](https://github.com/search?type=code&q=NOT+is%3Afork+NOT+org%3Afacebook+NOT+repo%3Areact-native-tvos%2Freact-native-tvos+NOT+repo%3Anuagoz%2Freact-native+NOT+repo%3A2lambda123%2Freact-native+NOT+repo%3Abeanchips%2Ffacebookreactnative+NOT+repo%3AfabOnReact%2Freact-native-notes+NOT+user%3Ahuntie+NOT+user%3Acortinico+NOT+repo%3AMaxdev18%2Fpowersync_app+NOT+repo%3Acarter-0%2Finstagram-decompiled+NOT+repo%3Am0mosenpai%2Finstadamn+NOT+repo%3AA-Star100%2FA-Star100-AUG2-2024+NOT+repo%3Alclnrd%2Fdetox-scrollview-reproductible+NOT+repo%3ADionisisChytiris%2FWorldWiseTrivia_Main+NOT+repo%3Apast3l%2Fhi2+NOT+repo%3AoneDotpy%2FCaribouQuest+NOT+repo%3Abejayoharen%2Fdailytodo+NOT+repo%3Amolangning%2Freversing-discord+NOT+repo%3AScottPrzy%2Freact-native+NOT+repo%3Agabrieldonadel%2Freact-native-visionos+NOT+repo%3AGabriel2308%2FTestes-Soft+NOT+repo%3Adawnzs03%2FflakyBuild+NOT+repo%3Acga2351%2Fcode+NOT+repo%3Astreeg%2Ftcc+NOT+repo%3Asoftware-mansion-labs%2Freact-native-swiftui+NOT+repo%3Apkcsecurity%2Fdecompiled-lightbulb+com.facebook.react.uimanager.events.PointerEventHelper). ## Changelog: [INTERNAL] - Make com.facebook.react.uimanager.events.PointerEventHelper internal Pull Request resolved: https://github.com/facebook/react-native/pull/50577 Test Plan: ```bash yarn test-android yarn android ``` Reviewed By: rshest Differential Revision: D72696372 Pulled By: cortinico fbshipit-source-id: a1def6bf75397e0a03d5abc76279bb9a94ff110e --- .../ReactAndroid/api/ReactAndroid.api | 50 ----------------- .../uimanager/events/PointerEventHelper.kt | 54 +++++++++---------- 2 files changed, 25 insertions(+), 79 deletions(-) diff --git a/packages/react-native/ReactAndroid/api/ReactAndroid.api b/packages/react-native/ReactAndroid/api/ReactAndroid.api index 6bb0a7db41c..1f41dc0d994 100644 --- a/packages/react-native/ReactAndroid/api/ReactAndroid.api +++ b/packages/react-native/ReactAndroid/api/ReactAndroid.api @@ -5134,56 +5134,6 @@ public class com/facebook/react/uimanager/events/PointerEvent$PointerEventState public fun supportsHover (I)Z } -public final class com/facebook/react/uimanager/events/PointerEventHelper { - public static final field CLICK Ljava/lang/String; - public static final field INSTANCE Lcom/facebook/react/uimanager/events/PointerEventHelper; - public static final field POINTER_CANCEL Ljava/lang/String; - public static final field POINTER_DOWN Ljava/lang/String; - public static final field POINTER_ENTER Ljava/lang/String; - public static final field POINTER_LEAVE Ljava/lang/String; - public static final field POINTER_MOVE Ljava/lang/String; - public static final field POINTER_OUT Ljava/lang/String; - public static final field POINTER_OVER Ljava/lang/String; - public static final field POINTER_TYPE_MOUSE Ljava/lang/String; - public static final field POINTER_TYPE_PEN Ljava/lang/String; - public static final field POINTER_TYPE_TOUCH Ljava/lang/String; - public static final field POINTER_TYPE_UNKNOWN Ljava/lang/String; - public static final field POINTER_UP Ljava/lang/String; - public static final fun getButtonChange (Ljava/lang/String;II)I - public static final fun getButtons (Ljava/lang/String;Ljava/lang/String;I)I - public static final fun getEventCategory (Ljava/lang/String;)I - public static final fun getPressure (ILjava/lang/String;)D - public static final fun getW3CPointerType (I)Ljava/lang/String; - public static final fun isBubblingEvent (Ljava/lang/String;)Z - public final fun isExitEvent (Ljava/lang/String;)Z - public static final fun isListening (Landroid/view/View;Lcom/facebook/react/uimanager/events/PointerEventHelper$EVENT;)Z - public final fun supportsHover (Landroid/view/MotionEvent;)Z -} - -public final class com/facebook/react/uimanager/events/PointerEventHelper$EVENT : java/lang/Enum { - public static final field CANCEL Lcom/facebook/react/uimanager/events/PointerEventHelper$EVENT; - public static final field CANCEL_CAPTURE Lcom/facebook/react/uimanager/events/PointerEventHelper$EVENT; - public static final field CLICK Lcom/facebook/react/uimanager/events/PointerEventHelper$EVENT; - public static final field CLICK_CAPTURE Lcom/facebook/react/uimanager/events/PointerEventHelper$EVENT; - public static final field DOWN Lcom/facebook/react/uimanager/events/PointerEventHelper$EVENT; - public static final field DOWN_CAPTURE Lcom/facebook/react/uimanager/events/PointerEventHelper$EVENT; - public static final field ENTER Lcom/facebook/react/uimanager/events/PointerEventHelper$EVENT; - public static final field ENTER_CAPTURE Lcom/facebook/react/uimanager/events/PointerEventHelper$EVENT; - public static final field LEAVE Lcom/facebook/react/uimanager/events/PointerEventHelper$EVENT; - public static final field LEAVE_CAPTURE Lcom/facebook/react/uimanager/events/PointerEventHelper$EVENT; - public static final field MOVE Lcom/facebook/react/uimanager/events/PointerEventHelper$EVENT; - public static final field MOVE_CAPTURE Lcom/facebook/react/uimanager/events/PointerEventHelper$EVENT; - public static final field OUT Lcom/facebook/react/uimanager/events/PointerEventHelper$EVENT; - public static final field OUT_CAPTURE Lcom/facebook/react/uimanager/events/PointerEventHelper$EVENT; - public static final field OVER Lcom/facebook/react/uimanager/events/PointerEventHelper$EVENT; - public static final field OVER_CAPTURE Lcom/facebook/react/uimanager/events/PointerEventHelper$EVENT; - public static final field UP Lcom/facebook/react/uimanager/events/PointerEventHelper$EVENT; - public static final field UP_CAPTURE Lcom/facebook/react/uimanager/events/PointerEventHelper$EVENT; - public static fun getEntries ()Lkotlin/enums/EnumEntries; - public static fun valueOf (Ljava/lang/String;)Lcom/facebook/react/uimanager/events/PointerEventHelper$EVENT; - public static fun values ()[Lcom/facebook/react/uimanager/events/PointerEventHelper$EVENT; -} - public abstract interface class com/facebook/react/uimanager/events/RCTEventEmitter : com/facebook/react/bridge/JavaScriptModule { public abstract fun receiveEvent (ILjava/lang/String;Lcom/facebook/react/bridge/WritableMap;)V public abstract fun receiveTouches (Ljava/lang/String;Lcom/facebook/react/bridge/WritableArray;Lcom/facebook/react/bridge/WritableArray;)V diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/PointerEventHelper.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/PointerEventHelper.kt index 363fd9e11dc..a215c87f0d0 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/PointerEventHelper.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/PointerEventHelper.kt @@ -13,24 +13,24 @@ import android.view.View import com.facebook.react.R /** Class responsible for generating catalyst touch events based on android [MotionEvent]. */ -public object PointerEventHelper { - public const val POINTER_TYPE_TOUCH: String = "touch" - public const val POINTER_TYPE_PEN: String = "pen" - public const val POINTER_TYPE_MOUSE: String = "mouse" - public const val POINTER_TYPE_UNKNOWN: String = "" - internal const val X_FLAG_SUPPORTS_HOVER = 0x01000000 +internal object PointerEventHelper { + const val POINTER_TYPE_TOUCH: String = "touch" + const val POINTER_TYPE_PEN: String = "pen" + const val POINTER_TYPE_MOUSE: String = "mouse" + const val POINTER_TYPE_UNKNOWN: String = "" + const val X_FLAG_SUPPORTS_HOVER = 0x01000000 - public const val POINTER_CANCEL: String = "topPointerCancel" - public const val POINTER_DOWN: String = "topPointerDown" - public const val POINTER_ENTER: String = "topPointerEnter" - public const val POINTER_LEAVE: String = "topPointerLeave" - public const val POINTER_MOVE: String = "topPointerMove" - public const val POINTER_UP: String = "topPointerUp" - public const val POINTER_OVER: String = "topPointerOver" - public const val POINTER_OUT: String = "topPointerOut" - public const val CLICK: String = "topClick" + const val POINTER_CANCEL: String = "topPointerCancel" + const val POINTER_DOWN: String = "topPointerDown" + const val POINTER_ENTER: String = "topPointerEnter" + const val POINTER_LEAVE: String = "topPointerLeave" + const val POINTER_MOVE: String = "topPointerMove" + const val POINTER_UP: String = "topPointerUp" + const val POINTER_OVER: String = "topPointerOver" + const val POINTER_OUT: String = "topPointerOut" + const val CLICK: String = "topClick" - public enum class EVENT { + enum class EVENT { CANCEL, CANCEL_CAPTURE, CLICK, @@ -53,7 +53,7 @@ public object PointerEventHelper { // https://w3c.github.io/pointerevents/#the-buttons-property @JvmStatic - public fun getButtons(eventName: String?, pointerType: String, buttonState: Int): Int { + fun getButtons(eventName: String?, pointerType: String, buttonState: Int): Int { if (isExitEvent(eventName)) { return 0 } @@ -65,11 +65,7 @@ public object PointerEventHelper { // https://w3c.github.io/pointerevents/#the-button-property @JvmStatic - public fun getButtonChange( - pointerType: String, - lastButtonState: Int, - currentButtonState: Int - ): Int { + fun getButtonChange(pointerType: String, lastButtonState: Int, currentButtonState: Int): Int { // Always return 0 for touch if (POINTER_TYPE_TOUCH == pointerType) { return 0 @@ -91,7 +87,7 @@ public object PointerEventHelper { } @JvmStatic - public fun getW3CPointerType(toolType: Int): String { + fun getW3CPointerType(toolType: Int): String { // https://www.w3.org/TR/pointerevents3/#dom-pointerevent-pointertype return when (toolType) { MotionEvent.TOOL_TYPE_FINGER -> POINTER_TYPE_TOUCH @@ -102,7 +98,7 @@ public object PointerEventHelper { } @JvmStatic - public fun isListening(view: View?, event: EVENT): Boolean { + fun isListening(view: View?, event: EVENT): Boolean { if (view == null) { return true } @@ -124,7 +120,7 @@ public object PointerEventHelper { } @JvmStatic - public fun getEventCategory(pointerEventType: String?): Int { + fun getEventCategory(pointerEventType: String?): Int { if (pointerEventType == null) { return EventCategoryDef.UNSPECIFIED } @@ -141,7 +137,7 @@ public object PointerEventHelper { } } - public fun supportsHover(motionEvent: MotionEvent): Boolean { + fun supportsHover(motionEvent: MotionEvent): Boolean { // A flag has been set on the MotionEvent to indicate it supports hover // See D36958947 on justifications for this. // TODO(luwe): Leverage previous events to determine if MotionEvent @@ -154,7 +150,7 @@ public object PointerEventHelper { return motionEvent.isFromSource(InputDevice.SOURCE_MOUSE) } - public fun isExitEvent(eventName: String?): Boolean { + fun isExitEvent(eventName: String?): Boolean { return when (eventName) { POINTER_UP, POINTER_LEAVE, @@ -165,7 +161,7 @@ public object PointerEventHelper { // https://w3c.github.io/pointerevents/#dom-pointerevent-pressure @JvmStatic - public fun getPressure(buttonState: Int, eventName: String?): Double { + fun getPressure(buttonState: Int, eventName: String?): Double { if (isExitEvent(eventName)) { return 0.0 } @@ -179,7 +175,7 @@ public object PointerEventHelper { } @JvmStatic - public fun isBubblingEvent(eventName: String?): Boolean { + fun isBubblingEvent(eventName: String?): Boolean { return when (eventName) { POINTER_UP, POINTER_DOWN,