Skip to content

Commit 7d29e8b

Browse files
authored
fix: make sure manual tooltip closes on detach (#4653)
1 parent 247920e commit 7d29e8b

2 files changed

Lines changed: 38 additions & 3 deletions

File tree

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

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class Tooltip extends ThemePropertyMixin(ElementMixin(PolymerElement)) {
8282
role="tooltip"
8383
renderer="[[_renderer]]"
8484
theme$="[[_theme]]"
85-
opened="[[__computeOpened(manual, opened, _autoOpened)]]"
85+
opened="[[__computeOpened(manual, opened, _autoOpened, _isConnected)]]"
8686
position-target="[[target]]"
8787
position="[[position]]"
8888
no-horizontal-overlap$="[[__computeNoHorizontalOverlap(position)]]"
@@ -236,6 +236,11 @@ class Tooltip extends ThemePropertyMixin(ElementMixin(PolymerElement)) {
236236
type: Boolean,
237237
value: false,
238238
},
239+
240+
/** @private */
241+
_isConnected: {
242+
type: Boolean,
243+
},
239244
};
240245
}
241246

@@ -294,13 +299,21 @@ class Tooltip extends ThemePropertyMixin(ElementMixin(PolymerElement)) {
294299
);
295300
}
296301

302+
/** @protected */
303+
connectedCallback() {
304+
super.connectedCallback();
305+
306+
this._isConnected = true;
307+
}
308+
297309
/** @protected */
298310
disconnectedCallback() {
299311
super.disconnectedCallback();
300312

301313
if (this._autoOpened) {
302314
this._close(true);
303315
}
316+
this._isConnected = false;
304317
}
305318

306319
/** @private */
@@ -324,8 +337,8 @@ class Tooltip extends ThemePropertyMixin(ElementMixin(PolymerElement)) {
324337
}
325338

326339
/** @private */
327-
__computeOpened(manual, opened, autoOpened) {
328-
return manual ? opened : autoOpened;
340+
__computeOpened(manual, opened, autoOpened, connected) {
341+
return connected && (manual ? opened : autoOpened);
329342
}
330343

331344
/** @private */

‎packages/tooltip/test/tooltip.test.js‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -634,6 +634,28 @@ describe('vaadin-tooltip', () => {
634634
tooltip.opened = false;
635635
expect(overlay.opened).to.be.false;
636636
});
637+
638+
it('should close overlay when disconnected', () => {
639+
tooltip.opened = true;
640+
641+
tooltip.remove();
642+
expect(overlay.opened).to.be.false;
643+
});
644+
645+
it('should re-open overlay when reconnected', () => {
646+
tooltip.opened = true;
647+
648+
tooltip.remove();
649+
document.body.append(tooltip);
650+
expect(overlay.opened).to.be.true;
651+
});
652+
653+
it('should remain open when moved to another container', () => {
654+
tooltip.opened = true;
655+
656+
document.body.append(tooltip);
657+
expect(overlay.opened).to.be.true;
658+
});
637659
});
638660
});
639661

0 commit comments

Comments
 (0)