Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions src/ReactDOM.re
Original file line number Diff line number Diff line change
Expand Up @@ -439,21 +439,21 @@ module Props = {
[@bs.optional]
onDoubleClick: ReactEvent.Mouse.t => unit,
[@bs.optional]
onDrag: ReactEvent.Mouse.t => unit,
onDrag: ReactEvent.Drag.t => unit,
[@bs.optional]
onDragEnd: ReactEvent.Mouse.t => unit,
onDragEnd: ReactEvent.Drag.t => unit,
[@bs.optional]
onDragEnter: ReactEvent.Mouse.t => unit,
onDragEnter: ReactEvent.Drag.t => unit,
[@bs.optional]
onDragExit: ReactEvent.Mouse.t => unit,
onDragExit: ReactEvent.Drag.t => unit,
[@bs.optional]
onDragLeave: ReactEvent.Mouse.t => unit,
onDragLeave: ReactEvent.Drag.t => unit,
[@bs.optional]
onDragOver: ReactEvent.Mouse.t => unit,
onDragOver: ReactEvent.Drag.t => unit,
[@bs.optional]
onDragStart: ReactEvent.Mouse.t => unit,
onDragStart: ReactEvent.Drag.t => unit,
[@bs.optional]
onDrop: ReactEvent.Mouse.t => unit,
onDrop: ReactEvent.Drag.t => unit,
[@bs.optional]
onMouseDown: ReactEvent.Mouse.t => unit,
[@bs.optional]
Expand Down Expand Up @@ -1461,21 +1461,21 @@ module Props = {
[@bs.optional]
onDoubleClick: ReactEvent.Mouse.t => unit,
[@bs.optional]
onDrag: ReactEvent.Mouse.t => unit,
onDrag: ReactEvent.Drag.t => unit,
[@bs.optional]
onDragEnd: ReactEvent.Mouse.t => unit,
onDragEnd: ReactEvent.Drag.t => unit,
[@bs.optional]
onDragEnter: ReactEvent.Mouse.t => unit,
onDragEnter: ReactEvent.Drag.t => unit,
[@bs.optional]
onDragExit: ReactEvent.Mouse.t => unit,
onDragExit: ReactEvent.Drag.t => unit,
[@bs.optional]
onDragLeave: ReactEvent.Mouse.t => unit,
onDragLeave: ReactEvent.Drag.t => unit,
[@bs.optional]
onDragOver: ReactEvent.Mouse.t => unit,
onDragOver: ReactEvent.Drag.t => unit,
[@bs.optional]
onDragStart: ReactEvent.Mouse.t => unit,
onDragStart: ReactEvent.Drag.t => unit,
[@bs.optional]
onDrop: ReactEvent.Mouse.t => unit,
onDrop: ReactEvent.Drag.t => unit,
[@bs.optional]
onMouseDown: ReactEvent.Mouse.t => unit,
[@bs.optional]
Expand Down
30 changes: 30 additions & 0 deletions src/ReactEvent.re
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,36 @@ module Mouse = {
[@bs.get] external shiftKey: t => bool = "shiftKey";
};

module Drag = {
type tag;
type t = synthetic(tag);
include MakeEventWithType({
type nonrec t = t;
});

// MouseEvent
[@bs.get] external altKey: t => bool = "altKey";
[@bs.get] external button: t => int = "button";
[@bs.get] external buttons: t => int = "buttons";
[@bs.get] external clientX: t => int = "clientX";
[@bs.get] external clientY: t => int = "clientY";
[@bs.get] external ctrlKey: t => bool = "ctrlKey";
[@bs.send]
external getModifierState: (t, string) => bool = "getModifierState";
[@bs.get] external metaKey: t => bool = "metaKey";
[@bs.get] external movementX: t => int = "movementX";
[@bs.get] external movementY: t => int = "movementY";
[@bs.get] external pageX: t => int = "pageX";
[@bs.get] external pageY: t => int = "pageY";
[@bs.get] [@bs.return nullable]
external relatedTarget: t => option(Js.t({..})) = "relatedTarget"; /* Should return Dom.eventTarget */
[@bs.get] external screenX: t => int = "screenX";
[@bs.get] external screenY: t => int = "screenY";
[@bs.get] external shiftKey: t => bool = "shiftKey";

[@bs.get] external dataTransfer: t => Dom.dataTransfer = "dataTransfer";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dom.dataTransfer is an opaque type, probably better to return Js.t({..}). Even though it's unsafe it's better to allow users to access by object accessor.

};

module Pointer = {
type tag;
type t = synthetic(tag);
Expand Down
44 changes: 44 additions & 0 deletions src/ReactEvent.rei
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,50 @@ module Composition: {
[@bs.get] external data: t => string = "data";
};

module Drag: {
type tag;
type t = synthetic(tag);

// SyntheticEvent
[@bs.get] external bubbles: t => bool = "bubbles";
[@bs.get] external cancelable: t => bool = "cancelable";
[@bs.get] external currentTarget: t => Js.t({..}) = "currentTarget";
[@bs.get] external defaultPrevented: t => bool = "defaultPrevented";
[@bs.get] external eventPhase: t => int = "eventPhase";
[@bs.get] external isTrusted: t => bool = "isTrusted";
[@bs.get] external nativeEvent: t => Js.t({..}) = "nativeEvent";
[@bs.send] external preventDefault: t => unit = "preventDefault";
[@bs.send] external isDefaultPrevented: t => bool = "isDefaultPrevented";
[@bs.send] external stopPropagation: t => unit = "stopPropagation";
[@bs.send] external isPropagationStopped: t => bool = "isPropagationStopped";
[@bs.get] external target: t => Js.t({..}) = "target";
[@bs.get] external timeStamp: t => float = "timeStamp";
[@bs.get] external type_: t => string = "type";
[@bs.send] external persist: t => unit = "persist";

// MouseEvent
[@bs.get] external altKey: t => bool = "altKey";
[@bs.get] external button: t => int = "button";
[@bs.get] external buttons: t => int = "buttons";
[@bs.get] external clientX: t => int = "clientX";
[@bs.get] external clientY: t => int = "clientY";
[@bs.get] external ctrlKey: t => bool = "ctrlKey";
[@bs.send]
external getModifierState: (t, string) => bool = "getModifierState";
[@bs.get] external metaKey: t => bool = "metaKey";
[@bs.get] external movementX: t => int = "movementX";
[@bs.get] external movementY: t => int = "movementY";
[@bs.get] external pageX: t => int = "pageX";
[@bs.get] external pageY: t => int = "pageY";
[@bs.get] [@bs.return nullable]
external relatedTarget: t => option(Js.t({..})) = "relatedTarget"; /* Should return Dom.eventTarget */
[@bs.get] external screenX: t => int = "screenX";
[@bs.get] external screenY: t => int = "screenY";
[@bs.get] external shiftKey: t => bool = "shiftKey";

[@bs.get] external dataTransfer: t => Dom.dataTransfer = "dataTransfer";
};

module Keyboard: {
type tag;
type t = synthetic(tag);
Expand Down