Merge pull request #155 from jpzwarte/fix/delegates-focus-without-foc…

…usable-element Fix incorrect `isFocusable` result for `ShadowRoot`
oddbird · Nov 29, 2023 · 079f724 · 079f724
2 parents 45dd419 + 9598985
commit 079f724
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/popover-helpers.ts b/src/popover-helpers.ts
@@ -160,7 +160,7 @@ function topMostPopoverAncestor(newPopover: HTMLElement): HTMLElement | null {
 }
 
 function isFocusable(focusTarget: HTMLElement) {
-  if (focusTarget.hidden) return false;
+  if (focusTarget.hidden || focusTarget instanceof ShadowRoot) return false;
   if (
     focusTarget instanceof HTMLButtonElement ||
     focusTarget instanceof HTMLInputElement ||
@@ -181,7 +181,9 @@ function isFocusable(focusTarget: HTMLElement) {
   if (focusTarget instanceof HTMLAnchorElement && focusTarget.href === '') {
     return false;
   }
-  return focusTarget.tabIndex !== -1;
+  return (
+    typeof focusTarget.tabIndex === 'number' && focusTarget.tabIndex !== -1
+  );
 }
 
 // This method is not spec compliant, as it also looks in slotted content