Skip to content

Commit

Permalink
adding check for mousemove (#13090)
Browse files Browse the repository at this point in the history
* adding check for mousemove

* adding unit test for SyntheticMouseEvent

* changing test to start with 2, removing comments
  • Loading branch information
jasonwilliams authored and gaearon committed Jun 24, 2018
1 parent c35a1e7 commit 6a530e3
Show file tree
Hide file tree
Showing 2 changed files with 82 additions and 2 deletions.
4 changes: 2 additions & 2 deletions packages/react-dom/src/events/SyntheticMouseEvent.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const SyntheticMouseEvent = SyntheticUIEvent.extend({
return 0;
}

return event.screenX - screenX;
return event.type === 'mousemove' ? event.screenX - screenX : 0;
},
movementY: function(event) {
if ('movementY' in event) {
Expand All @@ -68,7 +68,7 @@ const SyntheticMouseEvent = SyntheticUIEvent.extend({
return 0;
}

return event.screenY - screenY;
return event.type === 'mousemove' ? event.screenY - screenY : 0;
},
});

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
/**
* Copyright (c) 2013-present, Facebook, Inc.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @emails react-core
*/

'use strict';

let React;
let ReactDOM;

describe('SyntheticMouseEvent', () => {
let container;

beforeEach(() => {
React = require('react');
ReactDOM = require('react-dom');

// The container has to be attached for events to fire.
container = document.createElement('div');
document.body.appendChild(container);
});

afterEach(() => {
document.body.removeChild(container);
container = null;
});

it('should only use values from movementX/Y when event type is mousemove', () => {
const events = [];
const onMouseMove = event => {
events.push(event.movementX);
};

const onMouseDown = event => {
events.push(event.movementX);
};

const node = ReactDOM.render(
<div onMouseMove={onMouseMove} onMouseDown={onMouseDown} />,
container,
);

let event = new MouseEvent('mousemove', {
relatedTarget: null,
bubbles: true,
screenX: 2,
screenY: 2,
});

node.dispatchEvent(event);

event = new MouseEvent('mousemove', {
relatedTarget: null,
bubbles: true,
screenX: 8,
screenY: 8,
});

node.dispatchEvent(event);

// Now trigger a mousedown event to see if movementX has changed back to 0
event = new MouseEvent('mousedown', {
relatedTarget: null,
bubbles: true,
screenX: 25,
screenY: 65,
});

node.dispatchEvent(event);

expect(events.length).toBe(3);
expect(events[0]).toBe(0);
expect(events[1]).toBe(6);
expect(events[2]).toBe(0); // mousedown event should have movementX at 0
});
});

0 comments on commit 6a530e3

Please sign in to comment.