Skip to content

Commit a65fd4d

Browse files
authored
fix: close overflow avatar overlay on detach (#4724)
1 parent 17810e6 commit a65fd4d

4 files changed

Lines changed: 26 additions & 23 deletions

File tree

‎packages/avatar-group/src/vaadin-avatar-group.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,13 @@ class AvatarGroup extends ResizeMixin(ElementMixin(ThemableMixin(PolymerElement)
298298
});
299299
}
300300

301+
/** @protected */
302+
disconnectedCallback() {
303+
super.disconnectedCallback();
304+
305+
this._opened = false;
306+
}
307+
301308
/**
302309
* @return {!Array<!HTMLElement>}
303310
* @protected

‎packages/avatar-group/test/avatar-group.test.js‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
import { expect } from '@esm-bundle/chai';
2-
import { enterKeyDown, escKeyDown, fixtureSync, nextRender, spaceKeyDown, tabKeyDown } from '@vaadin/testing-helpers';
2+
import {
3+
enterKeyDown,
4+
escKeyDown,
5+
fixtureSync,
6+
nextRender,
7+
oneEvent,
8+
spaceKeyDown,
9+
tabKeyDown,
10+
} from '@vaadin/testing-helpers';
311
import sinon from 'sinon';
412
import '../vaadin-avatar-group.js';
513
import { afterNextRender } from '@polymer/polymer/lib/utils/render-status.js';
@@ -90,11 +98,9 @@ describe('avatar-group', () => {
9098
expect(overlay.textContent).to.equal([items[2].name, items[3].abbr, 'anonymous'].join('\n'));
9199
});
92100

93-
it('should show overlay on overflow avatar click', () => {
101+
it('should show overflow avatar when maxItemsVisible is less than items count', () => {
94102
const overflow = group.$.overflow;
95-
overflow.click();
96103
expect(overflow.hasAttribute('hidden')).to.be.false;
97-
group.$.overlay.close();
98104
});
99105

100106
it('should show at least two avatars if maxItemsVisible is below 2', async () => {
@@ -186,10 +192,6 @@ describe('avatar-group', () => {
186192
overflow = group.$.overflow;
187193
});
188194

189-
afterEach(() => {
190-
overlay.close();
191-
});
192-
193195
it('should render avatars to fit width on resize', async () => {
194196
group.style.width = '110px';
195197
await onceResized(group);
@@ -273,16 +275,9 @@ describe('avatar-group', () => {
273275
overflow = group.$.overflow;
274276
});
275277

276-
afterEach(() => {
277-
overlay.close();
278-
});
279-
280-
it('should open overlay on overflow avatar click', (done) => {
281-
overlay.addEventListener('vaadin-overlay-open', () => {
282-
expect(overlay.opened).to.be.true;
283-
done();
284-
});
278+
it('should open overlay on overflow avatar click', () => {
285279
overflow.click();
280+
expect(overlay.opened).to.be.true;
286281
});
287282

288283
it('should open overlay on overflow avatar Enter', () => {
@@ -295,6 +290,13 @@ describe('avatar-group', () => {
295290
expect(overlay.opened).to.be.true;
296291
});
297292

293+
it('should close overlay on avatar group detach', async () => {
294+
overflow.click();
295+
await oneEvent(overlay, 'vaadin-overlay-open');
296+
group.remove();
297+
expect(overlay.opened).to.be.false;
298+
});
299+
298300
it('should render list-box with items in the overlay', (done) => {
299301
overlay.addEventListener('vaadin-overlay-open', () => {
300302
const list = overlay.content.querySelector('vaadin-avatar-group-list-box');
@@ -533,10 +535,6 @@ describe('avatar-group', () => {
533535
overflow = group.$.overflow;
534536
});
535537

536-
afterEach(() => {
537-
overlay.close();
538-
});
539-
540538
it('should set aria-expanded="false" on the overflow avatar', () => {
541539
expect(overflow.getAttribute('aria-expanded')).to.equal('false');
542540
});

‎packages/avatar-group/test/visual/lumo/avatar-group.test.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ describe('avatar-group', () => {
7373
it('avatar-size', async () => {
7474
element.items = [{ name: 'Abc Def' }, { name: 'Ghi Jkl' }, { name: 'Mno Pqr' }, { name: 'Stu Vwx' }];
7575
element.style.setProperty('--vaadin-avatar-size', '45px');
76-
element.$.overflow.click();
7776
await visualDiff(div, 'avatar-size');
7877
});
7978
});

‎packages/avatar-group/test/visual/material/avatar-group.test.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ describe('avatar-group', () => {
7373
it('avatar-size', async () => {
7474
element.items = [{ name: 'Abc Def' }, { name: 'Ghi Jkl' }, { name: 'Mno Pqr' }, { name: 'Stu Vwx' }];
7575
element.style.setProperty('--vaadin-avatar-size', '45px');
76-
element.$.overflow.click();
7776
await visualDiff(div, 'avatar-size');
7877
});
7978
});

0 commit comments

Comments
 (0)