Skip to content

Commit a32659a

Browse files
authored
fix: allow popover to close while tooltip is open (#9397)
1 parent fb56518 commit a32659a

3 files changed

Lines changed: 70 additions & 2 deletions

File tree

‎packages/overlay/src/vaadin-overlay-stack-mixin.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,14 @@ const getOverlayInstances = () => getAttachedInstances().filter((el) => el.$.ove
2323
/**
2424
* Returns true if the overlay is the last one in the opened overlays stack.
2525
* @param {HTMLElement} overlay
26+
* @param {function(HTMLElement): boolean} filter
2627
* @return {boolean}
2728
* @protected
2829
*/
29-
export const isLastOverlay = (overlay) => overlay === getOverlayInstances().pop();
30+
export const isLastOverlay = (overlay, filter = (_overlay) => true) => {
31+
const filteredOverlays = getOverlayInstances().filter(filter);
32+
return overlay === filteredOverlays.pop();
33+
};
3034

3135
const overlayMap = new WeakMap();
3236

‎packages/popover/src/vaadin-popover.js‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
1717
import { OverlayClassMixin } from '@vaadin/component-base/src/overlay-class-mixin.js';
1818
import { PolylitMixin } from '@vaadin/component-base/src/polylit-mixin.js';
1919
import { generateUniqueId } from '@vaadin/component-base/src/unique-id-utils.js';
20-
import { isLastOverlay } from '@vaadin/overlay/src/vaadin-overlay-stack-mixin.js';
20+
import { isLastOverlay as isLastOverlayBase } from '@vaadin/overlay/src/vaadin-overlay-stack-mixin.js';
2121
import { CSSInjectionMixin } from '@vaadin/vaadin-themable-mixin/css-injection-mixin.js';
2222
import { ThemePropertyMixin } from '@vaadin/vaadin-themable-mixin/vaadin-theme-property-mixin.js';
2323
import { PopoverPositionMixin } from './vaadin-popover-position-mixin.js';
@@ -149,6 +149,18 @@ class PopoverOpenedStateController {
149149
}
150150
}
151151

152+
/**
153+
* Returns true if the popover overlay is the last one in the opened overlays stack, ignoring tooltips.
154+
* @param {HTMLElement} overlay
155+
* @return {boolean}
156+
* @protected
157+
*/
158+
const isLastOverlay = (overlay) => {
159+
// Ignore tooltips, popovers should still close when a tooltip is present
160+
const filter = (o) => o.localName !== 'vaadin-tooltip-overlay';
161+
return isLastOverlayBase(overlay, filter);
162+
};
163+
152164
/**
153165
* `<vaadin-popover>` is a Web Component for creating overlays
154166
* that are positioned next to specified DOM element (target).
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
import { expect } from '@vaadin/chai-plugins';
2+
import { aTimeout, fixtureSync, nextRender } from '@vaadin/testing-helpers';
3+
import './not-animated-styles.js';
4+
import '@vaadin/popover/src/vaadin-popover.js';
5+
import '@vaadin/tooltip/src/vaadin-tooltip.js';
6+
import { mouseenter, mouseleave } from '@vaadin/popover/test/helpers';
7+
8+
describe('popover and tooltip', () => {
9+
let target, popover, popoverOverlay, tooltip, tooltipOverlay;
10+
11+
beforeEach(async () => {
12+
const wrapper = fixtureSync(`
13+
<div>
14+
<button id="target">Target</button>
15+
<vaadin-popover></vaadin-popover>
16+
<vaadin-tooltip text="Tooltip"></vaadin-popover>
17+
</div>
18+
`);
19+
target = wrapper.querySelector('#target');
20+
popover = wrapper.querySelector('vaadin-popover');
21+
popoverOverlay = popover.shadowRoot.querySelector('vaadin-popover-overlay');
22+
tooltip = wrapper.querySelector('vaadin-tooltip');
23+
tooltipOverlay = tooltip.shadowRoot.querySelector('vaadin-tooltip-overlay');
24+
25+
popover.trigger = ['hover'];
26+
popover.target = target;
27+
popover.hoverDelay = 0;
28+
popover.hideDelay = 0;
29+
30+
tooltip.target = target;
31+
tooltip.hoverDelay = 1;
32+
tooltip.hideDelay = 1;
33+
34+
await nextRender();
35+
});
36+
37+
it('should close popover on mouse leave while tooltip is opened', async () => {
38+
mouseenter(target);
39+
40+
await aTimeout(2);
41+
42+
expect(popoverOverlay.opened).to.be.true;
43+
expect(tooltipOverlay.opened).to.be.true;
44+
45+
mouseleave(target);
46+
47+
await aTimeout(2);
48+
49+
expect(popoverOverlay.opened).to.be.false;
50+
expect(tooltipOverlay.opened).to.be.false;
51+
});
52+
});

0 commit comments

Comments
 (0)