Skip to content

Commit 673028b

Browse files
sgnycknitt
authored andcommitted
Event.pressEvent defined for touch events (#373)
1 parent e1a7d90 commit 673028b

37 files changed

Lines changed: 330 additions & 338 deletions

‎bs-react-native-next/src/apis/Event.bs.js‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
'use strict';
22

33

4-
var NativeEvent = /* module */[];
5-
64
function layout(t) {
75
var l = t.nativeEvent.layout;
86
return /* record */[
@@ -56,10 +54,6 @@ var NativeScrollEvent = /* module */[
5654
/* contentInset */contentInset
5755
];
5856

59-
var NativePressEvent = 0;
60-
61-
exports.NativeEvent = NativeEvent;
62-
exports.NativePressEvent = NativePressEvent;
6357
exports.NativeLayoutEvent = NativeLayoutEvent;
6458
exports.NativeScrollEvent = NativeScrollEvent;
6559
/* No side effect */

‎bs-react-native-next/src/apis/Event.md‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,27 @@ wip: true
55
---
66

77
```reason
8-
type t;
8+
// see https://github.com/facebook/react-native/blob/master/Libraries/Types/CoreEventTypes.js
99
10-
module NativeEvent = {
11-
type t;
12-
[@bs.get] external changedTouches: t => array(Js.t({..})) = "";
13-
[@bs.get] external identifier: t => int = "";
14-
[@bs.get] external locationX: t => float = "";
15-
[@bs.get] external locationY: t => float = "";
16-
[@bs.get] external pageX: t => float = "";
17-
[@bs.get] external pageY: t => float = "";
18-
[@bs.get] external target: t => Js.t({..}) = "";
19-
[@bs.get] external touches: t => array(Js.t({..})) = "";
20-
[@bs.get] external timestamp: t => int = "";
21-
[@bs.get] external data: t => string = "";
10+
type event('a) = {. "nativeEvent": 'a};
11+
12+
type pressEventPayload = {
13+
.
14+
"changedTouches": array(pressEventPayload),
15+
"force": float,
16+
"identifier": int,
17+
"locationX": float,
18+
"locationY": float,
19+
"pageX": float,
20+
"pageY": float,
21+
"target": Js.Nullable.t(float),
22+
"timestamp": float,
23+
"touches": array(pressEventPayload)
2224
};
2325
24-
/*
25-
fixme rename NativeEvent to NativePressEvent when necessary
26-
see https://github.com/facebook/react-native/blob/master/Libraries/Types/CoreEventTypes.js
27-
*/
28-
module NativePressEvent = NativeEvent;
26+
type pressEvent = event(pressEventPayload);
27+
28+
type t;
2929
3030
module NativeLayoutEvent = {
3131
type t;
@@ -77,8 +77,6 @@ module NativeScrollEvent = {
7777
};
7878
};
7979
80-
[@bs.get] external nativeEvent: t => NativeEvent.t = "";
81-
8280
[@bs.get] external nativeLayoutEvent: t => NativeLayoutEvent.t = "nativeEvent";
8381
8482
[@bs.get] external nativeScrollEvent: t => NativeScrollEvent.t = "nativeEvent";

‎bs-react-native-next/src/apis/Event.re‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
1-
type t;
2-
3-
module NativeEvent = {
4-
type t;
5-
[@bs.get] external changedTouches: t => array(Js.t({..})) = "";
6-
[@bs.get] external identifier: t => int = "";
7-
[@bs.get] external locationX: t => float = "";
8-
[@bs.get] external locationY: t => float = "";
9-
[@bs.get] external pageX: t => float = "";
10-
[@bs.get] external pageY: t => float = "";
11-
[@bs.get] external target: t => Js.t({..}) = "";
12-
[@bs.get] external touches: t => array(Js.t({..})) = "";
13-
[@bs.get] external timestamp: t => int = "";
14-
[@bs.get] external data: t => string = "";
15-
};
16-
171
/*
18-
fixme rename NativeEvent to NativePressEvent when necessary
192
see https://github.com/facebook/react-native/blob/master/Libraries/Types/CoreEventTypes.js
203
*/
21-
module NativePressEvent = NativeEvent;
4+
5+
type event('a) = {. "nativeEvent": 'a};
6+
7+
type pressEventPayload = {
8+
.
9+
"changedTouches": array(pressEventPayload),
10+
"force": float,
11+
"identifier": int,
12+
"locationX": float,
13+
"locationY": float,
14+
"pageX": float,
15+
"pageY": float,
16+
"target": Js.Nullable.t(float),
17+
"timestamp": float,
18+
"touches": array(pressEventPayload),
19+
};
20+
21+
type pressEvent = event(pressEventPayload);
22+
23+
type t;
2224

2325
module NativeLayoutEvent = {
2426
type t;
@@ -70,8 +72,6 @@ module NativeScrollEvent = {
7072
};
7173
};
7274

73-
[@bs.get] external nativeEvent: t => NativeEvent.t = "";
74-
7575
[@bs.get] external nativeLayoutEvent: t => NativeLayoutEvent.t = "nativeEvent";
7676

7777
[@bs.get] external nativeScrollEvent: t => NativeScrollEvent.t = "nativeEvent";

‎bs-react-native-next/src/components/ActivityIndicator.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,16 @@ external make:
6565
~onLayout: Event.NativeLayoutEvent.t => unit=?,
6666
~onMagicTap: unit => unit=?,
6767
// Gesture Responder props
68-
~onMoveShouldSetResponder: Event.t => bool=?,
69-
~onMoveShouldSetResponderCapture: Event.t => bool=?,
70-
~onResponderGrant: Event.t => unit=?,
71-
~onResponderMove: Event.t => unit=?,
72-
~onResponderReject: Event.t => unit=?,
73-
~onResponderRelease: Event.t => unit=?,
74-
~onResponderTerminate: Event.t => unit=?,
75-
~onResponderTerminationRequest: Event.t => unit=?,
76-
~onStartShouldSetResponder: Event.t => bool=?,
77-
~onStartShouldSetResponderCapture: Event.t => bool=?,
68+
~onMoveShouldSetResponder: Event.pressEvent => bool=?,
69+
~onMoveShouldSetResponderCapture: Event.pressEvent => bool=?,
70+
~onResponderGrant: Event.pressEvent => unit=?,
71+
~onResponderMove: Event.pressEvent => unit=?,
72+
~onResponderReject: Event.pressEvent => unit=?,
73+
~onResponderRelease: Event.pressEvent => unit=?,
74+
~onResponderTerminate: Event.pressEvent => unit=?,
75+
~onResponderTerminationRequest: Event.pressEvent => unit=?,
76+
~onStartShouldSetResponder: Event.pressEvent => bool=?,
77+
~onStartShouldSetResponderCapture: Event.pressEvent => bool=?,
7878
~pointerEvents: [@bs.string] [
7979
| `auto
8080
| `none

‎bs-react-native-next/src/components/ActivityIndicator.re‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,16 @@ external make:
5858
~onLayout: Event.NativeLayoutEvent.t => unit=?,
5959
~onMagicTap: unit => unit=?,
6060
// Gesture Responder props
61-
~onMoveShouldSetResponder: Event.t => bool=?,
62-
~onMoveShouldSetResponderCapture: Event.t => bool=?,
63-
~onResponderGrant: Event.t => unit=?,
64-
~onResponderMove: Event.t => unit=?,
65-
~onResponderReject: Event.t => unit=?,
66-
~onResponderRelease: Event.t => unit=?,
67-
~onResponderTerminate: Event.t => unit=?,
68-
~onResponderTerminationRequest: Event.t => unit=?,
69-
~onStartShouldSetResponder: Event.t => bool=?,
70-
~onStartShouldSetResponderCapture: Event.t => bool=?,
61+
~onMoveShouldSetResponder: Event.pressEvent => bool=?,
62+
~onMoveShouldSetResponderCapture: Event.pressEvent => bool=?,
63+
~onResponderGrant: Event.pressEvent => unit=?,
64+
~onResponderMove: Event.pressEvent => unit=?,
65+
~onResponderReject: Event.pressEvent => unit=?,
66+
~onResponderRelease: Event.pressEvent => unit=?,
67+
~onResponderTerminate: Event.pressEvent => unit=?,
68+
~onResponderTerminationRequest: Event.pressEvent => unit=?,
69+
~onStartShouldSetResponder: Event.pressEvent => bool=?,
70+
~onStartShouldSetResponderCapture: Event.pressEvent => bool=?,
7171
~pointerEvents: [@bs.string] [
7272
| `auto
7373
| `none

‎bs-react-native-next/src/components/FlatList.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -159,16 +159,16 @@ external make:
159159
~onLayout: Event.NativeLayoutEvent.t => unit=?,
160160
~onMagicTap: unit => unit=?,
161161
// Gesture Responder props
162-
~onMoveShouldSetResponder: Event.t => bool=?,
163-
~onMoveShouldSetResponderCapture: Event.t => bool=?,
164-
~onResponderGrant: Event.t => unit=?,
165-
~onResponderMove: Event.t => unit=?,
166-
~onResponderReject: Event.t => unit=?,
167-
~onResponderRelease: Event.t => unit=?,
168-
~onResponderTerminate: Event.t => unit=?,
169-
~onResponderTerminationRequest: Event.t => unit=?,
170-
~onStartShouldSetResponder: Event.t => bool=?,
171-
~onStartShouldSetResponderCapture: Event.t => bool=?,
162+
~onMoveShouldSetResponder: Event.pressEvent => bool=?,
163+
~onMoveShouldSetResponderCapture: Event.pressEvent => bool=?,
164+
~onResponderGrant: Event.pressEvent => unit=?,
165+
~onResponderMove: Event.pressEvent => unit=?,
166+
~onResponderReject: Event.pressEvent => unit=?,
167+
~onResponderRelease: Event.pressEvent => unit=?,
168+
~onResponderTerminate: Event.pressEvent => unit=?,
169+
~onResponderTerminationRequest: Event.pressEvent => unit=?,
170+
~onStartShouldSetResponder: Event.pressEvent => bool=?,
171+
~onStartShouldSetResponderCapture: Event.pressEvent => bool=?,
172172
~pointerEvents: [@bs.string] [
173173
| `auto
174174
| `none

‎bs-react-native-next/src/components/FlatList.re‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -152,16 +152,16 @@ external make:
152152
~onLayout: Event.NativeLayoutEvent.t => unit=?,
153153
~onMagicTap: unit => unit=?,
154154
// Gesture Responder props
155-
~onMoveShouldSetResponder: Event.t => bool=?,
156-
~onMoveShouldSetResponderCapture: Event.t => bool=?,
157-
~onResponderGrant: Event.t => unit=?,
158-
~onResponderMove: Event.t => unit=?,
159-
~onResponderReject: Event.t => unit=?,
160-
~onResponderRelease: Event.t => unit=?,
161-
~onResponderTerminate: Event.t => unit=?,
162-
~onResponderTerminationRequest: Event.t => unit=?,
163-
~onStartShouldSetResponder: Event.t => bool=?,
164-
~onStartShouldSetResponderCapture: Event.t => bool=?,
155+
~onMoveShouldSetResponder: Event.pressEvent => bool=?,
156+
~onMoveShouldSetResponderCapture: Event.pressEvent => bool=?,
157+
~onResponderGrant: Event.pressEvent => unit=?,
158+
~onResponderMove: Event.pressEvent => unit=?,
159+
~onResponderReject: Event.pressEvent => unit=?,
160+
~onResponderRelease: Event.pressEvent => unit=?,
161+
~onResponderTerminate: Event.pressEvent => unit=?,
162+
~onResponderTerminationRequest: Event.pressEvent => unit=?,
163+
~onStartShouldSetResponder: Event.pressEvent => bool=?,
164+
~onStartShouldSetResponderCapture: Event.pressEvent => bool=?,
165165
~pointerEvents: [@bs.string] [
166166
| `auto
167167
| `none

‎bs-react-native-next/src/components/KeyboardAvoidingView.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,16 @@ external make:
5959
~onLayout: Event.NativeLayoutEvent.t => unit=?,
6060
~onMagicTap: unit => unit=?,
6161
// Gesture Responder props
62-
~onMoveShouldSetResponder: Event.t => bool=?,
63-
~onMoveShouldSetResponderCapture: Event.t => bool=?,
64-
~onResponderGrant: Event.t => unit=?,
65-
~onResponderMove: Event.t => unit=?,
66-
~onResponderReject: Event.t => unit=?,
67-
~onResponderRelease: Event.t => unit=?,
68-
~onResponderTerminate: Event.t => unit=?,
69-
~onResponderTerminationRequest: Event.t => unit=?,
70-
~onStartShouldSetResponder: Event.t => bool=?,
71-
~onStartShouldSetResponderCapture: Event.t => bool=?,
62+
~onMoveShouldSetResponder: Event.pressEvent => bool=?,
63+
~onMoveShouldSetResponderCapture: Event.pressEvent => bool=?,
64+
~onResponderGrant: Event.pressEvent => unit=?,
65+
~onResponderMove: Event.pressEvent => unit=?,
66+
~onResponderReject: Event.pressEvent => unit=?,
67+
~onResponderRelease: Event.pressEvent => unit=?,
68+
~onResponderTerminate: Event.pressEvent => unit=?,
69+
~onResponderTerminationRequest: Event.pressEvent => unit=?,
70+
~onStartShouldSetResponder: Event.pressEvent => bool=?,
71+
~onStartShouldSetResponderCapture: Event.pressEvent => bool=?,
7272
~pointerEvents: [@bs.string] [
7373
| `auto
7474
| `none

‎bs-react-native-next/src/components/KeyboardAvoidingView.re‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,16 @@ external make:
5252
~onLayout: Event.NativeLayoutEvent.t => unit=?,
5353
~onMagicTap: unit => unit=?,
5454
// Gesture Responder props
55-
~onMoveShouldSetResponder: Event.t => bool=?,
56-
~onMoveShouldSetResponderCapture: Event.t => bool=?,
57-
~onResponderGrant: Event.t => unit=?,
58-
~onResponderMove: Event.t => unit=?,
59-
~onResponderReject: Event.t => unit=?,
60-
~onResponderRelease: Event.t => unit=?,
61-
~onResponderTerminate: Event.t => unit=?,
62-
~onResponderTerminationRequest: Event.t => unit=?,
63-
~onStartShouldSetResponder: Event.t => bool=?,
64-
~onStartShouldSetResponderCapture: Event.t => bool=?,
55+
~onMoveShouldSetResponder: Event.pressEvent => bool=?,
56+
~onMoveShouldSetResponderCapture: Event.pressEvent => bool=?,
57+
~onResponderGrant: Event.pressEvent => unit=?,
58+
~onResponderMove: Event.pressEvent => unit=?,
59+
~onResponderReject: Event.pressEvent => unit=?,
60+
~onResponderRelease: Event.pressEvent => unit=?,
61+
~onResponderTerminate: Event.pressEvent => unit=?,
62+
~onResponderTerminationRequest: Event.pressEvent => unit=?,
63+
~onStartShouldSetResponder: Event.pressEvent => bool=?,
64+
~onStartShouldSetResponderCapture: Event.pressEvent => bool=?,
6565
~pointerEvents: [@bs.string] [
6666
| `auto
6767
| `none

‎bs-react-native-next/src/components/Picker.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,16 @@ external make:
6464
~onLayout: Event.NativeLayoutEvent.t => unit=?,
6565
~onMagicTap: unit => unit=?,
6666
// Gesture Responder props
67-
~onMoveShouldSetResponder: Event.t => bool=?,
68-
~onMoveShouldSetResponderCapture: Event.t => bool=?,
69-
~onResponderGrant: Event.t => unit=?,
70-
~onResponderMove: Event.t => unit=?,
71-
~onResponderReject: Event.t => unit=?,
72-
~onResponderRelease: Event.t => unit=?,
73-
~onResponderTerminate: Event.t => unit=?,
74-
~onResponderTerminationRequest: Event.t => unit=?,
75-
~onStartShouldSetResponder: Event.t => bool=?,
76-
~onStartShouldSetResponderCapture: Event.t => bool=?,
67+
~onMoveShouldSetResponder: Event.pressEvent => bool=?,
68+
~onMoveShouldSetResponderCapture: Event.pressEvent => bool=?,
69+
~onResponderGrant: Event.pressEvent => unit=?,
70+
~onResponderMove: Event.pressEvent => unit=?,
71+
~onResponderReject: Event.pressEvent => unit=?,
72+
~onResponderRelease: Event.pressEvent => unit=?,
73+
~onResponderTerminate: Event.pressEvent => unit=?,
74+
~onResponderTerminationRequest: Event.pressEvent => unit=?,
75+
~onStartShouldSetResponder: Event.pressEvent => bool=?,
76+
~onStartShouldSetResponderCapture: Event.pressEvent => bool=?,
7777
~pointerEvents: [@bs.string] [
7878
| `auto
7979
| `none

0 commit comments

Comments
 (0)