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.

Sign up for GitHub

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

Jump to bottom

setting a flag, so that the first movement will have the correct value #13082

Merged
merged 1 commit into from
Jun 20, 2018
Merged

setting a flag, so that the first movement will have the correct value #13082

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 19 additions & 4 deletions packages/react-dom/src/events/SyntheticMouseEvent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@
import SyntheticUIEvent from './SyntheticUIEvent';
import getEventModifierState from './getEventModifierState';

let previousScreenX = null;
let previousScreenY = null;
let previousScreenX = 0;
let previousScreenY = 0;
// Use flags to signal movementX/Y has already been set
let isMovementXSet = false;
let isMovementYSet = false;

/**
* @interface MouseEvent
Expand Down Expand Up @@ -44,7 +47,13 @@ const SyntheticMouseEvent = SyntheticUIEvent.extend({

const screenX = previousScreenX;
previousScreenX = event.screenX;
return screenX ? event.screenX - screenX : 0;

if (!isMovementXSet) {
isMovementXSet = true;
return 0;
}

return event.screenX - screenX;
},
movementY: function(event) {
if ('movementY' in event) {
Expand All @@ -53,7 +62,13 @@ const SyntheticMouseEvent = SyntheticUIEvent.extend({

const screenY = previousScreenY;
previousScreenY = event.screenY;
return screenY ? event.screenY - screenY : 0;

if (!isMovementYSet) {
isMovementYSet = true;
return 0;
}

return event.screenY - screenY;
},
});

Expand Down