[Flare] Refactor of Press to fix various issues (#15878)

Author: trueadm

packages/react-dom/src/events/DOMEventResponderSystem.js

@@ -394,26 +394,6 @@ const eventResponderContext: ReactResponderContext = {
   },
   getActiveDocument,
   objectAssign: Object.assign,
-  getEventPointerType(
-    event: ReactResponderEvent,
-  ): '' | 'mouse' | 'keyboard' | 'pen' | 'touch' {
-    validateResponderContext();
-    const nativeEvent: any = event.nativeEvent;
-    const {type, pointerType} = nativeEvent;
-    if (pointerType != null) {
-      return pointerType;
-    }
-    if (type.indexOf('mouse') === 0) {
-      return 'mouse';
-    }
-    if (type.indexOf('touch') === 0) {
-      return 'touch';
-    }
-    if (type.indexOf('key') === 0) {
-      return 'keyboard';
-    }
-    return '';
-  },
   getEventCurrentTarget(event: ReactResponderEvent): Element {
     validateResponderContext();
     const target = event.target;
@@ -583,12 +563,29 @@ function createResponderEvent(
   passive: boolean,
   passiveSupported: boolean,
 ): ReactResponderEvent {
+  const {pointerType} = (nativeEvent: any);
+  let eventPointerType = '';
+  let pointerId = null;
+
+  if (pointerType !== undefined) {
+    eventPointerType = pointerType;
+    pointerId = (nativeEvent: any).pointerId;
+  } else if (nativeEvent.key !== undefined) {
+    eventPointerType = 'keyboard';
+  } else if (nativeEvent.button !== undefined) {
+    eventPointerType = 'mouse';
+  } else if ((nativeEvent: any).changedTouches !== undefined) {
+    eventPointerType = 'touch';
+  }
+
   const responderEvent = {
     nativeEvent: nativeEvent,
-    target: nativeEventTarget,
-    type: topLevelType,
     passive,
     passiveSupported,
+    pointerId,
+    pointerType: eventPointerType,
+    target: nativeEventTarget,
+    type: topLevelType,
   };
   if (__DEV__) {
     Object.freeze(responderEvent);

packages/react-events/src/Focus.js

@@ -8,6 +8,7 @@
  */
 
 import type {
+  PointerType,
   ReactResponderEvent,
   ReactResponderContext,
 } from 'shared/ReactTypes';
@@ -30,7 +31,6 @@ type FocusState = {
   pointerType: PointerType,
 };
 
-type PointerType = '' | 'mouse' | 'keyboard' | 'pen' | 'touch';
 type FocusEventType = 'focus' | 'blur' | 'focuschange' | 'focusvisiblechange';
 
 type FocusEvent = {|

packages/react-events/src/Hover.js

@@ -294,7 +294,7 @@ const HoverResponder = {
     props: HoverProps,
     state: HoverState,
   ): void {
-    const {type} = event;
+    const {pointerType, type} = event;
 
     if (props.disabled) {
       if (state.isHovered) {
@@ -306,7 +306,6 @@ const HoverResponder = {
       }
       return;
     }
-    const pointerType = context.getEventPointerType(event);
 
     switch (type) {
       // START