Skip to content
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
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,38 @@ describe('ReactBrowserEventEmitter', function() {
}
});

it('should set target on change plugin events', function() {
ReactBrowserEventEmitter.putListener(
getID(CHILD),
ON_CHANGE_KEY,
function(event) {
recordID(getID(CHILD));
expect(event.target).toBe(CHILD);
}
);
ReactBrowserEventEmitter.putListener(
getID(PARENT),
ON_CHANGE_KEY,
function(event) {
recordID(getID(PARENT));
expect(event.target).toBe(CHILD);
}
);
ReactBrowserEventEmitter.putListener(
getID(GRANDPARENT),
ON_CHANGE_KEY,
function(event) {
recordID(getID(GRANDPARENT));
expect(event.target).toBe(CHILD);
}
);
ReactTestUtils.SimulateNative.input(CHILD);
expect(idCallOrder.length).toBe(3);
expect(idCallOrder[0]).toBe(getID(CHILD));
expect(idCallOrder[1]).toBe(getID(CHILD));
expect(idCallOrder[2]).toBe(getID(CHILD));
});

it('should bubble onTouchTap', function() {
ReactBrowserEventEmitter.putListener(
getID(CHILD),
Expand Down
21 changes: 14 additions & 7 deletions src/renderers/dom/client/eventPlugins/BeforeInputEventPlugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,8 @@ function extractCompositionEvent(
topLevelType,
topLevelTarget,
topLevelTargetID,
nativeEvent
nativeEvent,
nativeEventTarget
) {
var eventType;
var fallbackData;
Expand Down Expand Up @@ -271,7 +272,8 @@ function extractCompositionEvent(
var event = SyntheticCompositionEvent.getPooled(
eventType,
topLevelTargetID,
nativeEvent
nativeEvent,
nativeEventTarget
);

if (fallbackData) {
Expand Down Expand Up @@ -411,7 +413,8 @@ function extractBeforeInputEvent(
topLevelType,
topLevelTarget,
topLevelTargetID,
nativeEvent
nativeEvent,
nativeEventTarget
) {
var chars;

Expand All @@ -430,7 +433,8 @@ function extractBeforeInputEvent(
var event = SyntheticInputEvent.getPooled(
eventTypes.beforeInput,
topLevelTargetID,
nativeEvent
nativeEvent,
nativeEventTarget
);

event.data = chars;
Expand Down Expand Up @@ -472,20 +476,23 @@ var BeforeInputEventPlugin = {
topLevelType,
topLevelTarget,
topLevelTargetID,
nativeEvent
nativeEvent,
nativeEventTarget
) {
return [
extractCompositionEvent(
topLevelType,
topLevelTarget,
topLevelTargetID,
nativeEvent
nativeEvent,
nativeEventTarget
),
extractBeforeInputEvent(
topLevelType,
topLevelTarget,
topLevelTargetID,
nativeEvent
nativeEvent,
nativeEventTarget
),
];
},
Expand Down
9 changes: 6 additions & 3 deletions src/renderers/dom/client/eventPlugins/ChangeEventPlugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ function manualDispatchChangeEvent(nativeEvent) {
var event = SyntheticEvent.getPooled(
eventTypes.change,
activeElementID,
nativeEvent
nativeEvent,
nativeEvent.target
);
EventPropagators.accumulateTwoPhaseDispatches(event);

Expand Down Expand Up @@ -330,7 +331,8 @@ var ChangeEventPlugin = {
topLevelType,
topLevelTarget,
topLevelTargetID,
nativeEvent) {
nativeEvent,
nativeEventTarget) {

var getTargetIDFunc, handleEventFunc;
if (shouldUseChangeEvent(topLevelTarget)) {
Expand Down Expand Up @@ -360,7 +362,8 @@ var ChangeEventPlugin = {
var event = SyntheticEvent.getPooled(
eventTypes.change,
targetID,
nativeEvent
nativeEvent,
nativeEventTarget
);
event.type = 'change';
EventPropagators.accumulateTwoPhaseDispatches(event);
Expand Down