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

fix(overlay): allow overlay to persist on hover #3706

Merged
merged 4 commits into from
Oct 10, 2023
Merged

fix(overlay): allow overlay to persist on hover #3706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8ea6cd2
fix(overlay): allow overlay to persist on hover
Oct 6, 2023
d455fd3
test(overlay): edit overlay timing test
Oct 6, 2023
d46f854
chore: address comments
Oct 6, 2023
49ddacc
chore: update the right tests, remove unused code
Oct 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
56 changes: 26 additions & 30 deletions packages/overlay/src/Overlay.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ import { PlacementController } from './PlacementController.js';
import styles from './overlay.css.js';

const LONGPRESS_DURATION = 300;
const HOVER_DELAY = 300;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how did you arrive at the 300ms duration? what likelihood is this going to be a tunable value?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great question! And great catch! I actually just picked an arbitrary number. I think I started with 400 and subconsciously changed it to 300 when I put this variable next to the longpress one 😅 I'll circle back on this and put some rationale behind this number and change it if needed!


type LongpressEvent = {
source: 'pointer' | 'keyboard';
Expand Down Expand Up @@ -146,6 +147,7 @@ export class Overlay extends OverlayFeatures {
'null';

private longressTimeout!: ReturnType<typeof setTimeout>;
private hoverTimeout?: ReturnType<typeof setTimeout>;

/**
* The `offset` property accepts either a single number, to
Expand Down Expand Up @@ -561,6 +563,11 @@ export class Overlay extends OverlayFeatures {
this.handlePointerleave,
options
);
this.addEventListener(
'pointerenter',
this.handleOverlayPointerenter,
options
);
this.addEventListener(
'pointerleave',
this.handleOverlayPointerleave,
Expand Down Expand Up @@ -789,52 +796,41 @@ export class Overlay extends OverlayFeatures {
private pointerentered = false;

protected handlePointerenter = (): void => {
if (this.hoverTimeout) {
clearTimeout(this.hoverTimeout);
delete this.hoverTimeout;
}
if (this.disabled) return;
this.open = true;
this.pointerentered = true;
};

protected handlePointerleave = (event: PointerEvent): void => {
if (
this === event.relatedTarget ||
this.contains(event.relatedTarget as Node) ||
[...this.children].find((child) => {
if (child.localName !== 'slot') {
return false;
}
return (child as HTMLSlotElement)
.assignedElements({ flatten: true })
.find((el) => {
return (
el === event.relatedTarget ||
el.contains(event.relatedTarget as Node)
);
});
})
) {
return;
// set a timeout once the pointer enters and the overlay is shown
// give the user time to enter the overlay

protected handleOverlayPointerenter = (): void => {
if (this.hoverTimeout) {
clearTimeout(this.hoverTimeout);
delete this.hoverTimeout;
}
};

protected handlePointerleave = (): void => {
this.doPointerleave();
};

protected handleOverlayPointerleave = (event: PointerEvent): void => {
if (
this.triggerElement === event.relatedTarget ||
(this.hasNonVirtualTrigger &&
(this.triggerElement as HTMLElement).contains(
event.relatedTarget as Node
))
) {
return;
}
protected handleOverlayPointerleave = (): void => {
this.doPointerleave();
};

protected doPointerleave(): void {
this.pointerentered = false;
const triggerElement = this.triggerElement as HTMLElement;
if (this.focusedin && triggerElement.matches(':focus-visible')) return;
this.open = false;

this.hoverTimeout = setTimeout(() => {
this.open = false;
}, HOVER_DELAY);
}

protected handleLongpress = (): void => {
Expand Down
20 changes: 18 additions & 2 deletions packages/overlay/test/overlay-trigger-hover.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,17 +120,33 @@ describe('Overlay Trigger - Hover', () => {
await nextFrame();
await nextFrame();
expect(tooltip.open).to.be.true;

button.dispatchEvent(
new MouseEvent('pointerleave', {
relatedTarget: tooltip,
bubbles: true,
composed: true,
})
);
await nextFrame();

button.dispatchEvent(
new MouseEvent('pointerenter', {
bubbles: true,
composed: true,
})
);
await nextFrame();

tooltip.dispatchEvent(
new MouseEvent('pointerleave', {
relatedTarget: button,
bubbles: true,
composed: true,
})
);
await nextFrame();

button.dispatchEvent(
new MouseEvent('pointerenter', {
bubbles: true,
composed: true,
})
Expand Down
6 changes: 4 additions & 2 deletions packages/overlay/test/overlay.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,7 +771,7 @@ describe('Overlay - timing', () => {
it('manages multiple modals in a row without preventing them from closing', async () => {
const test = await fixture<HTMLDivElement>(html`
<div>
<overlay-trigger id="test-1" placement="right">
<overlay-trigger id="test-1" placement="bottom">
<sp-button slot="trigger">Trigger 1</sp-button>
<sp-popover slot="hover-content">
<p>Hover contentent for "Trigger 1".</p>
Expand Down Expand Up @@ -813,7 +813,7 @@ describe('Overlay - timing', () => {
boundingRectTrigger2.top + boundingRectTrigger2.height / 4,
];

// Move poitner over "Trigger 1", should _start_ to open "hover" content.
// Move pointer over "Trigger 1", should _start_ to open "hover" content.
await sendMouse({
steps: [
{
Expand All @@ -824,6 +824,7 @@ describe('Overlay - timing', () => {
});
await nextFrame();
await nextFrame();

// Move pointer out of "Trigger 1", should _start_ to close "hover" content.
await sendMouse({
steps: [
Expand All @@ -846,6 +847,7 @@ describe('Overlay - timing', () => {
});
await nextFrame();
await nextFrame();

const opened = oneEvent(trigger2, 'sp-opened');
// Click "Trigger 2", should _start_ to open "click" content and _start_ to close "hover" content.
await sendMouse({
Expand Down