Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[future uncertain] Add support for pointer events #1389

Closed
wants to merge 5 commits into from
Closed
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
8 changes: 8 additions & 0 deletions src/browser/ReactEventEmitter.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,16 +103,24 @@ var topEventMapping = {
topDragStart: 'dragstart',
topDrop: 'drop',
topFocus: 'focus',
topGotPointerCapture: 'gotpointercapture',
topInput: 'input',
topKeyDown: 'keydown',
topKeyPress: 'keypress',
topKeyUp: 'keyup',
topLostPointerCapture: 'lostpointercapture',
topMouseDown: 'mousedown',
topMouseMove: 'mousemove',

Choose a reason for hiding this comment

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

Hello

Choose a reason for hiding this comment

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

Hello

topMouseOut: 'mouseout',
topMouseOver: 'mouseover',
topMouseUp: 'mouseup',
topPaste: 'paste',
topPointerCancel: 'pointercancel',
topPointerDown: 'pointerdown',
topPointerMove: 'pointermove',
topPointerOut: 'pointerout',
topPointerOver: 'pointerover',
topPointerUp: 'pointerup',
topScroll: 'scroll',
topSelectionChange: 'selectionchange',
topTextInput: 'textInput',
Expand Down
77 changes: 52 additions & 25 deletions src/browser/eventPlugins/EnterLeaveEventPlugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
var EventConstants = require('EventConstants');
var EventPropagators = require('EventPropagators');
var SyntheticMouseEvent = require('SyntheticMouseEvent');
var SyntheticPointerEvent = require('SyntheticPointerEvent');

var ReactMount = require('ReactMount');
var keyOf = require('keyOf');
Expand All @@ -43,6 +44,20 @@ var eventTypes = {
topLevelTypes.topMouseOut,
topLevelTypes.topMouseOver
]
},
pointerEnter: {
registrationName: keyOf({onPointerEnter: null}),
dependencies: [
topLevelTypes.topPointerOut,
topLevelTypes.topPointerOver
]
},
pointerLeave: {
registrationName: keyOf({onPointerLeave: null}),
dependencies: [
topLevelTypes.topPointerOut,
topLevelTypes.topPointerOver
]
}
};

