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

fix: clean code for overlay isModal
ing-bank · Aug 28, 2024 · c6a8d6d · c6a8d6d
2 parents 6f35b81 + 89360b5
commit c6a8d6d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/ui/components/overlays/src/OverlayController.js b/packages/ui/components/overlays/src/OverlayController.js
@@ -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'}`);
     }

diff --git a/packages/ui/components/overlays/test/OverlayController.test.js b/packages/ui/components/overlays/test/OverlayController.test.js
@@ -1534,7 +1534,7 @@ describe('OverlayController', () => {
       );
       const ctrl = new OverlayController({
         ...withLocalTestConfig(),
-        hasBackdrop: true,
+        trapsKeyboardFocus: true,
         handlesAccessibility: true,
         invokerNode,
       });