Skip to content

Fix event target for input change events. Fixes #4288 #4311

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

Merged
merged 1 commit into from
Jul 9, 2015
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
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
26 changes: 26 additions & 0 deletions src/renderers/dom/client/wrappers/__tests__/ReactDOMInput-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@ var emptyFunction = require('emptyFunction');
var mocks = require('mocks');

describe('ReactDOMInput', function() {
var EventConstants;
var React;
var ReactLink;
var ReactTestUtils;

beforeEach(function() {
require('mock-modules').dumpCache();
EventConstants = require('EventConstants');
React = require('React');
ReactLink = require('ReactLink');
ReactTestUtils = require('ReactTestUtils');
Expand Down Expand Up @@ -134,6 +136,30 @@ describe('ReactDOMInput', function() {
expect(node.value).toBe('0');
});

it('should have the correct target value', function() {
var handled = false;
var handler = function(event) {
expect(event.target.nodeName).toBe('INPUT');
handled = true;
};
var stub = <input type="text" value={0} onChange={handler} />;
var container = document.createElement('div');
var node = React.render(stub, container);

node.value = 'giraffe';

var fakeNativeEvent = new function() {};
fakeNativeEvent.target = node;
fakeNativeEvent.path = [node, container];
ReactTestUtils.simulateNativeEventOnNode(
EventConstants.topLevelTypes.topInput,
node,
fakeNativeEvent
);

expect(handled).toBe(true);
});

it('should not set a value for submit buttons unnecessarily', function() {
var stub = <input type="submit" />;
stub = ReactTestUtils.renderIntoDocument(stub);
Expand Down