Skip to content

Commit ea877c9

Browse files
authored
fix: only release focus if overlay focus-trap is set (#3882)
1 parent d19635a commit ea877c9

2 files changed

Lines changed: 50 additions & 1 deletion

File tree

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,9 @@ class OverlayElement extends ThemableMixin(DirMixin(ControllerMixin(PolymerEleme
563563
this._addGlobalListeners();
564564
}
565565
} else if (wasOpened) {
566-
this.__focusTrapController.releaseFocus();
566+
if (this.focusTrap) {
567+
this.__focusTrapController.releaseFocus();
568+
}
567569

568570
this._animatedClosing();
569571

‎packages/vaadin-overlay/test/focus-trap.test.js‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,24 @@ customElements.define(
6464
},
6565
);
6666

67+
customElements.define(
68+
'nested-overlay-wrapper',
69+
class extends PolymerElement {
70+
static get template() {
71+
return html`
72+
<vaadin-overlay id="outer" focus-trap>
73+
<template>
74+
<button>Button</button>
75+
<vaadin-overlay id="nested">
76+
<template>Inner content</template>
77+
</vaadin-overlay>
78+
</template>
79+
</vaadin-overlay>
80+
`;
81+
}
82+
},
83+
);
84+
6785
describe('focus-trap', () => {
6886
let overlay, parent, overlayPart, focusableElements;
6987

@@ -458,4 +476,33 @@ describe('focus-trap', () => {
458476
});
459477
});
460478
});
479+
480+
describe('nested overlay', () => {
481+
let nested;
482+
483+
beforeEach(async () => {
484+
parent = fixtureSync('<nested-overlay-wrapper></nested-overlay-wrapper>');
485+
overlay = parent.$.outer;
486+
overlay.opened = true;
487+
focusableElements = getFocusableElements(overlay.$.overlay);
488+
await nextRender();
489+
nested = overlay.content.querySelector('#nested');
490+
});
491+
492+
afterEach(() => {
493+
overlay.opened = false;
494+
});
495+
496+
it('should not release focus when closing nested overlay without focus-trap', async () => {
497+
nested.opened = true;
498+
await nextRender();
499+
nested.opened = false;
500+
501+
const button = overlay.content.querySelector('button');
502+
button.focus();
503+
tabKeyDown(button);
504+
505+
expect(getFocusedElementIndex()).to.equal(0);
506+
});
507+
});
461508
});

0 commit comments

Comments
 (0)