ayo/lion
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2356 from ing-bank/fix/overlay-is-modal

Browse source 
fix: clean code for overlay isModal
This commit is contained in:
Oleksii Kadurin 2024-08-28 13:39:53 +02:00 committed by GitHub
commit c6a8d6d754
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/ui/components/overlays/src/OverlayController.js
View file

@ -640,7 +640,7 @@ export class OverlayController extends EventTarget {
__setupTeardownAccessibility({ phase }) {
if (phase === 'init') {
this.__storeOriginalAttrs(this.contentNode, ['role', 'id']);
const isModal = this.hasBackdrop;
const isModal = this.trapsKeyboardFocus;
if (this.invokerNode) {
const attributesToStore = ['aria-labelledby', 'aria-describedby'];
@ -1300,7 +1300,7 @@ export class OverlayController extends EventTarget {
if (phase === 'init' || phase === 'teardown') {
this.__setupTeardownAccessibility({ phase });
}
const isModal = this.hasBackdrop;
const isModal = this.trapsKeyboardFocus;
if (this.invokerNode && !this.isTooltip && !isModal) {
this.invokerNode.setAttribute('aria-expanded', `${phase === 'show'}`);
}

2
packages/ui/components/overlays/test/OverlayController.test.js
View file

@ -1534,7 +1534,7 @@ describe('OverlayController', () => {
);
const ctrl = new OverlayController({
...withLocalTestConfig(),
hasBackdrop: true,
trapsKeyboardFocus: true,
handlesAccessibility: true,
invokerNode,
});