mirror of
https://github.com/facebook/react.git
synced 2026-11-18 20:15:56 +00:00
Merge pull request #4150 from jimfb/event-path
Make events propagate through shadow DOMs.
This commit is contained in:
commit
851378b0b2
27 files changed
+167
-68
No files matched your search
@@ -23,6 +23,8 @@ var assign = require('Object.assign');
|
||||
var getEventTarget = require('getEventTarget');
|
||||
var getUnboundedScrollPosition = require('getUnboundedScrollPosition');
|
||||
|
||||
var DOCUMENT_FRAGMENT_NODE_TYPE = 11;
|
||||
|
||||
/**
|
||||
* Finds the parent React component of `node`.
|
||||
*
|
||||
@@ -60,6 +62,17 @@ PooledClass.addPoolingTo(
|
||||
);
|
||||
|
||||
function handleTopLevelImpl(bookKeeping) {
|
||||
if (bookKeeping.nativeEvent.path) {
|
||||
// New browsers have a path attribute on native events
|
||||
handleTopLevelWithPath(bookKeeping);
|
||||
} else {
|
||||
// Legacy browsers don't have a path attribute on native events
|
||||
handleTopLevelWithoutPath(bookKeeping);
|
||||
}
|
||||
}
|
||||
|
||||
// Legacy browsers don't have a path attribute on native events
|
||||
function handleTopLevelWithoutPath(bookKeeping) {
|
||||
var topLevelTarget = ReactMount.getFirstReactDOM(
|
||||
getEventTarget(bookKeeping.nativeEvent)
|
||||
) || window;
|
||||
@@ -81,11 +94,47 @@ function handleTopLevelImpl(bookKeeping) {
|
||||
bookKeeping.topLevelType,
|
||||
topLevelTarget,
|
||||
topLevelTargetID,
|
||||
bookKeeping.nativeEvent
|
||||
bookKeeping.nativeEvent,
|
||||
getEventTarget(bookKeeping.nativeEvent)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// New browsers have a path attribute on native events
|
||||
function handleTopLevelWithPath(bookKeeping) {
|
||||
var path = bookKeeping.nativeEvent.path;
|
||||
var currentNativeTarget = path[0];
|
||||
for (var i = 0; i < path.length; i++) {
|
||||
var currentPathElement = path[i];
|
||||
var currentPathElemenId = ReactMount.getID(currentPathElement);
|
||||
if (currentPathElement.nodeType === DOCUMENT_FRAGMENT_NODE_TYPE) {
|
||||
currentNativeTarget = path[i + 1];
|
||||
}
|
||||
if (ReactMount.isRenderedByReact(currentPathElement)) {
|
||||
var newRootId = ReactInstanceHandles.getReactRootIDFromNodeID(
|
||||
currentPathElemenId
|
||||
);
|
||||
bookKeeping.ancestors.push(currentPathElement);
|
||||
|
||||
var topLevelTargetID = ReactMount.getID(currentPathElement) || '';
|
||||
ReactEventListener._handleTopLevel(
|
||||
bookKeeping.topLevelType,
|
||||
currentPathElement,
|
||||
topLevelTargetID,
|
||||
bookKeeping.nativeEvent,
|
||||
currentNativeTarget
|
||||
);
|
||||
|
||||
// Jump to the root of this React render tree
|
||||
while (currentPathElemenId !== newRootId) {
|
||||
i++;
|
||||
currentPathElement = path[i];
|
||||
currentPathElemenId = ReactMount.getID(currentPathElement);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function scrollValueMonitor(cb) {
|
||||
var scrollPosition = getUnboundedScrollPosition(window);
|
||||
cb(scrollPosition);
|
||||
|
||||
@@ -63,7 +63,8 @@ var EnterLeaveEventPlugin = {
|
||||
topLevelType,
|
||||
topLevelTarget,
|
||||
topLevelTargetID,
|
||||
nativeEvent) {
|
||||
nativeEvent,
|
||||
nativeEventTarget) {
|
||||
if (topLevelType === topLevelTypes.topMouseOver &&
|
||||
(nativeEvent.relatedTarget || nativeEvent.fromElement)) {
|
||||
return null;
|
||||
@@ -110,7 +111,8 @@ var EnterLeaveEventPlugin = {
|
||||
var leave = SyntheticMouseEvent.getPooled(
|
||||
eventTypes.mouseLeave,
|
||||
fromID,
|
||||
nativeEvent
|
||||
nativeEvent,
|
||||
nativeEventTarget
|
||||
);
|
||||
leave.type = 'mouseleave';
|
||||
leave.target = from;
|
||||
@@ -119,7 +121,8 @@ var EnterLeaveEventPlugin = {
|
||||
var enter = SyntheticMouseEvent.getPooled(
|
||||
eventTypes.mouseEnter,
|
||||
toID,
|
||||
nativeEvent
|
||||
nativeEvent,
|
||||
nativeEventTarget
|
||||
);
|
||||
enter.type = 'mouseenter';
|
||||
enter.target = to;
|
||||
|
||||
@@ -92,7 +92,7 @@ function getSelection(node) {
|
||||
* @param {object} nativeEvent
|
||||
* @return {?SyntheticEvent}
|
||||
*/
|
||||
function constructSelectEvent(nativeEvent) {
|
||||
function constructSelectEvent(nativeEvent, nativeEventTarget) {
|
||||
// Ensure we have the right element, and that the user is not dragging a
|
||||
// selection (this matches native `select` event behavior). In HTML5, select
|
||||
// fires only on input and textarea thus if there's no focused element we
|
||||
@@ -111,7 +111,8 @@ function constructSelectEvent(nativeEvent) {
|
||||
var syntheticEvent = SyntheticEvent.getPooled(
|
||||
eventTypes.select,
|
||||
activeElementID,
|
||||
nativeEvent
|
||||
nativeEvent,
|
||||
nativeEventTarget
|
||||
);
|
||||
|
||||
syntheticEvent.type = 'select';
|
||||
@@ -155,8 +156,8 @@ var SelectEventPlugin = {
|
||||
topLevelType,
|
||||
topLevelTarget,
|
||||
topLevelTargetID,
|
||||
nativeEvent) {
|
||||
|
||||
nativeEvent,
|
||||
nativeEventTarget) {
|
||||
if (!hasListener) {
|
||||
return null;
|
||||
}
|
||||
@@ -185,7 +186,7 @@ var SelectEventPlugin = {
|
||||
case topLevelTypes.topContextMenu:
|
||||
case topLevelTypes.topMouseUp:
|
||||
mouseDown = false;
|
||||
return constructSelectEvent(nativeEvent);
|
||||
return constructSelectEvent(nativeEvent, nativeEventTarget);
|
||||
|
||||
// Chrome and IE fire non-standard event when selection is changed (and
|
||||
// sometimes when it hasn't).
|
||||
@@ -196,7 +197,7 @@ var SelectEventPlugin = {
|
||||
case topLevelTypes.topSelectionChange:
|
||||
case topLevelTypes.topKeyDown:
|
||||
case topLevelTypes.topKeyUp:
|
||||
return constructSelectEvent(nativeEvent);
|
||||
return constructSelectEvent(nativeEvent, nativeEventTarget);
|
||||
}
|
||||
|
||||
return null;
|
||||
|
||||
@@ -334,7 +334,8 @@ var SimpleEventPlugin = {
|
||||
topLevelType,
|
||||
topLevelTarget,
|
||||
topLevelTargetID,
|
||||
nativeEvent) {
|
||||
nativeEvent,
|
||||
nativeEventTarget) {
|
||||
var dispatchConfig = topLevelEventsToDispatchConfig[topLevelType];
|
||||
if (!dispatchConfig) {
|
||||
return null;
|
||||
@@ -418,7 +419,8 @@ var SimpleEventPlugin = {
|
||||
var event = EventConstructor.getPooled(
|
||||
dispatchConfig,
|
||||
topLevelTargetID,
|
||||
nativeEvent
|
||||
nativeEvent,
|
||||
nativeEventTarget
|
||||
);
|
||||
EventPropagators.accumulateTwoPhaseDispatches(event);
|
||||
return event;
|
||||
|
||||
@@ -101,7 +101,8 @@ var TapEventPlugin = {
|
||||
topLevelType,
|
||||
topLevelTarget,
|
||||
topLevelTargetID,
|
||||
nativeEvent) {
|
||||
nativeEvent,
|
||||
nativeEventTarget) {
|
||||
if (!isStartish(topLevelType) && !isEndish(topLevelType)) {
|
||||
return null;
|
||||
}
|
||||
@@ -122,7 +123,8 @@ var TapEventPlugin = {
|
||||
event = SyntheticUIEvent.getPooled(
|
||||
eventTypes.touchTap,
|
||||
topLevelTargetID,
|
||||
nativeEvent
|
||||
nativeEvent,
|
||||
nativeEventTarget
|
||||
);
|
||||
}
|
||||
if (isStartish(topLevelType)) {
|
||||
|
||||
@@ -48,7 +48,8 @@ describe('EnterLeaveEventPlugin', function() {
|
||||
topLevelTypes.topMouseOver,
|
||||
div,
|
||||
ReactMount.getID(div),
|
||||
{target: div}
|
||||
{target: div},
|
||||
div
|
||||
);
|
||||
expect(extracted.length).toBe(2);
|
||||
|
||||
|
||||
@@ -30,7 +30,8 @@ describe('SelectEventPlugin', function() {
|
||||
topLevelEvent,
|
||||
node,
|
||||
ReactMount.getID(node),
|
||||
{target: node}
|
||||
{target: node},
|
||||
node
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -34,8 +34,8 @@ var ClipboardEventInterface = {
|
||||
* @param {object} nativeEvent Native browser event.
|
||||
* @extends {SyntheticUIEvent}
|
||||
*/
|
||||
function SyntheticClipboardEvent(dispatchConfig, dispatchMarker, nativeEvent) {
|
||||
SyntheticEvent.call(this, dispatchConfig, dispatchMarker, nativeEvent);
|
||||
function SyntheticClipboardEvent(dispatchConfig, dispatchMarker, nativeEvent, nativeEventTarget) {
|
||||
SyntheticEvent.call(this, dispatchConfig, dispatchMarker, nativeEvent, nativeEventTarget);
|
||||
}
|
||||
|
||||
SyntheticEvent.augmentClass(SyntheticClipboardEvent, ClipboardEventInterface);
|
||||
|
||||
@@ -31,8 +31,9 @@ var CompositionEventInterface = {
|
||||
function SyntheticCompositionEvent(
|
||||
dispatchConfig,
|
||||
dispatchMarker,
|
||||
nativeEvent) {
|
||||
SyntheticEvent.call(this, dispatchConfig, dispatchMarker, nativeEvent);
|
||||
nativeEvent,
|
||||
nativeEventTarget) {
|
||||
SyntheticEvent.call(this, dispatchConfig, dispatchMarker, nativeEvent, nativeEventTarget);
|
||||
}
|
||||
|
||||
SyntheticEvent.augmentClass(
|
||||
|
||||
@@ -28,8 +28,8 @@ var DragEventInterface = {
|
||||
* @param {object} nativeEvent Native browser event.
|
||||
* @extends {SyntheticUIEvent}
|
||||
*/
|
||||
function SyntheticDragEvent(dispatchConfig, dispatchMarker, nativeEvent) {
|
||||
SyntheticMouseEvent.call(this, dispatchConfig, dispatchMarker, nativeEvent);
|
||||
function SyntheticDragEvent(dispatchConfig, dispatchMarker, nativeEvent, nativeEventTarget) {
|
||||
SyntheticMouseEvent.call(this, dispatchConfig, dispatchMarker, nativeEvent, nativeEventTarget);
|
||||
}
|
||||
|
||||
SyntheticMouseEvent.augmentClass(SyntheticDragEvent, DragEventInterface);
|
||||
|
||||
@@ -16,15 +16,14 @@ var PooledClass = require('PooledClass');
|
||||
|
||||
var assign = require('Object.assign');
|
||||
var emptyFunction = require('emptyFunction');
|
||||
var getEventTarget = require('getEventTarget');
|
||||
|
||||
/**
|
||||
* @interface Event
|
||||
* @see http://www.w3.org/TR/DOM-Level-3-Events/
|
||||
*/
|
||||
var EventInterface = {
|
||||
path: null,
|
||||
type: null,
|
||||
target: getEventTarget,
|
||||
// currentTarget is set when dispatching; no use in copying it here
|
||||
currentTarget: emptyFunction.thatReturnsNull,
|
||||
eventPhase: null,
|
||||
@@ -54,10 +53,12 @@ var EventInterface = {
|
||||
* @param {string} dispatchMarker Marker identifying the event target.
|
||||
* @param {object} nativeEvent Native browser event.
|
||||
*/
|
||||
function SyntheticEvent(dispatchConfig, dispatchMarker, nativeEvent) {
|
||||
function SyntheticEvent(dispatchConfig, dispatchMarker, nativeEvent, nativeEventTarget) {
|
||||
this.dispatchConfig = dispatchConfig;
|
||||
this.dispatchMarker = dispatchMarker;
|
||||
this.nativeEvent = nativeEvent;
|
||||
this.target = nativeEventTarget;
|
||||
this.currentTarget = nativeEventTarget;
|
||||
|
||||
var Interface = this.constructor.Interface;
|
||||
for (var propName in Interface) {
|
||||
@@ -156,9 +157,9 @@ SyntheticEvent.augmentClass = function(Class, Interface) {
|
||||
Class.Interface = assign({}, Super.Interface, Interface);
|
||||
Class.augmentClass = Super.augmentClass;
|
||||
|
||||
PooledClass.addPoolingTo(Class, PooledClass.threeArgumentPooler);
|
||||
PooledClass.addPoolingTo(Class, PooledClass.fourArgumentPooler);
|
||||
};
|
||||
|
||||
PooledClass.addPoolingTo(SyntheticEvent, PooledClass.threeArgumentPooler);
|
||||
PooledClass.addPoolingTo(SyntheticEvent, PooledClass.fourArgumentPooler);
|
||||
|
||||
module.exports = SyntheticEvent;
|
||||
@@ -28,8 +28,8 @@ var FocusEventInterface = {
|
||||
* @param {object} nativeEvent Native browser event.
|
||||
* @extends {SyntheticUIEvent}
|
||||
*/
|
||||
function SyntheticFocusEvent(dispatchConfig, dispatchMarker, nativeEvent) {
|
||||
SyntheticUIEvent.call(this, dispatchConfig, dispatchMarker, nativeEvent);
|
||||
function SyntheticFocusEvent(dispatchConfig, dispatchMarker, nativeEvent, nativeEventTarget) {
|
||||
SyntheticUIEvent.call(this, dispatchConfig, dispatchMarker, nativeEvent, nativeEventTarget);
|
||||
}
|
||||
|
||||
SyntheticUIEvent.augmentClass(SyntheticFocusEvent, FocusEventInterface);
|
||||
|
||||
@@ -32,8 +32,9 @@ var InputEventInterface = {
|
||||
function SyntheticInputEvent(
|
||||
dispatchConfig,
|
||||
dispatchMarker,
|
||||
nativeEvent) {
|
||||
SyntheticEvent.call(this, dispatchConfig, dispatchMarker, nativeEvent);
|
||||
nativeEvent,
|
||||
nativeEventTarget) {
|
||||
SyntheticEvent.call(this, dispatchConfig, dispatchMarker, nativeEvent, nativeEventTarget);
|
||||
}
|
||||
|
||||
SyntheticEvent.augmentClass(
|
||||
|
||||
@@ -76,8 +76,8 @@ var KeyboardEventInterface = {
|
||||
* @param {object} nativeEvent Native browser event.
|
||||
* @extends {SyntheticUIEvent}
|
||||
*/
|
||||
function SyntheticKeyboardEvent(dispatchConfig, dispatchMarker, nativeEvent) {
|
||||
SyntheticUIEvent.call(this, dispatchConfig, dispatchMarker, nativeEvent);
|
||||
function SyntheticKeyboardEvent(dispatchConfig, dispatchMarker, nativeEvent, nativeEventTarget) {
|
||||
SyntheticUIEvent.call(this, dispatchConfig, dispatchMarker, nativeEvent, nativeEventTarget);
|
||||
}
|
||||
|
||||
SyntheticUIEvent.augmentClass(SyntheticKeyboardEvent, KeyboardEventInterface);
|
||||
|
||||
@@ -72,8 +72,8 @@ var MouseEventInterface = {
|
||||
* @param {object} nativeEvent Native browser event.
|
||||
* @extends {SyntheticUIEvent}
|
||||
*/
|
||||
function SyntheticMouseEvent(dispatchConfig, dispatchMarker, nativeEvent) {
|
||||
SyntheticUIEvent.call(this, dispatchConfig, dispatchMarker, nativeEvent);
|
||||
function SyntheticMouseEvent(dispatchConfig, dispatchMarker, nativeEvent, nativeEventTarget) {
|
||||
SyntheticUIEvent.call(this, dispatchConfig, dispatchMarker, nativeEvent, nativeEventTarget);
|
||||
}
|
||||
|
||||
SyntheticUIEvent.augmentClass(SyntheticMouseEvent, MouseEventInterface);
|
||||
|
||||
@@ -37,8 +37,8 @@ var TouchEventInterface = {
|
||||
* @param {object} nativeEvent Native browser event.
|
||||
* @extends {SyntheticUIEvent}
|
||||
*/
|
||||
function SyntheticTouchEvent(dispatchConfig, dispatchMarker, nativeEvent) {
|
||||
SyntheticUIEvent.call(this, dispatchConfig, dispatchMarker, nativeEvent);
|
||||
function SyntheticTouchEvent(dispatchConfig, dispatchMarker, nativeEvent, nativeEventTarget) {
|
||||
SyntheticUIEvent.call(this, dispatchConfig, dispatchMarker, nativeEvent, nativeEventTarget);
|
||||
}
|
||||
|
||||
SyntheticUIEvent.augmentClass(SyntheticTouchEvent, TouchEventInterface);
|
||||
|
||||
@@ -51,8 +51,8 @@ var UIEventInterface = {
|
||||
* @param {object} nativeEvent Native browser event.
|
||||
* @extends {SyntheticEvent}
|
||||
*/
|
||||
function SyntheticUIEvent(dispatchConfig, dispatchMarker, nativeEvent) {
|
||||
SyntheticEvent.call(this, dispatchConfig, dispatchMarker, nativeEvent);
|
||||
function SyntheticUIEvent(dispatchConfig, dispatchMarker, nativeEvent, nativeEventTarget) {
|
||||
SyntheticEvent.call(this, dispatchConfig, dispatchMarker, nativeEvent, nativeEventTarget);
|
||||
}
|
||||
|
||||
SyntheticEvent.augmentClass(SyntheticUIEvent, UIEventInterface);
|
||||
|
||||
@@ -50,8 +50,8 @@ var WheelEventInterface = {
|
||||
* @param {object} nativeEvent Native browser event.
|
||||
* @extends {SyntheticMouseEvent}
|
||||
*/
|
||||
function SyntheticWheelEvent(dispatchConfig, dispatchMarker, nativeEvent) {
|
||||
SyntheticMouseEvent.call(this, dispatchConfig, dispatchMarker, nativeEvent);
|
||||
function SyntheticWheelEvent(dispatchConfig, dispatchMarker, nativeEvent, nativeEventTarget) {
|
||||
SyntheticMouseEvent.call(this, dispatchConfig, dispatchMarker, nativeEvent, nativeEventTarget);
|
||||
}
|
||||
|
||||
SyntheticMouseEvent.augmentClass(SyntheticWheelEvent, WheelEventInterface);
|
||||
|
||||
@@ -20,7 +20,8 @@ describe('SyntheticEvent', function() {
|
||||
SyntheticEvent = require('SyntheticEvent');
|
||||
|
||||
createEvent = function(nativeEvent) {
|
||||
return SyntheticEvent.getPooled({}, '', nativeEvent);
|
||||
var target = require('getEventTarget')(nativeEvent);
|
||||
return SyntheticEvent.getPooled({}, '', nativeEvent, target);
|
||||
};
|
||||
});
|
||||
|
||||
|
||||
@@ -20,7 +20,8 @@ describe('SyntheticWheelEvent', function() {
|
||||
SyntheticWheelEvent = require('SyntheticWheelEvent');
|
||||
|
||||
createEvent = function(nativeEvent) {
|
||||
return SyntheticWheelEvent.getPooled({}, '', nativeEvent);
|
||||
var target = require('getEventTarget')(nativeEvent);
|
||||
return SyntheticWheelEvent.getPooled({}, '', nativeEvent, target);
|
||||
};
|
||||
});
|
||||
|
||||
|
||||
@@ -230,7 +230,8 @@ var EventPluginHub = {
|
||||
topLevelType,
|
||||
topLevelTarget,
|
||||
topLevelTargetID,
|
||||
nativeEvent) {
|
||||
nativeEvent,
|
||||
nativeEventTarget) {
|
||||
var events;
|
||||
var plugins = EventPluginRegistry.plugins;
|
||||
for (var i = 0; i < plugins.length; i++) {
|
||||
@@ -241,7 +242,8 @@ var EventPluginHub = {
|
||||
topLevelType,
|
||||
topLevelTarget,
|
||||
topLevelTargetID,
|
||||
nativeEvent
|
||||
nativeEvent,
|
||||
nativeEventTarget
|
||||
);
|
||||
if (extractedEvents) {
|
||||
events = accumulateInto(events, extractedEvents);
|
||||
|
||||
@@ -325,7 +325,8 @@ to return true:wantsResponderID| |
|
||||
function setResponderAndExtractTransfer(
|
||||
topLevelType,
|
||||
topLevelTargetID,
|
||||
nativeEvent) {
|
||||
nativeEvent,
|
||||
nativeEventTarget) {
|
||||
var shouldSetEventType =
|
||||
isStartish(topLevelType) ? eventTypes.startShouldSetResponder :
|
||||
isMoveish(topLevelType) ? eventTypes.moveShouldSetResponder :
|
||||
@@ -346,7 +347,8 @@ function setResponderAndExtractTransfer(
|
||||
var shouldSetEvent = ResponderSyntheticEvent.getPooled(
|
||||
shouldSetEventType,
|
||||
bubbleShouldSetFrom,
|
||||
nativeEvent
|
||||
nativeEvent,
|
||||
nativeEventTarget
|
||||
);
|
||||
shouldSetEvent.touchHistory = ResponderTouchHistoryStore.touchHistory;
|
||||
if (skipOverBubbleShouldSetFrom) {
|
||||
@@ -366,7 +368,8 @@ function setResponderAndExtractTransfer(
|
||||
var grantEvent = ResponderSyntheticEvent.getPooled(
|
||||
eventTypes.responderGrant,
|
||||
wantsResponderID,
|
||||
nativeEvent
|
||||
nativeEvent,
|
||||
nativeEventTarget
|
||||
);
|
||||
grantEvent.touchHistory = ResponderTouchHistoryStore.touchHistory;
|
||||
|
||||
@@ -376,7 +379,8 @@ function setResponderAndExtractTransfer(
|
||||
var terminationRequestEvent = ResponderSyntheticEvent.getPooled(
|
||||
eventTypes.responderTerminationRequest,
|
||||
responderID,
|
||||
nativeEvent
|
||||
nativeEvent,
|
||||
nativeEventTarget
|
||||
);
|
||||
terminationRequestEvent.touchHistory = ResponderTouchHistoryStore.touchHistory;
|
||||
EventPropagators.accumulateDirectDispatches(terminationRequestEvent);
|
||||
@@ -391,7 +395,8 @@ function setResponderAndExtractTransfer(
|
||||
var terminateEvent = ResponderSyntheticEvent.getPooled(
|
||||
terminateType,
|
||||
responderID,
|
||||
nativeEvent
|
||||
nativeEvent,
|
||||
nativeEventTarget
|
||||
);
|
||||
terminateEvent.touchHistory = ResponderTouchHistoryStore.touchHistory;
|
||||
EventPropagators.accumulateDirectDispatches(terminateEvent);
|
||||
@@ -401,7 +406,8 @@ function setResponderAndExtractTransfer(
|
||||
var rejectEvent = ResponderSyntheticEvent.getPooled(
|
||||
eventTypes.responderReject,
|
||||
wantsResponderID,
|
||||
nativeEvent
|
||||
nativeEvent,
|
||||
nativeEventTarget
|
||||
);
|
||||
rejectEvent.touchHistory = ResponderTouchHistoryStore.touchHistory;
|
||||
EventPropagators.accumulateDirectDispatches(rejectEvent);
|
||||
@@ -487,8 +493,8 @@ var ResponderEventPlugin = {
|
||||
topLevelType,
|
||||
topLevelTarget,
|
||||
topLevelTargetID,
|
||||
nativeEvent) {
|
||||
|
||||
nativeEvent,
|
||||
nativeEventTarget) {
|
||||
if (isStartish(topLevelType)) {
|
||||
trackedTouchCount += 1;
|
||||
} else if (isEndish(topLevelType)) {
|
||||
@@ -499,10 +505,14 @@ var ResponderEventPlugin = {
|
||||
);
|
||||
}
|
||||
|
||||
ResponderTouchHistoryStore.recordTouchTrack(topLevelType, nativeEvent);
|
||||
ResponderTouchHistoryStore.recordTouchTrack(topLevelType, nativeEvent, nativeEventTarget);
|
||||
|
||||
var extracted = canTriggerTransfer(topLevelType, topLevelTargetID) ?
|
||||
setResponderAndExtractTransfer(topLevelType, topLevelTargetID, nativeEvent) :
|
||||
setResponderAndExtractTransfer(
|
||||
topLevelType,
|
||||
topLevelTargetID,
|
||||
nativeEvent,
|
||||
nativeEventTarget) :
|
||||
null;
|
||||
// Responder may or may not have transfered on a new touch start/move.
|
||||
// Regardless, whoever is the responder after any potential transfer, we
|
||||
@@ -525,7 +535,12 @@ var ResponderEventPlugin = {
|
||||
|
||||
if (incrementalTouch) {
|
||||
var gesture =
|
||||
ResponderSyntheticEvent.getPooled(incrementalTouch, responderID, nativeEvent);
|
||||
ResponderSyntheticEvent.getPooled(
|
||||
incrementalTouch,
|
||||
responderID,
|
||||
nativeEvent,
|
||||
nativeEventTarget
|
||||
);
|
||||
gesture.touchHistory = ResponderTouchHistoryStore.touchHistory;
|
||||
EventPropagators.accumulateDirectDispatches(gesture);
|
||||
extracted = accumulate(extracted, gesture);
|
||||
@@ -545,7 +560,7 @@ var ResponderEventPlugin = {
|
||||
null;
|
||||
if (finalTouch) {
|
||||
var finalEvent =
|
||||
ResponderSyntheticEvent.getPooled(finalTouch, responderID, nativeEvent);
|
||||
ResponderSyntheticEvent.getPooled(finalTouch, responderID, nativeEvent, nativeEventTarget);
|
||||
finalEvent.touchHistory = ResponderTouchHistoryStore.touchHistory;
|
||||
EventPropagators.accumulateDirectDispatches(finalEvent);
|
||||
extracted = accumulate(extracted, finalEvent);
|
||||
|
||||
@@ -31,8 +31,8 @@ var ResponderEventInterface = {
|
||||
* @param {object} nativeEvent Native event.
|
||||
* @extends {SyntheticEvent}
|
||||
*/
|
||||
function ResponderSyntheticEvent(dispatchConfig, dispatchMarker, nativeEvent) {
|
||||
SyntheticEvent.call(this, dispatchConfig, dispatchMarker, nativeEvent);
|
||||
function ResponderSyntheticEvent(dispatchConfig, dispatchMarker, nativeEvent, nativeEventTarget) {
|
||||
SyntheticEvent.call(this, dispatchConfig, dispatchMarker, nativeEvent, nativeEventTarget);
|
||||
}
|
||||
|
||||
SyntheticEvent.augmentClass(ResponderSyntheticEvent, ResponderEventInterface);
|
||||
|
||||
@@ -67,7 +67,7 @@ var antiSubsequence = function(arr, indices) {
|
||||
* @param allTouchHandles
|
||||
*/
|
||||
var _touchConfig =
|
||||
function(topType, targetNodeHandle, allTouchHandles, changedIndices) {
|
||||
function(topType, targetNodeHandle, allTouchHandles, changedIndices, eventTarget) {
|
||||
var allTouchObjects = allTouchHandles.map(touch);
|
||||
var changedTouchObjects = subsequence(allTouchObjects, changedIndices);
|
||||
var activeTouchObjects =
|
||||
@@ -112,7 +112,8 @@ var startConfig = function(nodeHandle, allTouchHandles, changedIndices) {
|
||||
topLevelTypes.topTouchStart,
|
||||
nodeHandle,
|
||||
allTouchHandles,
|
||||
changedIndices
|
||||
changedIndices,
|
||||
nodeHandle
|
||||
);
|
||||
};
|
||||
|
||||
@@ -124,7 +125,8 @@ var moveConfig = function(nodeHandle, allTouchHandles, changedIndices) {
|
||||
topLevelTypes.topTouchMove,
|
||||
nodeHandle,
|
||||
allTouchHandles,
|
||||
changedIndices
|
||||
changedIndices,
|
||||
nodeHandle
|
||||
);
|
||||
};
|
||||
|
||||
@@ -136,7 +138,8 @@ var endConfig = function(nodeHandle, allTouchHandles, changedIndices) {
|
||||
topLevelTypes.topTouchEnd,
|
||||
nodeHandle,
|
||||
allTouchHandles,
|
||||
changedIndices
|
||||
changedIndices,
|
||||
nodeHandle
|
||||
);
|
||||
};
|
||||
|
||||
@@ -290,7 +293,8 @@ var run = function(config, hierarchyConfig, nativeEventConfig) {
|
||||
nativeEventConfig.topLevelType,
|
||||
nativeEventConfig.target,
|
||||
nativeEventConfig.targetID,
|
||||
nativeEventConfig.nativeEvent
|
||||
nativeEventConfig.nativeEvent,
|
||||
nativeEventConfig.target
|
||||
);
|
||||
|
||||
// At this point the negotiation events have been dispatched as part of the
|
||||
|
||||
@@ -33,14 +33,15 @@ var ReactEventEmitterMixin = {
|
||||
topLevelType,
|
||||
topLevelTarget,
|
||||
topLevelTargetID,
|
||||
nativeEvent) {
|
||||
nativeEvent,
|
||||
nativeEventTarget) {
|
||||
var events = EventPluginHub.extractEvents(
|
||||
topLevelType,
|
||||
topLevelTarget,
|
||||
topLevelTargetID,
|
||||
nativeEvent
|
||||
nativeEvent,
|
||||
nativeEventTarget
|
||||
);
|
||||
|
||||
runEventQueueInBatch(events);
|
||||
},
|
||||
};
|
||||
|
||||
@@ -53,6 +53,17 @@ var threeArgumentPooler = function(a1, a2, a3) {
|
||||
}
|
||||
};
|
||||
|
||||
var fourArgumentPooler = function(a1, a2, a3, a4) {
|
||||
var Klass = this;
|
||||
if (Klass.instancePool.length) {
|
||||
var instance = Klass.instancePool.pop();
|
||||
Klass.call(instance, a1, a2, a3, a4);
|
||||
return instance;
|
||||
} else {
|
||||
return new Klass(a1, a2, a3, a4);
|
||||
}
|
||||
};
|
||||
|
||||
var fiveArgumentPooler = function(a1, a2, a3, a4, a5) {
|
||||
var Klass = this;
|
||||
if (Klass.instancePool.length) {
|
||||
@@ -106,6 +117,7 @@ var PooledClass = {
|
||||
oneArgumentPooler: oneArgumentPooler,
|
||||
twoArgumentPooler: twoArgumentPooler,
|
||||
threeArgumentPooler: threeArgumentPooler,
|
||||
fourArgumentPooler: fourArgumentPooler,
|
||||
fiveArgumentPooler: fiveArgumentPooler,
|
||||
};
|
||||
|
||||
|
||||
@@ -450,7 +450,8 @@ function makeSimulator(eventType) {
|
||||
var event = new SyntheticEvent(
|
||||
dispatchConfig,
|
||||
ReactMount.getID(node),
|
||||
fakeNativeEvent
|
||||
fakeNativeEvent,
|
||||
node
|
||||
);
|
||||
assign(event, eventData);
|
||||
|
||||
|
||||
Reference in new issue
Block a user