Skip to content

[Flare] Do not block mouse presses on scroll #16033

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

Merged
trueadm merged 2 commits into from
Jul 2, 2019
Merged

[Flare] Do not block mouse presses on scroll #16033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c35a896
[Flare] Do not block mouse presses on scroll
trueadm Jul 2, 2019
0ae5dcc
Fix typo
trueadm Jul 2, 2019
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
9 changes: 7 additions & 2 deletions packages/react-events/src/dom/Press.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,6 +797,7 @@ const PressResponder: ReactDOMEventResponder = {
const nativeEvent: any = event.nativeEvent;
const isPressed = state.isPressed;
const activePointerId = state.activePointerId;
const previousPointerType = state.pointerType;

handleStopPropagation(props, context, nativeEvent);
switch (type) {
Expand All @@ -807,7 +808,7 @@ const PressResponder: ReactDOMEventResponder = {
let touchEvent;
// Ignore emulated events (pointermove will dispatch touch and mouse events)
// Ignore pointermove events during a keyboard press.
if (state.pointerType !== pointerType) {
if (previousPointerType !== pointerType) {
return;
}
if (type === 'pointermove' && activePointerId !== pointerId) {
Expand Down Expand Up @@ -976,14 +977,18 @@ const PressResponder: ReactDOMEventResponder = {

case 'click': {
// "keyup" occurs after "click"
if (state.pointerType !== 'keyboard') {
if (previousPointerType !== 'keyboard') {
removeRootEventTypes(context, state);
}
break;
}

// CANCEL
case 'scroll': {
// We ignore incoming scroll events when using mouse events
if (previousPointerType === 'mouse') {
return;
}
const pressTarget = state.pressTarget;
const scrollTarget = nativeEvent.target;
const doc = context.getActiveDocument();
Expand Down
20 changes: 18 additions & 2 deletions packages/react-events/src/dom/__tests__/Press-test.internal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2445,15 +2445,31 @@ describe('Event responder: Press', () => {
);
ReactDOM.render(element, container);

ref.current.dispatchEvent(createEvent('pointerdown'));
// Should cancel for non-mouse events
ref.current.dispatchEvent(
createEvent('pointerdown', {
pointerType: 'touch',
}),
);
ref.current.dispatchEvent(createEvent('scroll'));
expect(onPressEnd).toHaveBeenCalledTimes(1);
jest.runAllTimers();
expect(onLongPress).not.toBeCalled();

onLongPress.mockReset();
onPressEnd.mockReset();

// Should not cancel for mouse events
ref.current.dispatchEvent(
createEvent('pointerdown', {
pointerType: 'mouse',
}),
);
ref.current.dispatchEvent(createEvent('scroll'));
expect(onPressEnd).toHaveBeenCalledTimes(0);
jest.runAllTimers();

onLongPress.mockReset();

// When pointer events are supported
ref.current.dispatchEvent(
createEvent('pointerdown', {
Expand Down