Skip to content

Experimental Event API: Add Hover onUnmount support #15394

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 4 commits into from
Apr 12, 2019
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
72 changes: 59 additions & 13 deletions packages/react-events/src/Hover.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ type HoverProps = {
};

type HoverState = {
hoverTarget: null | Element | Document,
isActiveHovered: boolean,
isHovered: boolean,
isInHitSlop: boolean,
Expand Down Expand Up @@ -66,7 +67,6 @@ function createHoverEvent(
}

function dispatchHoverChangeEvent(
event: ReactResponderEvent,
context: ReactResponderContext,
props: HoverProps,
state: HoverState,
Expand All @@ -75,7 +75,10 @@ function dispatchHoverChangeEvent(
const listener = () => {
props.onHoverChange(bool);
};
const syntheticEvent = createHoverEvent('hoverchange', event.target);
const syntheticEvent = createHoverEvent(
'hoverchange',
((state.hoverTarget: any): Element | Document),
);
context.dispatchEvent(syntheticEvent, listener, {discrete: true});
}

Expand All @@ -85,9 +88,14 @@ function dispatchHoverStartEvents(
props: HoverProps,
state: HoverState,
): void {
const {nativeEvent, target} = event;
if (context.isTargetWithinEventComponent((nativeEvent: any).relatedTarget)) {
return;
const target = state.hoverTarget;
if (event !== null) {
const {nativeEvent} = event;
if (
context.isTargetWithinEventComponent((nativeEvent: any).relatedTarget)
) {
return;
}
}

state.isHovered = true;
Expand All @@ -101,13 +109,16 @@ function dispatchHoverStartEvents(
state.isActiveHovered = true;

if (props.onHoverStart) {
const syntheticEvent = createHoverEvent('hoverstart', target);
const syntheticEvent = createHoverEvent(
'hoverstart',
((target: any): Element | Document),
);
context.dispatchEvent(syntheticEvent, props.onHoverStart, {
discrete: true,
});
}
if (props.onHoverChange) {
dispatchHoverChangeEvent(event, context, props, state);
dispatchHoverChangeEvent(context, props, state);
}
};

Expand All @@ -129,14 +140,19 @@ function dispatchHoverStartEvents(
}

function dispatchHoverEndEvents(
event: ReactResponderEvent,
event: null | ReactResponderEvent,
context: ReactResponderContext,
props: HoverProps,
state: HoverState,
) {
const {nativeEvent, target} = event;
if (context.isTargetWithinEventComponent((nativeEvent: any).relatedTarget)) {
return;
const target = state.hoverTarget;
if (event !== null) {
const {nativeEvent} = event;
if (
context.isTargetWithinEventComponent((nativeEvent: any).relatedTarget)
) {
return;
}
}

state.isHovered = false;
Expand All @@ -150,11 +166,14 @@ function dispatchHoverEndEvents(
state.isActiveHovered = false;

if (props.onHoverEnd) {
const syntheticEvent = createHoverEvent('hoverend', target);
const syntheticEvent = createHoverEvent(
'hoverend',
((target: any): Element | Document),
);
context.dispatchEvent(syntheticEvent, props.onHoverEnd, {discrete: true});
}
if (props.onHoverChange) {
dispatchHoverChangeEvent(event, context, props, state);
dispatchHoverChangeEvent(context, props, state);
}
};

Expand All @@ -179,6 +198,16 @@ function calculateDelayMS(delay: ?number, min = 0, fallback = 0) {
return Math.max(min, maybeNumber != null ? maybeNumber : fallback);
}

function unmountResponder(
context: ReactResponderContext,
props: HoverProps,
state: HoverState,
): void {
if (state.isHovered) {
dispatchHoverEndEvents(null, context, props, state);
}
}

const HoverResponder = {
targetEventTypes,
createInitialState() {
Expand Down Expand Up @@ -231,6 +260,7 @@ const HoverResponder = {
state.isInHitSlop = true;
return;
}
state.hoverTarget = target;
dispatchHoverStartEvents(event, context, props, state);
}
break;
Expand All @@ -241,6 +271,7 @@ const HoverResponder = {
dispatchHoverEndEvents(event, context, props, state);
}
state.isInHitSlop = false;
state.hoverTarget = null;
state.isTouched = false;
state.skipMouseAfterPointer = false;
break;
Expand Down Expand Up @@ -293,12 +324,27 @@ const HoverResponder = {
case 'pointercancel': {
if (state.isHovered && !state.isTouched) {
dispatchHoverEndEvents(event, context, props, state);
state.hoverTarget = null;
state.isTouched = false;
}
break;
}
}
},
onUnmount(
context: ReactResponderContext,
props: HoverProps,
state: HoverState,
) {
unmountResponder(context, props, state);
},
onOwnershipChange(
context: ReactResponderContext,
props: HoverProps,
state: HoverState,
) {
unmountResponder(context, props, state);
},
};

export default {
Expand Down
1 change: 0 additions & 1 deletion packages/react-events/src/Press.js
Original file line number Diff line number Diff line change
Expand Up @@ -699,7 +699,6 @@ const PressResponder = {
) {
unmountResponder(context, props, state);
},
// TODO This method doesn't work as of yet
onOwnershipChange(
context: ReactResponderContext,
props: PressProps,
Expand Down