Expand Down Expand Up @@ -71,13 +86,20 @@ var EnterLeaveEventPlugin = {
topLevelTarget,
topLevelTargetID,
nativeEvent) {
if (topLevelType === topLevelTypes.topMouseOver &&
(nativeEvent.relatedTarget || nativeEvent.fromElement)) {
var isOverEvent = (
topLevelType === topLevelTypes.topMouseOver ||
topLevelType === topLevelTypes.topPointerOver
);
var isOutEvent = (
topLevelType === topLevelTypes.topMouseOut ||
topLevelType === topLevelTypes.topPointerOut
);

if (!isOverEvent && !isOutEvent) {
// Must not be a mouse/pointer in or out - ignoring.
return null;
}
if (topLevelType !== topLevelTypes.topMouseOut &&
topLevelType !== topLevelTypes.topMouseOver) {
// Must not be a mouse in or mouse out - ignoring.
if (isOverEvent && (nativeEvent.relatedTarget || nativeEvent.fromElement)) {
return null;
}

Expand All @@ -88,19 +110,16 @@ var EnterLeaveEventPlugin = {
} else {
// TODO: Figure out why `ownerDocument` is sometimes undefined in IE8.
var doc = topLevelTarget.ownerDocument;
if (doc) {
win = doc.defaultView || doc.parentWindow;
} else {
win = window;
}
win = doc ? doc.defaultView || doc.parentWindow : window;
}

var from, to;
if (topLevelType === topLevelTypes.topMouseOut) {
if (isOutEvent) {
from = topLevelTarget;
to =
to = (
getFirstReactDOM(nativeEvent.relatedTarget || nativeEvent.toElement) ||
win;
win
);
} else {
from = win;
to = topLevelTarget;
Expand All @@ -111,24 +130,32 @@ var EnterLeaveEventPlugin = {
return null;
}

var eventInterface, leaveEventType, enterEventType, eventTypePrefix;

if (topLevelType === topLevelTypes.topMouseOut ||
topLevelType === topLevelTypes.topMouseOver) {
eventInterface = SyntheticMouseEvent;
leaveEventType = eventTypes.mouseLeave;
enterEventType = eventTypes.mouseEnter;
eventTypePrefix = 'mouse';
} else if (topLevelType === topLevelTypes.topPointerOut ||
topLevelType === topLevelTypes.topPointerOver) {
eventInterface = SyntheticPointerEvent;
leaveEventType = eventTypes.pointerLeave;
enterEventType = eventTypes.pointerEnter;
eventTypePrefix = 'pointer';
}

var fromID = from ? ReactMount.getID(from) : '';
var toID = to ? ReactMount.getID(to) : '';

var leave = SyntheticMouseEvent.getPooled(
eventTypes.mouseLeave,
fromID,
nativeEvent
);
leave.type = 'mouseleave';
var leave = eventInterface.getPooled(leaveEventType, fromID, nativeEvent);
leave.type = eventTypePrefix + 'leave';
leave.target = from;
leave.relatedTarget = to;

var enter = SyntheticMouseEvent.getPooled(
eventTypes.mouseEnter,
toID,
nativeEvent
);
enter.type = 'mouseenter';
var enter = eventInterface.getPooled(enterEventType, fromID, nativeEvent);
enter.type = eventTypePrefix + 'enter';
enter.target = to;
enter.relatedTarget = from;

Expand Down
131 changes: 99 additions & 32 deletions src/browser/eventPlugins/SimpleEventPlugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ var SyntheticDragEvent = require('SyntheticDragEvent');
var SyntheticTouchEvent = require('SyntheticTouchEvent');
var SyntheticUIEvent = require('SyntheticUIEvent');
var SyntheticWheelEvent = require('SyntheticWheelEvent');
var SyntheticPointerEvent = require('SyntheticPointerEvent');

var invariant = require('invariant');
var keyOf = require('keyOf');
Expand Down Expand Up @@ -127,6 +128,12 @@ var eventTypes = {
captured: keyOf({onFocusCapture: true})
}
},
gotPointerCapture: {
phasedRegistrationNames: {
bubbled: keyOf({onGotPointerCapture: true}),
captured: keyOf({onGotPointerCaptureCapture: true})
}
},
input: {
phasedRegistrationNames: {
bubbled: keyOf({onInput: true}),
Expand Down Expand Up @@ -157,6 +164,12 @@ var eventTypes = {
captured: keyOf({onLoadCapture: true})
}
},
lostPointerCapture: {
phasedRegistrationNames: {
bubbled: keyOf({onLostPointerCapture: true}),
captured: keyOf({onLostPointerCaptureCapture: true})
}
},
error: {
phasedRegistrationNames: {
bubbled: keyOf({onError: true}),
Expand Down Expand Up @@ -201,6 +214,42 @@ var eventTypes = {
captured: keyOf({onPasteCapture: true})
}
},
pointerCancel: {
phasedRegistrationNames: {
bubbled: keyOf({onPointerCancel: true}),
captured: keyOf({onPointerCancelCapture: true})
}
},
pointerDown: {
phasedRegistrationNames: {
bubbled: keyOf({onPointerDown: true}),
captured: keyOf({onPointerDownCapture: true})
}
},
pointerMove: {
phasedRegistrationNames: {
bubbled: keyOf({onPointerMove: true}),
captured: keyOf({onPointerMoveCapture: true})
}
},
pointerOut: {
phasedRegistrationNames: {
bubbled: keyOf({onPointerOut: true}),
captured: keyOf({onPointerOutCapture: true})
}
},
pointerOver: {
phasedRegistrationNames: {
bubbled: keyOf({onPointerOver: true}),
captured: keyOf({onPointerOverCapture: true})
}
},
pointerUp: {
phasedRegistrationNames: {
bubbled: keyOf({onPointerUp: true}),
captured: keyOf({onPointerUpCapture: true})
}
},
reset: {
phasedRegistrationNames: {
bubbled: keyOf({onReset: true}),
Expand Down Expand Up @@ -252,41 +301,49 @@ var eventTypes = {
};

var topLevelEventsToDispatchConfig = {
topBlur: eventTypes.blur,
topClick: eventTypes.click,
topBlur: eventTypes.blur,
topClick: eventTypes.click,
topContextMenu: eventTypes.contextMenu,
topCopy: eventTypes.copy,
topCut: eventTypes.cut,
topCopy: eventTypes.copy,
topCut: eventTypes.cut,
topDoubleClick: eventTypes.doubleClick,
topDrag: eventTypes.drag,
topDragEnd: eventTypes.dragEnd,
topDragEnter: eventTypes.dragEnter,
topDragExit: eventTypes.dragExit,
topDragLeave: eventTypes.dragLeave,
topDragOver: eventTypes.dragOver,
topDragStart: eventTypes.dragStart,
topDrop: eventTypes.drop,
topError: eventTypes.error,
topFocus: eventTypes.focus,
topInput: eventTypes.input,
topKeyDown: eventTypes.keyDown,
topKeyPress: eventTypes.keyPress,
topKeyUp: eventTypes.keyUp,
topLoad: eventTypes.load,
topMouseDown: eventTypes.mouseDown,
topMouseMove: eventTypes.mouseMove,
topMouseOut: eventTypes.mouseOut,
topMouseOver: eventTypes.mouseOver,
topMouseUp: eventTypes.mouseUp,
topPaste: eventTypes.paste,
topReset: eventTypes.reset,
topScroll: eventTypes.scroll,
topSubmit: eventTypes.submit,
topDrag: eventTypes.drag,
topDragEnd: eventTypes.dragEnd,
topDragEnter: eventTypes.dragEnter,
topDragExit: eventTypes.dragExit,
topDragLeave: eventTypes.dragLeave,
topDragOver: eventTypes.dragOver,
topDragStart: eventTypes.dragStart,
topDrop: eventTypes.drop,
topError: eventTypes.error,
topFocus: eventTypes.focus,
topGotPointerCapture: eventTypes.gotPointerCapture,
topInput: eventTypes.input,
topKeyDown: eventTypes.keyDown,
topKeyPress: eventTypes.keyPress,
topKeyUp: eventTypes.keyUp,
topLoad: eventTypes.load,
topLostPointerCapture: eventTypes.lostPointerCapture,
topMouseDown: eventTypes.mouseDown,
topMouseMove: eventTypes.mouseMove,
topMouseOut: eventTypes.mouseOut,
topMouseOver: eventTypes.mouseOver,
topMouseUp: eventTypes.mouseUp,
topPaste: eventTypes.paste,
topPointerCancel: eventTypes.pointerCancel,
topPointerDown: eventTypes.pointerDown,
topPointerMove: eventTypes.pointerMove,
topPointerOut: eventTypes.pointerOut,
topPointerOver: eventTypes.pointerOver,
topPointerUp: eventTypes.pointerUp,
topReset: eventTypes.reset,
topScroll: eventTypes.scroll,
topSubmit: eventTypes.submit,
topTouchCancel: eventTypes.touchCancel,
topTouchEnd: eventTypes.touchEnd,
topTouchMove: eventTypes.touchMove,
topTouchStart: eventTypes.touchStart,
topWheel: eventTypes.wheel
topTouchEnd: eventTypes.touchEnd,
topTouchMove: eventTypes.touchMove,
topTouchStart: eventTypes.touchStart,
topWheel: eventTypes.wheel
};

for (var topLevelType in topLevelEventsToDispatchConfig) {
Expand Down Expand Up @@ -366,6 +423,16 @@ var SimpleEventPlugin = {
case topLevelTypes.topMouseUp:
EventConstructor = SyntheticMouseEvent;
break;
case topLevelTypes.topPointerCancel:
case topLevelTypes.topPointerDown:
case topLevelTypes.topPointerMove:
case topLevelTypes.topPointerOut:
case topLevelTypes.topPointerOver:
case topLevelTypes.topPointerUp:
case topLevelTypes.topGotPointerCapture:
case topLevelTypes.topLostPointerCapture:
EventConstructor = SyntheticPointerEvent;
break;
case topLevelTypes.topDrag:
case topLevelTypes.topDragEnd:
case topLevelTypes.topDragEnter:
Expand Down
6 changes: 5 additions & 1 deletion src/browser/eventPlugins/TapEventPlugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,11 @@ function getDistance(coords, nativeEvent) {
var dependencies = [
topLevelTypes.topMouseDown,
topLevelTypes.topMouseMove,
topLevelTypes.topMouseUp
topLevelTypes.topMouseUp,
topLevelTypes.topPointerCancel,
topLevelTypes.topPointerDown,
topLevelTypes.topPointerMove,
topLevelTypes.topPointerUp
];

if (EventPluginUtils.useTouchEvents) {
Expand Down
51 changes: 51 additions & 0 deletions src/browser/syntheticEvents/SyntheticPointerEvent.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/**
* Copyright 2013-2014 Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* @providesModule SyntheticPointerEvent
* @typechecks static-only
*/

"use strict";

var SyntheticMouseEvent = require('SyntheticMouseEvent');

/**
* @interface PointerEvent
* @see http://www.w3.org/TR/pointerevents/
*/
var PointerEventInterface = {
pointerId: null,
width: null,
height: null,
pressure: null,
tiltX: null,
tiltY: null,
pointerType: null,
isPrimary: null
};

/**
* @param {object} dispatchConfig Configuration used to dispatch this event.
* @param {string} dispatchMarker Marker identifying the event target.
* @param {object} nativeEvent Native browser event.
* @extends {SyntheticMouseEvent}
*/
function SyntheticPointerEvent(dispatchConfig, dispatchMarker, nativeEvent) {
SyntheticMouseEvent.call(this, dispatchConfig, dispatchMarker, nativeEvent);
}

SyntheticMouseEvent.augmentClass(SyntheticPointerEvent, PointerEventInterface);

module.exports = SyntheticPointerEvent;
Loading