Skip to content

Commit 3932945

Browse files
ryyppyryyppy
committed
Align decorators, use @variadic instead of unknown @splice 
1 parent 568747d commit 3932945

File tree

5 files changed

+140
-140
lines changed

5 files changed

+140
-140
lines changed

‎src/React.res‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ external createElement: (component<'props>, 'props) => element = "createElement"
2121
@module("react")
2222
external cloneElement: (element, 'props) => element = "cloneElement"
2323

24-
@splice @module("react")
24+
@variadic @module("react")
2525
external createElementVariadic: (component<'props>, 'props, array<element>) => element =
2626
"createElement"
2727

‎src/ReactEvent.res‎

Lines changed: 109 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -5,52 +5,52 @@ module MakeEventWithType = (
55
type t
66
},
77
) => {
8-
@bs.get external bubbles: Type.t => bool = "bubbles"
9-
@bs.get external cancelable: Type.t => bool = "cancelable"
10-
@bs.get
8+
@get external bubbles: Type.t => bool = "bubbles"
9+
@get external cancelable: Type.t => bool = "cancelable"
10+
@get
1111
external currentTarget: Type.t => {..} = "currentTarget" /* Should return Dom.eventTarget */
12-
@bs.get external defaultPrevented: Type.t => bool = "defaultPrevented"
13-
@bs.get external eventPhase: Type.t => int = "eventPhase"
14-
@bs.get external isTrusted: Type.t => bool = "isTrusted"
15-
@bs.get external nativeEvent: Type.t => {..} = "nativeEvent" /* Should return Dom.event */
16-
@bs.send external preventDefault: Type.t => unit = "preventDefault"
17-
@bs.send
12+
@get external defaultPrevented: Type.t => bool = "defaultPrevented"
13+
@get external eventPhase: Type.t => int = "eventPhase"
14+
@get external isTrusted: Type.t => bool = "isTrusted"
15+
@get external nativeEvent: Type.t => {..} = "nativeEvent" /* Should return Dom.event */
16+
@send external preventDefault: Type.t => unit = "preventDefault"
17+
@send
1818
external isDefaultPrevented: Type.t => bool = "isDefaultPrevented"
19-
@bs.send external stopPropagation: Type.t => unit = "stopPropagation"
20-
@bs.send
19+
@send external stopPropagation: Type.t => unit = "stopPropagation"
20+
@send
2121
external isPropagationStopped: Type.t => bool = "isPropagationStopped"
22-
@bs.get external target: Type.t => {..} = "target" /* Should return Dom.eventTarget */
23-
@bs.get external timeStamp: Type.t => float = "timeStamp"
24-
@bs.get external type_: Type.t => string = "type"
25-
@bs.send external persist: Type.t => unit = "persist"
22+
@get external target: Type.t => {..} = "target" /* Should return Dom.eventTarget */
23+
@get external timeStamp: Type.t => float = "timeStamp"
24+
@get external type_: Type.t => string = "type"
25+
@send external persist: Type.t => unit = "persist"
2626
}
2727

2828
module Synthetic = {
2929
type tag
3030
type t = synthetic<tag>
31-
@bs.get external bubbles: synthetic<'a> => bool = "bubbles"
32-
@bs.get external cancelable: synthetic<'a> => bool = "cancelable"
33-
@bs.get
31+
@get external bubbles: synthetic<'a> => bool = "bubbles"
32+
@get external cancelable: synthetic<'a> => bool = "cancelable"
33+
@get
3434
external currentTarget: synthetic<'a> => {..} =
3535
"currentTarget" /* Should return Dom.eventTarget */
36-
@bs.get
36+
@get
3737
external defaultPrevented: synthetic<'a> => bool = "defaultPrevented"
38-
@bs.get external eventPhase: synthetic<'a> => int = "eventPhase"
39-
@bs.get external isTrusted: synthetic<'a> => bool = "isTrusted"
40-
@bs.get
38+
@get external eventPhase: synthetic<'a> => int = "eventPhase"
39+
@get external isTrusted: synthetic<'a> => bool = "isTrusted"
40+
@get
4141
external nativeEvent: synthetic<'a> => {..} = "nativeEvent" /* Should return Dom.event */
42-
@bs.send
42+
@send
4343
external preventDefault: synthetic<'a> => unit = "preventDefault"
44-
@bs.send
44+
@send
4545
external isDefaultPrevented: synthetic<'a> => bool = "isDefaultPrevented"
46-
@bs.send
46+
@send
4747
external stopPropagation: synthetic<'a> => unit = "stopPropagation"
48-
@bs.send
48+
@send
4949
external isPropagationStopped: synthetic<'a> => bool = "isPropagationStopped"
50-
@bs.get external target: synthetic<'a> => {..} = "target" /* Should return Dom.eventTarget */
51-
@bs.get external timeStamp: synthetic<'a> => float = "timeStamp"
52-
@bs.get external type_: synthetic<'a> => string = "type"
53-
@bs.send external persist: synthetic<'a> => unit = "persist"
50+
@get external target: synthetic<'a> => {..} = "target" /* Should return Dom.eventTarget */
51+
@get external timeStamp: synthetic<'a> => float = "timeStamp"
52+
@get external type_: synthetic<'a> => string = "type"
53+
@send external persist: synthetic<'a> => unit = "persist"
5454
}
5555

