Filter focusable elements.

chialab · May 30, 2024 · 0468372 · 0468372
1 parent 55f746c
commit 0468372
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/.changeset/strange-planets-fold.md b/.changeset/strange-planets-fold.md
@@ -0,0 +1,5 @@
+---
+"@chialab/loock": patch
+---
+
+Filter focusable elements.
diff --git a/src/focusManager.ts b/src/focusManager.ts
@@ -15,6 +15,14 @@ export interface FocusManagerOptions {
     exclude?: string[];
 }
 
+function isFocusableElement(element: HTMLElement) {
+    if (!element.isConnected) {
+        return false;
+    }
+    const { width, height } = element.getBoundingClientRect();
+    return !!height && !!width;
+}
+
 /**
  * Find all focusable elements by options.
  * @param node The target node.
@@ -34,10 +42,10 @@ function findFocusableByOptions(
     }
 
     if (typeof elements === 'function') {
-        return elements();
+        return elements().filter(isFocusableElement);
     }
 
-    return elements;
+    return elements.filter(isFocusableElement);
 }
 
 /**
@@ -70,8 +78,7 @@ function findFocusableChildren(
             }
         }
 
-        const { width, height } = element.getBoundingClientRect();
-        return !!height && !!width;
+        return isFocusableElement(element);
     });
 }