diff --git a/packages/clay-shared/src/useFocusManagement.ts b/packages/clay-shared/src/useFocusManagement.ts index 9e6fa5f32c..0fb2315294 100644 --- a/packages/clay-shared/src/useFocusManagement.ts +++ b/packages/clay-shared/src/useFocusManagement.ts @@ -88,7 +88,13 @@ export const FOCUSABLE_ELEMENTS = [ function collectDocumentFocusableElements() { return Array.from( document.querySelectorAll(FOCUSABLE_ELEMENTS.join(',')) - ).filter((element) => isFocusable(element)); + ).filter((element) => { + if (isFocusable(element)) { + return window.getComputedStyle(element).visibility !== 'hidden'; + } + + return false; + }); } // https://github.com/facebook/react/pull/15849#diff-39a673d38713257d5fe7d90aac2acb5aR107