From bc97030fedbfc1fd13c1fa59bd9d9f9583c0117b Mon Sep 17 00:00:00 2001 From: Joren Broekema Date: Wed, 28 Oct 2020 12:46:51 +0100 Subject: [PATCH] chore: use focusout instead of blur which does not bubble --- packages/overlays/src/utils/contain-focus.js | 4 ++-- packages/overlays/test/OverlayController.test.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/overlays/src/utils/contain-focus.js b/packages/overlays/src/utils/contain-focus.js index fe218a64e..e670cb24c 100644 --- a/packages/overlays/src/utils/contain-focus.js +++ b/packages/overlays/src/utils/contain-focus.js @@ -132,13 +132,13 @@ export function containFocus(rootElement) { function disconnect() { window.removeEventListener('keydown', handleKeydown); window.removeEventListener('focusin', setFocusInRootElement); - window.removeEventListener('blur', addFocusinListener); + window.removeEventListener('focusout', addFocusinListener); rootElement.removeChild(tabDetectionElement); rootElement.style.removeProperty('outline'); } window.addEventListener('keydown', handleKeydown); - window.addEventListener('blur', addFocusinListener); + window.addEventListener('focusout', addFocusinListener); createHelpersDetectingTabDirection(); return { disconnect }; diff --git a/packages/overlays/test/OverlayController.test.js b/packages/overlays/test/OverlayController.test.js index ffb5d97e5..8325ac890 100644 --- a/packages/overlays/test/OverlayController.test.js +++ b/packages/overlays/test/OverlayController.test.js @@ -358,7 +358,7 @@ describe('OverlayController', () => { const ctrl = new OverlayController({ ...withGlobalTestConfig(), contentNode, - trapsKeyboardFocus: true, + trapsKeyboardFocus: false, }); // add element to dom to allow focus /** @type {HTMLElement} */ (await fixture(html`${ctrl.content}`));