5656
/* Cast any event type to the general synthetic type. This is safe, since synthetic is more general */
@@ -62,7 +62,7 @@ module Clipboard = {
6262
include MakeEventWithType({
6363
type t = t
6464
})
65-
@bs.get external clipboardData: t => {..} = "clipboardData" /* Should return Dom.dataTransfer */
65+
@get external clipboardData: t => {..} = "clipboardData" /* Should return Dom.dataTransfer */
6666
}
6767

6868
module Composition = {
@@ -71,7 +71,7 @@ module Composition = {
7171
include MakeEventWithType({
7272
type t = t
7373
})
74-
@bs.get external data: t => string = "data"
74+
@get external data: t => string = "data"
7575
}
7676

7777
module Keyboard = {
@@ -80,19 +80,19 @@ module Keyboard = {
8080
include MakeEventWithType({
8181
type t = t
8282
})
83-
@bs.get external altKey: t => bool = "altKey"
84-
@bs.get external charCode: t => int = "charCode"
85-
@bs.get external ctrlKey: t => bool = "ctrlKey"
86-
@bs.send
83+
@get external altKey: t => bool = "altKey"
84+
@get external charCode: t => int = "charCode"
85+
@get external ctrlKey: t => bool = "ctrlKey"
86+
@send
8787
external getModifierState: (t, string) => bool = "getModifierState"
88-
@bs.get external key: t => string = "key"
89-
@bs.get external keyCode: t => int = "keyCode"
90-
@bs.get external locale: t => string = "locale"
91-
@bs.get external location: t => int = "location"
92-
@bs.get external metaKey: t => bool = "metaKey"
93-
@bs.get external repeat: t => bool = "repeat"
94-
@bs.get external shiftKey: t => bool = "shiftKey"
95-
@bs.get external which: t => int = "which"
88+
@get external key: t => string = "key"
89+
@get external keyCode: t => int = "keyCode"
90+
@get external locale: t => string = "locale"
91+
@get external location: t => int = "location"
92+
@get external metaKey: t => bool = "metaKey"
93+
@get external repeat: t => bool = "repeat"
94+
@get external shiftKey: t => bool = "shiftKey"
95+
@get external which: t => int = "which"
9696
}
9797

9898
module Focus = {
@@ -101,7 +101,7 @@ module Focus = {
101101
include MakeEventWithType({
102102
type t = t
103103
})
104-
@bs.get @bs.return(nullable)
104+
@get @return(nullable)
105105
external relatedTarget: t => option<{..}> = "relatedTarget" /* Should return Dom.eventTarget */
106106
}
107107

@@ -119,24 +119,24 @@ module Mouse = {
119119
include MakeEventWithType({
120120
type t = t
121121
})
122-
@bs.get external altKey: t => bool = "altKey"
123-
@bs.get external button: t => int = "button"
124-
@bs.get external buttons: t => int = "buttons"
125-
@bs.get external clientX: t => int = "clientX"
126-
@bs.get external clientY: t => int = "clientY"
127-
@bs.get external ctrlKey: t => bool = "ctrlKey"
128-
@bs.send
122+
@get external altKey: t => bool = "altKey"
123+
@get external button: t => int = "button"
124+
@get external buttons: t => int = "buttons"
125+
@get external clientX: t => int = "clientX"
126+
@get external clientY: t => int = "clientY"
127+
@get external ctrlKey: t => bool = "ctrlKey"
128+
@send
129129
external getModifierState: (t, string) => bool = "getModifierState"
130-
@bs.get external metaKey: t => bool = "metaKey"
131-
@bs.get external movementX: t => int = "movementX"
132-
@bs.get external movementY: t => int = "movementY"
133-
@bs.get external pageX: t => int = "pageX"
134-
@bs.get external pageY: t => int = "pageY"
135-
@bs.get @bs.return(nullable)
130+
@get external metaKey: t => bool = "metaKey"
131+
@get external movementX: t => int = "movementX"
132+
@get external movementY: t => int = "movementY"
133+
@get external pageX: t => int = "pageX"
134+
@get external pageY: t => int = "pageY"
135+
@get @return(nullable)
136136
external relatedTarget: t => option<{..}> = "relatedTarget" /* Should return Dom.eventTarget */
137-
@bs.get external screenX: t => int = "screenX"
138-
@bs.get external screenY: t => int = "screenY"
139-
@bs.get external shiftKey: t => bool = "shiftKey"
137+
@get external screenX: t => int = "screenX"
138+
@get external screenY: t => int = "screenY"
139+
@get external shiftKey: t => bool = "shiftKey"
140140
}
141141

142142
module Pointer = {
@@ -147,43 +147,43 @@ module Pointer = {
147147
})
148148

149149
// UIEvent
150-
@bs.get external detail: t => int = "detail"
151-
@bs.get external view: t => Dom.window = "view" /* Should return DOMAbstractView/WindowProxy */
150+
@get external detail: t => int = "detail"
151+
@get external view: t => Dom.window = "view" /* Should return DOMAbstractView/WindowProxy */
152152

153153
// MouseEvent
154-
@bs.get external screenX: t => int = "screenX"
155-
@bs.get external screenY: t => int = "screenY"
156-
@bs.get external clientX: t => int = "clientX"
157-
@bs.get external clientY: t => int = "clientY"
158-
@bs.get external pageX: t => int = "pageX"
159-
@bs.get external pageY: t => int = "pageY"
160-
@bs.get external movementX: t => int = "movementX"
161-
@bs.get external movementY: t => int = "movementY"
154+
@get external screenX: t => int = "screenX"
155+
@get external screenY: t => int = "screenY"
156+
@get external clientX: t => int = "clientX"
157+
@get external clientY: t => int = "clientY"
158+
@get external pageX: t => int = "pageX"
159+
@get external pageY: t => int = "pageY"
160+
@get external movementX: t => int = "movementX"
161+
@get external movementY: t => int = "movementY"
162162

163-
@bs.get external ctrlKey: t => bool = "ctrlKey"
164-
@bs.get external shiftKey: t => bool = "shiftKey"
165-
@bs.get external altKey: t => bool = "altKey"
166-
@bs.get external metaKey: t => bool = "metaKey"
167-
@bs.send
163+
@get external ctrlKey: t => bool = "ctrlKey"
164+
@get external shiftKey: t => bool = "shiftKey"
165+
@get external altKey: t => bool = "altKey"
166+
@get external metaKey: t => bool = "metaKey"
167+
@send
168168
external getModifierState: (t, string) => bool = "getModifierState"
169169

170-
@bs.get external button: t => int = "button"
171-
@bs.get external buttons: t => int = "buttons"
170+
@get external button: t => int = "button"
171+
@get external buttons: t => int = "buttons"
172172

173-
@bs.get @bs.return(nullable)
173+
@get @return(nullable)
174174
external relatedTarget: t => option<{..}> = "relatedTarget" /* Should return Dom.eventTarget */
175175

176176
// PointerEvent
177-
@bs.get external pointerId: t => Dom.eventPointerId = "pointerId"
178-
@bs.get external width: t => float = "width"
179-
@bs.get external height: t => float = "height"
180-
@bs.get external pressure: t => float = "pressure"
181-
@bs.get external tangentialPressure: t => float = "tangentialPressure"
182-
@bs.get external tiltX: t => int = "tiltX"
183-
@bs.get external tiltY: t => int = "tiltY"
184-
@bs.get external twist: t => int = "twist"
185-
@bs.get external pointerType: t => string = "pointerType"
186-
@bs.get external isPrimary: t => bool = "isPrimary"
177+
@get external pointerId: t => Dom.eventPointerId = "pointerId"
178+
@get external width: t => float = "width"
179+
@get external height: t => float = "height"
180+
@get external pressure: t => float = "pressure"
181+
@get external tangentialPressure: t => float = "tangentialPressure"
182+
@get external tiltX: t => int = "tiltX"
183+
@get external tiltY: t => int = "tiltY"
184+
@get external twist: t => int = "twist"
185+
@get external pointerType: t => string = "pointerType"
186+
@get external isPrimary: t => bool = "isPrimary"
187187
}
188188

189189
module Selection = {
@@ -200,15 +200,15 @@ module Touch = {
200200
include MakeEventWithType({
201201
type t = t
202202
})
203-
@bs.get external altKey: t => bool = "altKey"
204-
@bs.get external changedTouches: t => {..} = "changedTouches" /* Should return Dom.touchList */
205-
@bs.get external ctrlKey: t => bool = "ctrlKey"
206-
@bs.send
203+
@get external altKey: t => bool = "altKey"
204+
@get external changedTouches: t => {..} = "changedTouches" /* Should return Dom.touchList */
205+
@get external ctrlKey: t => bool = "ctrlKey"
206+
@send
207207
external getModifierState: (t, string) => bool = "getModifierState"
208-
@bs.get external metaKey: t => bool = "metaKey"
209-
@bs.get external shiftKey: t => bool = "shiftKey"
210-
@bs.get external targetTouches: t => {..} = "targetTouches" /* Should return Dom.touchList */
211-
@bs.get external touches: t => {..} = "touches" /* Should return Dom.touchList */
208+
@get external metaKey: t => bool = "metaKey"
209+
@get external shiftKey: t => bool = "shiftKey"
210+
@get external targetTouches: t => {..} = "targetTouches" /* Should return Dom.touchList */
211+
@get external touches: t => {..} = "touches" /* Should return Dom.touchList */
212212
}
213213

214214
module UI = {
@@ -217,8 +217,8 @@ module UI = {
217217
include MakeEventWithType({
218218
type t = t
219219
})
220-
@bs.get external detail: t => int = "detail"
221-
@bs.get external view: t => Dom.window = "view" /* Should return DOMAbstractView/WindowProxy */
220+
@get external detail: t => int = "detail"
221+
@get external view: t => Dom.window = "view" /* Should return DOMAbstractView/WindowProxy */
222222
}
223223

224224
module Wheel = {
@@ -227,10 +227,10 @@ module Wheel = {
227227
include MakeEventWithType({
228228
type t = t
229229
})
230-
@bs.get external deltaMode: t => int = "deltaMode"
231-
@bs.get external deltaX: t => float = "deltaX"
232-
@bs.get external deltaY: t => float = "deltaY"
233-
@bs.get external deltaZ: t => float = "deltaZ"
230+
@get external deltaMode: t => int = "deltaMode"
231+
@get external deltaX: t => float = "deltaX"
232+
@get external deltaY: t => float = "deltaY"
233+
@get external deltaZ: t => float = "deltaZ"
234234
}
235235

236236
module Media = {
@@ -255,9 +255,9 @@ module Animation = {
255255
include MakeEventWithType({
256256
type t = t
257257
})
258-
@bs.get external animationName: t => string = "animationName"
259-
@bs.get external pseudoElement: t => string = "pseudoElement"
260-
@bs.get external elapsedTime: t => float = "elapsedTime"
258+
@get external animationName: t => string = "animationName"
259+
@get external pseudoElement: t => string = "pseudoElement"
260+
@get external elapsedTime: t => float = "elapsedTime"
261261
}
262262

263263
module Transition = {
@@ -266,7 +266,7 @@ module Transition = {
266266
include MakeEventWithType({
267267
type t = t
268268
})
269-
@bs.get external propertyName: t => string = "propertyName"
270-
@bs.get external pseudoElement: t => string = "pseudoElement"
271-
@bs.get external elapsedTime: t => float = "elapsedTime"
269+
@get external propertyName: t => string = "propertyName"
270+
@get external pseudoElement: t => string = "pseudoElement"
271+
@get external elapsedTime: t => float = "elapsedTime"
272272
}

0 commit comments

Comments
 (0)