From 843588ffe5cd6efffc5f20dd6e9c30f37e27cc30 Mon Sep 17 00:00:00 2001 From: David Vacca Date: Wed, 8 Jan 2025 11:37:47 -0800 Subject: [PATCH] Refactor PointerEvents strings as constants (#48537) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/48537 Refactor PointerEvents strings as constants changelog: [internal] internal Reviewed By: shwanton Differential Revision: D67924567 fbshipit-source-id: 7d9976d293cef3eeedbbb72abd20d8f877b768d0 --- .../react/uimanager/BaseViewManager.java | 24 ++++++++--------- .../uimanager/BaseViewManagerDelegate.kt | 27 ++++++++++--------- .../com/facebook/react/uimanager/ViewProps.kt | 12 +++++++++ 3 files changed, 39 insertions(+), 24 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java index b23d8551b50..d55d7f3f3c9 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java @@ -798,62 +798,62 @@ public abstract class BaseViewManager mViewManager.setZIndex(view, (value as Double?)?.toFloat() ?: 0.0f) // Experimental pointer events - "onPointerEnter" -> mViewManager.setPointerEnter(view, value as Boolean? ?: false) - "onPointerEnterCapture" -> + ViewProps.ON_POINTER_ENTER -> mViewManager.setPointerEnter(view, value as Boolean? ?: false) + ViewProps.ON_POINTER_ENTER_CAPTURE -> mViewManager.setPointerEnterCapture(view, value as Boolean? ?: false) - "onPointerOver" -> mViewManager.setPointerOver(view, value as Boolean? ?: false) - "onPointerOverCapture" -> mViewManager.setPointerOverCapture(view, value as Boolean? ?: false) - "onPointerOut" -> mViewManager.setPointerOut(view, value as Boolean? ?: false) - "onPointerOutCapture" -> mViewManager.setPointerOutCapture(view, value as Boolean? ?: false) - "onPointerLeave" -> mViewManager.setPointerLeave(view, value as Boolean? ?: false) - "onPointerLeaveCapture" -> + ViewProps.ON_POINTER_OVER -> mViewManager.setPointerOver(view, value as Boolean? ?: false) + ViewProps.ON_POINTER_OVER_CAPTURE -> + mViewManager.setPointerOverCapture(view, value as Boolean? ?: false) + ViewProps.ON_POINTER_OUT -> mViewManager.setPointerOut(view, value as Boolean? ?: false) + ViewProps.ON_POINTER_OUT_CAPTURE -> + mViewManager.setPointerOutCapture(view, value as Boolean? ?: false) + ViewProps.ON_POINTER_LEAVE -> mViewManager.setPointerLeave(view, value as Boolean? ?: false) + ViewProps.ON_POINTER_LEAVE_CAPTURE -> mViewManager.setPointerLeaveCapture(view, value as Boolean? ?: false) - "onPointerMove" -> mViewManager.setPointerMove(view, value as Boolean? ?: false) - "onPointerMoveCapture" -> mViewManager.setPointerMoveCapture(view, value as Boolean? ?: false) - "onClick" -> mViewManager.setClick(view, value as Boolean? ?: false) - "onClickCapture" -> mViewManager.setClickCapture(view, value as Boolean? ?: false) + ViewProps.ON_POINTER_MOVE -> mViewManager.setPointerMove(view, value as Boolean? ?: false) + ViewProps.ON_POINTER_MOVE_CAPTURE -> + mViewManager.setPointerMoveCapture(view, value as Boolean? ?: false) + ViewProps.ON_CLICK -> mViewManager.setClick(view, value as Boolean? ?: false) + ViewProps.ON_CLICK_CAPTURE -> mViewManager.setClickCapture(view, value as Boolean? ?: false) } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.kt index 655f2b0b6ec..7fee329d696 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.kt @@ -168,6 +168,18 @@ public object ViewProps { /** Used to locate views in end-to-end (UI) tests. */ public const val TEST_ID: String = "testID" public const val NATIVE_ID: String = "nativeID" + internal const val ON_POINTER_ENTER = "onPointerEnter" + internal const val ON_POINTER_ENTER_CAPTURE = "onPointerEnterCapture" + internal const val ON_POINTER_OVER = "onPointerOver" + internal const val ON_POINTER_OVER_CAPTURE = "onPointerOverCapture" + internal const val ON_POINTER_OUT = "onPointerOut" + internal const val ON_POINTER_OUT_CAPTURE = "onPointerOutCapture" + internal const val ON_POINTER_LEAVE = "onPointerLeave" + internal const val ON_POINTER_LEAVE_CAPTURE = "onPointerLeaveCapture" + internal const val ON_POINTER_MOVE = "onPointerMove" + internal const val ON_POINTER_MOVE_CAPTURE = "onPointerMoveCapture" + internal const val ON_CLICK = "onClick" + internal const val ON_CLICK_CAPTURE = "onClickCapture" @JvmField public val BORDER_SPACING_TYPES: IntArray = intArrayOf(