Skip to content

Fix longpress in experimental Press event module #15246

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
merged 1 commit into from
Mar 29, 2019
Merged

Fix longpress in experimental Press event module #15246

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
52 changes: 18 additions & 34 deletions packages/react-events/src/Press.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,15 @@ function dispatchPressInEvents(
true,
);
}
if (props.onLongPress) {
const longPressEventListener = e => {
props.onLongPress(e);
if (e.nativeEvent.defaultPrevented) {
state.defaultPrevented = true;
}
};
dispatchPressEvent(context, 'longpress', state, longPressEventListener);
}
}, longPressDelay);
}
}
Expand Down Expand Up @@ -112,17 +121,6 @@ function dispatchPressOutEvents(
true,
);
}
if (props.onLongPressChange && state.isLongPressed) {
const longPressChangeEventListener = () => {
props.onLongPressChange(false);
};
context.dispatchEvent(
'longpresschange',
longPressChangeEventListener,
state.pressTarget,
true,
);
}
}

function isAnchorTagElement(eventTarget: EventTarget): boolean {
Expand Down Expand Up @@ -220,14 +218,10 @@ const PressResponder = {
target !== null &&
context.isTargetWithinEventComponent(target)
) {
if (state.isLongPressed && props.onLongPress) {
dispatchPressEvent(
context,
'longpress',
state,
props.onLongPress,
);
} else if (props.onPress) {
if (
props.onPress &&
!(state.isLongPressed && props.longPressCancelsPress)
) {
dispatchPressEvent(context, 'press', state, props.onPress);
}
}
Expand Down Expand Up @@ -256,7 +250,7 @@ const PressResponder = {
) {
return;
}
// Ignore right-clicks
// Ignore middle- and right-clicks
if (event.button === 2 || event.button === 1) {
return;
}
Expand All @@ -281,20 +275,10 @@ const PressResponder = {
(props.onPress || props.onLongPress)
) {
if (context.isTargetWithinElement(eventTarget, state.pressTarget)) {
if (state.isLongPressed && props.onLongPress) {
const longPressEventListener = e => {
props.onLongPress(e);
if (e.nativeEvent.defaultPrevented) {
state.defaultPrevented = true;
}
};
dispatchPressEvent(
context,
'longpress',
state,
longPressEventListener,
);
} else if (props.onPress) {
if (
props.onPress &&
!(state.isLongPressed && props.longPressCancelsPress)
) {
const pressEventListener = (e, key) => {
props.onPress(e, key);
if (e.nativeEvent.defaultPrevented) {
Expand Down