From d473881bd722052a4d9b754b7312ae5c2e1386aa Mon Sep 17 00:00:00 2001
From: Luna Wei <luwe@fb.com>
Date: Fri, 8 Jul 2022 13:11:56 -0700
Subject: [PATCH] Fix: Clean up duplicate prop conversions

Summary: Changelog: [Internal] - Clean up duplicate properties from pointer event rename

Reviewed By: javache

Differential Revision: D37662527

fbshipit-source-id: f310d16103f12cdfe4e02546ea156553c9cd5443
---
 .../react/fabric/jni/viewPropConversions.h     |  6 ------
 .../components/view/propsConversions.h         | 18 ------------------
 2 files changed, 24 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/viewPropConversions.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/viewPropConversions.h
index 5d48ae22244..91e90813d1b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/viewPropConversions.h
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/viewPropConversions.h
@@ -466,18 +466,12 @@ static inline MapBuffer viewPropsDiff(
     builder.putBool(
         VP_POINTER_MOVE, newProps.events[ViewEvents::Offset::PointerMove]);
 
-    builder.putBool(
-        VP_POINTER_ENTER, newProps.events[ViewEvents::Offset::PointerEnter]);
     builder.putBool(
         VP_POINTER_ENTER_CAPTURE,
         newProps.events[ViewEvents::Offset::PointerEnterCapture]);
-    builder.putBool(
-        VP_POINTER_LEAVE, newProps.events[ViewEvents::Offset::PointerLeave]);
     builder.putBool(
         VP_POINTER_LEAVE_CAPTURE,
         newProps.events[ViewEvents::Offset::PointerLeaveCapture]);
-    builder.putBool(
-        VP_POINTER_MOVE, newProps.events[ViewEvents::Offset::PointerMove]);
     builder.putBool(
         VP_POINTER_MOVE_CAPTURE,
         newProps.events[ViewEvents::Offset::PointerMoveCapture]);
diff --git a/ReactCommon/react/renderer/components/view/propsConversions.h b/ReactCommon/react/renderer/components/view/propsConversions.h
index 83e606c5471..f045dd3b9bc 100644
--- a/ReactCommon/react/renderer/components/view/propsConversions.h
+++ b/ReactCommon/react/renderer/components/view/propsConversions.h
@@ -497,36 +497,18 @@ static inline ViewEvents convertRawProp(
       defaultValue[Offset::PointerLeave]);
 
   // Experimental W3C Pointer callbacks
-  result[Offset::PointerEnter] = convertRawProp(
-      context,
-      rawProps,
-      "onPointerEnter",
-      sourceValue[Offset::PointerEnter],
-      defaultValue[Offset::PointerEnter]);
   result[Offset::PointerEnterCapture] = convertRawProp(
       context,
       rawProps,
       "onPointerEnterCapture",
       sourceValue[Offset::PointerEnterCapture],
       defaultValue[Offset::PointerEnterCapture]);
-  result[Offset::PointerMove] = convertRawProp(
-      context,
-      rawProps,
-      "onPointerMove",
-      sourceValue[Offset::PointerMove],
-      defaultValue[Offset::PointerMove]);
   result[Offset::PointerMoveCapture] = convertRawProp(
       context,
       rawProps,
       "onPointerMoveCapture",
       sourceValue[Offset::PointerMoveCapture],
       defaultValue[Offset::PointerMoveCapture]);
-  result[Offset::PointerLeave] = convertRawProp(
-      context,
-      rawProps,
-      "onPointerLeave",
-      sourceValue[Offset::PointerLeave],
-      defaultValue[Offset::PointerLeave]);
   result[Offset::PointerLeaveCapture] = convertRawProp(
       context,
       rawProps,