fix focus on context enter when target has tabindex equal to -1

chialab · Apr 18, 2023 · aa3fd32 · aa3fd32
1 parent 983ccd2
commit aa3fd32
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.changeset/gentle-eagles-share.md b/.changeset/gentle-eagles-share.md
@@ -0,0 +1,5 @@
+---
+"@chialab/loock": patch
+---
+
+Fix focus on context enter when target has tabindex equal to -1.
diff --git a/src/Context.js b/src/Context.js
@@ -298,11 +298,8 @@ export class Context {
             console.warn('created a Context without aria-label', this);
         }
         await dispatchAsyncEvent(element, 'focusenter', this);
-        if (target !== this.element) {
-            const children = this.findFocusableChildren();
-            if (children.indexOf(target) !== -1) {
-                this.setCurrentElement(target, false);
-            }
+        if (element.contains(target)) {
+            this.setCurrentElement(target, false);
         }
         this.restore();
     }