@@ -14,6 +14,7 @@ import type {
14
14
BlurEvent ,
15
15
FocusEvent ,
16
16
MouseEvent ,
17
+ PointerEvent ,
17
18
PressEvent ,
18
19
Layout ,
19
20
LayoutEvent ,
@@ -84,8 +85,28 @@ type DirectEventProps = $ReadOnly<{|
84
85
| } > ;
85
86
86
87
type MouseEventProps = $ReadOnly < { |
87
- onMouseEnter ?: ( event : MouseEvent ) => void ,
88
- onMouseLeave ?: ( event : MouseEvent ) => void ,
88
+ onMouseEnter ?: ?( event : MouseEvent ) => void ,
89
+ onMouseLeave ?: ?( event : MouseEvent ) => void ,
90
+ | } > ;
91
+
92
+ type PointerEventProps = $ReadOnly < { |
93
+ onPointerEnter ?: ?( event : PointerEvent ) => void ,
94
+ onPointerLeave ?: ?( event : PointerEvent ) => void ,
95
+ onPointerMove ?: ?( event : PointerEvent ) => void ,
96
+ onPointerCancel ?: ?( e : PointerEvent ) => void ,
97
+ onPointerCancelCapture ?: ?( e : PointerEvent ) => void ,
98
+ onPointerDown ?: ?( e : PointerEvent ) => void ,
99
+ onPointerDownCapture ?: ?( e : PointerEvent ) => void ,
100
+ onPointerUp ?: ?( e : PointerEvent ) => void ,
101
+ onPointerUpCapture ?: ?( e : PointerEvent ) => void ,
102
+
103
+ // FIXME: these events are temporary while we converge pointer event handling
104
+ onPointerEnter2 ?: ?( e : PointerEvent ) => void ,
105
+ onPointerEnter2Capture ?: ?( e : PointerEvent ) => void ,
106
+ onPointerLeave2 ?: ?( e : PointerEvent ) => void ,
107
+ onPointerLeave2Capture ?: ?( e : PointerEvent ) => void ,
108
+ onPointerMove2 ?: ?( e : PointerEvent ) => void ,
109
+ onPointerMove2Capture ?: ?( e : PointerEvent ) => void ,
89
110
| } > ;
90
111
91
112
type TouchEventProps = $ReadOnly < { |
@@ -99,20 +120,6 @@ type TouchEventProps = $ReadOnly<{|
99
120
onTouchStartCapture ?: ?( e : PressEvent ) => void ,
100
121
| } > ;
101
122
102
- type PointerEventCallbackProps = $ReadOnly < { |
103
- onPointerCancel ?: ?( e : PointerEvent ) => void ,
104
- onPointerCancelCapture ?: ?( e : PointerEvent ) => void ,
105
- onPointerDown ?: ?( e : PointerEvent ) => void ,
106
- onPointerDownCapture ?: ?( e : PointerEvent ) => void ,
107
- onPointerEnter2 ?: ?( e : PointerEvent ) => void ,
108
- onPointerLeave2 ?: ?( e : PointerEvent ) => void ,
109
- onPointerEnter2Capture ?: ?( e : PointerEvent ) => void ,
110
- onPointerLeave2Capture ?: ?( e : PointerEvent ) => void ,
111
- onPointerMove2Capture ?: ?( e : PointerEvent ) => void ,
112
- onPointerUp ?: ?( e : PointerEvent ) => void ,
113
- onPointerUpCapture ?: ?( e : PointerEvent ) => void ,
114
- | } > ;
115
-
116
123
/**
117
124
* For most touch interactions, you'll simply want to wrap your component in
118
125
* `TouchableHighlight` or `TouchableOpacity`. Check out `Touchable.js`,
@@ -395,8 +402,8 @@ export type ViewProps = $ReadOnly<{|
395
402
...DirectEventProps ,
396
403
...GestureResponderEventProps ,
397
404
...MouseEventProps ,
405
+ ...PointerEventProps ,
398
406
...TouchEventProps ,
399
- ...PointerEventCallbackProps ,
400
407
...AndroidViewProps ,
401
408
...IOSViewProps ,
402
409
0 commit comments