@y14e/roving-tabindex 3.1.16 → 3.1.18

package/README.md

@@ -13,11 +13,11 @@ npm i @y14e/roving-tabindex
 import { createRovingTabIndex } from '@y14e/roving-tabindex';
 
 // CDNs
-import { createRovingTabIndex } from 'https://esm.sh/@y14e/roving-tabindex@3.1.16';
+import { createRovingTabIndex } from 'https://esm.sh/@y14e/roving-tabindex@3.1.18';
 // or
-import { createRovingTabIndex } from 'https://cdn.jsdelivr.net/npm/@y14e/roving-tabindex@3.1.16/+esm';
+import { createRovingTabIndex } from 'https://cdn.jsdelivr.net/npm/@y14e/roving-tabindex@3.1.18/+esm';
 // or
-import { createRovingTabIndex } from 'https://esm.unpkg.com/@y14e/roving-tabindex@3.1.16';
+import { createRovingTabIndex } from 'https://esm.unpkg.com/@y14e/roving-tabindex@3.1.18';
 ```
 
 ## 📦 APIs

package/dist/index.bundle.cjs

@@ -24,8 +24,8 @@ function addTokenToAttribute(element, attribute, token, options = {}) {
   }
 }
 var snapshots = /* @__PURE__ */ new WeakMap();
-function restoreAttributes(elements) {
-  for (const element of elements) {
+function restoreAttributes(element_or_elements) {
+  for (const element of Array.isArray(element_or_elements) ? element_or_elements : [element_or_elements]) {
     const snapshot = snapshots.get(element);
     if (!snapshot) {
       continue;
@@ -36,8 +36,9 @@ function restoreAttributes(elements) {
     snapshots.delete(element);
   }
 }
-function saveAttributes(elements, attributes) {
-  elements.forEach((element) => {
+function saveAttributes(element_or_elements, attribute_or_attributes) {
+  const attributes = Array.isArray(attribute_or_attributes) ? attribute_or_attributes : [attribute_or_attributes];
+  (Array.isArray(element_or_elements) ? element_or_elements : [element_or_elements]).forEach((element) => {
     let snapshot = snapshots.get(element);
     if (!snapshot) {
       snapshot = /* @__PURE__ */ new Map();
@@ -91,14 +92,14 @@ function getFocusables(container = document.body, options = {}) {
     console.warn("Invalid skipVisibilityCheck option. Fallback: false.");
     skipVisibilityCheck = false;
   }
-  const elements = [];
+  const candidates = [];
   if (composed || include) {
     let traverse2 = function(node) {
       if (isFocusable(node, {
         skipNegativeTabIndexCheck,
         skipVisibilityCheck
       }) || include?.(node)) {
-        elements[elements.length] = node;
+        candidates[candidates.length] = node;
       }
       const children2 = composed ? getComposedChildren(node) : getChildren(node);
       for (let i = 0, l = children2.length; i < l; i++) {
@@ -112,21 +113,22 @@ function getFocusables(container = document.body, options = {}) {
       child && traverse2(child);
     }
   } else {
-    const candidates = container.querySelectorAll(
+    const matches = container.querySelectorAll(
       skipNegativeTabIndexCheck ? FOCUSABLE_SELECTOR_WITH_NEGATIVE_TABINDEX : FOCUSABLE_SELECTOR
     );
-    for (let i = 0, l = candidates.length; i < l; i++) {
-      const candidate = candidates[i];
-      if (candidate && isFocusable(candidate, {
+    for (let i = 0, l = matches.length; i < l; i++) {
+      const matched = matches[i];
+      if (matched && isFocusable(matched, {
         skipNegativeTabIndexCheck,
         skipVisibilityCheck
       })) {
-        elements[elements.length] = candidate;
+        candidates[candidates.length] = matched;
       }
     }
   }
-  const filtered = filter ? elements.filter(filter) : elements;
-  return normalizeRadioGroup(sortByTabIndex(filtered));
+  return normalizeRadioGroup(
+    sortByTabIndex(filter ? candidates.filter(filter) : candidates)
+  );
 }
 function isFocusable(element, options = {}) {
   if (!(element instanceof Element)) {
@@ -405,7 +407,7 @@ var RovingTabIndex = class _RovingTabIndex {
     this.#controller = null;
     this.#focusables.forEach((focusable) => {
       _RovingTabIndex.#initialized.delete(focusable);
-      restoreAttributes([focusable]);
+      restoreAttributes(focusable);
     });
     this.#focusables.clear();
     this.#focusablesByFirstChar.clear();
@@ -459,16 +461,16 @@ var RovingTabIndex = class _RovingTabIndex {
     if (!(active instanceof Element)) {
       return;
     }
-    const current = this.#getFocusables().filter(
+    const candidates = this.#getFocusables().filter(
       (focusable2) => this.#focusables.has(focusable2)
     );
-    if (!current.includes(active)) {
+    if (!candidates.includes(active)) {
       return;
     }
     event.preventDefault();
-    const currentIndex = current.indexOf(active);
+    const activeIndex = candidates.indexOf(active);
     let newIndex;
-    let target = current;
+    let target = candidates;
     switch (key) {
       case "End":
         newIndex = -1;
@@ -478,25 +480,26 @@ var RovingTabIndex = class _RovingTabIndex {
         break;
       case "ArrowLeft":
       case "ArrowUp": {
-        const rawIndex = currentIndex - 1;
+        const rawIndex = activeIndex - 1;
         newIndex = wrap ? rawIndex : Math.max(rawIndex, 0);
         break;
       }
       case "ArrowRight":
       case "ArrowDown": {
-        const rawIndex = currentIndex + 1;
-        newIndex = wrap ? rawIndex % current.length : Math.min(rawIndex, current.length - 1);
+        const rawIndex = activeIndex + 1;
+        const length = target.length;
+        newIndex = wrap ? rawIndex % length : Math.min(rawIndex, length - 1);
         break;
       }
       default: {
         const focusables = new Set(
           this.#focusablesByFirstChar.get(key.toUpperCase()) ?? []
         );
-        target = current.filter((focusable2) => focusables.has(focusable2));
-        const foundIndex = target.findIndex(
-          (focusable2) => current.indexOf(focusable2) > currentIndex
+        target = candidates.filter((focusable2) => focusables.has(focusable2));
+        const afterIndex = target.findIndex(
+          (focusable2) => candidates.indexOf(focusable2) > activeIndex
         );
-        newIndex = foundIndex >= 0 ? foundIndex : 0;
+        newIndex = afterIndex >= 0 ? afterIndex : 0;
       }
     }
     const focusable = target.at(newIndex);
@@ -507,7 +510,7 @@ var RovingTabIndex = class _RovingTabIndex {
     for (const focusable of this.#focusables) {
       if (!current.has(focusable)) {
         _RovingTabIndex.#initialized.delete(focusable);
-        restoreAttributes([focusable]);
+        restoreAttributes(focusable);
         this.#focusables.delete(focusable);
         for (const [key, focusables] of this.#focusablesByFirstChar) {
           const index = focusables.indexOf(focusable);
@@ -529,7 +532,7 @@ var RovingTabIndex = class _RovingTabIndex {
       this.#focusables.add(focusable);
       _RovingTabIndex.#initialized.add(focusable);
       if (!navigationOnly) {
-        saveAttributes([focusable], ["tabindex"]);
+        saveAttributes(focusable, "tabindex");
         focusable.setAttribute("tabindex", "-1");
       }
       if (!typeahead) {
@@ -542,7 +545,7 @@ var RovingTabIndex = class _RovingTabIndex {
       );
       if (char) {
         keys.add(char);
-        saveAttributes([focusable], ["aria-keyshortcuts"]);
+        saveAttributes(focusable, "aria-keyshortcuts");
         addTokenToAttribute(focusable, "aria-keyshortcuts", char, {
           caseInsensitive: true
         });
@@ -567,7 +570,7 @@ var RovingTabIndex = class _RovingTabIndex {
   }
   #createSelectorFilter() {
     const { selector } = this.#settings;
-    return (element) => !selector || element.matches(selector);
+    return (element) => !selector || [...this.#container.querySelectorAll(selector)].includes(element);
   }
   #getFocusables() {
     return getFocusables(this.#container, {
@@ -583,7 +586,7 @@ var RovingTabIndex = class _RovingTabIndex {
  * Lightweight roving tabindex utility with fully focus management.
  * Designed for accessible menus, tabs, toolbars, and composite widgets.
  *
- * @version 3.1.16
+ * @version 3.1.18
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -595,7 +598,7 @@ var RovingTabIndex = class _RovingTabIndex {
   (**
    * Attributes Utils
    *
-   * @version 1.1.3
+   * @version 1.1.4
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane
@@ -608,7 +611,7 @@ power-focusable/dist/index.js:
    * High-precision focus management utility with full composed tree support.
    * Handles complex focus rules including tabindex ordering, radio groups, inert.
    *
-   * @version 4.3.20
+   * @version 4.3.21
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.bundle.js

@@ -22,8 +22,8 @@ function addTokenToAttribute(element, attribute, token, options = {}) {
   }
 }
 var snapshots = /* @__PURE__ */ new WeakMap();
-function restoreAttributes(elements) {
-  for (const element of elements) {
+function restoreAttributes(element_or_elements) {
+  for (const element of Array.isArray(element_or_elements) ? element_or_elements : [element_or_elements]) {
     const snapshot = snapshots.get(element);
     if (!snapshot) {
       continue;
@@ -34,8 +34,9 @@ function restoreAttributes(elements) {
     snapshots.delete(element);
   }
 }
-function saveAttributes(elements, attributes) {
-  elements.forEach((element) => {
+function saveAttributes(element_or_elements, attribute_or_attributes) {
+  const attributes = Array.isArray(attribute_or_attributes) ? attribute_or_attributes : [attribute_or_attributes];
+  (Array.isArray(element_or_elements) ? element_or_elements : [element_or_elements]).forEach((element) => {
     let snapshot = snapshots.get(element);
     if (!snapshot) {
       snapshot = /* @__PURE__ */ new Map();
@@ -89,14 +90,14 @@ function getFocusables(container = document.body, options = {}) {
     console.warn("Invalid skipVisibilityCheck option. Fallback: false.");
     skipVisibilityCheck = false;
   }
-  const elements = [];
+  const candidates = [];
   if (composed || include) {
     let traverse2 = function(node) {
       if (isFocusable(node, {
         skipNegativeTabIndexCheck,
         skipVisibilityCheck
       }) || include?.(node)) {
-        elements[elements.length] = node;
+        candidates[candidates.length] = node;
       }
       const children2 = composed ? getComposedChildren(node) : getChildren(node);
       for (let i = 0, l = children2.length; i < l; i++) {
@@ -110,21 +111,22 @@ function getFocusables(container = document.body, options = {}) {
       child && traverse2(child);
     }
   } else {
-    const candidates = container.querySelectorAll(
+    const matches = container.querySelectorAll(
       skipNegativeTabIndexCheck ? FOCUSABLE_SELECTOR_WITH_NEGATIVE_TABINDEX : FOCUSABLE_SELECTOR
     );
-    for (let i = 0, l = candidates.length; i < l; i++) {
-      const candidate = candidates[i];
-      if (candidate && isFocusable(candidate, {
+    for (let i = 0, l = matches.length; i < l; i++) {
+      const matched = matches[i];
+      if (matched && isFocusable(matched, {
         skipNegativeTabIndexCheck,
         skipVisibilityCheck
       })) {
-        elements[elements.length] = candidate;
+        candidates[candidates.length] = matched;
       }
     }
   }
-  const filtered = filter ? elements.filter(filter) : elements;
-  return normalizeRadioGroup(sortByTabIndex(filtered));
+  return normalizeRadioGroup(
+    sortByTabIndex(filter ? candidates.filter(filter) : candidates)
+  );
 }
 function isFocusable(element, options = {}) {
   if (!(element instanceof Element)) {
@@ -403,7 +405,7 @@ var RovingTabIndex = class _RovingTabIndex {
     this.#controller = null;
     this.#focusables.forEach((focusable) => {
       _RovingTabIndex.#initialized.delete(focusable);
-      restoreAttributes([focusable]);
+      restoreAttributes(focusable);
     });
     this.#focusables.clear();
     this.#focusablesByFirstChar.clear();
@@ -457,16 +459,16 @@ var RovingTabIndex = class _RovingTabIndex {
     if (!(active instanceof Element)) {
       return;
     }
-    const current = this.#getFocusables().filter(
+    const candidates = this.#getFocusables().filter(
       (focusable2) => this.#focusables.has(focusable2)
     );
-    if (!current.includes(active)) {
+    if (!candidates.includes(active)) {
       return;
     }
     event.preventDefault();
-    const currentIndex = current.indexOf(active);
+    const activeIndex = candidates.indexOf(active);
     let newIndex;
-    let target = current;
+    let target = candidates;
     switch (key) {
       case "End":
         newIndex = -1;
@@ -476,25 +478,26 @@ var RovingTabIndex = class _RovingTabIndex {
         break;
       case "ArrowLeft":
       case "ArrowUp": {
-        const rawIndex = currentIndex - 1;
+        const rawIndex = activeIndex - 1;
         newIndex = wrap ? rawIndex : Math.max(rawIndex, 0);
         break;
       }
       case "ArrowRight":
       case "ArrowDown": {
-        const rawIndex = currentIndex + 1;
-        newIndex = wrap ? rawIndex % current.length : Math.min(rawIndex, current.length - 1);
+        const rawIndex = activeIndex + 1;
+        const length = target.length;
+        newIndex = wrap ? rawIndex % length : Math.min(rawIndex, length - 1);
         break;
       }
       default: {
         const focusables = new Set(
           this.#focusablesByFirstChar.get(key.toUpperCase()) ?? []
         );
-        target = current.filter((focusable2) => focusables.has(focusable2));
-        const foundIndex = target.findIndex(
-          (focusable2) => current.indexOf(focusable2) > currentIndex
+        target = candidates.filter((focusable2) => focusables.has(focusable2));
+        const afterIndex = target.findIndex(
+          (focusable2) => candidates.indexOf(focusable2) > activeIndex
         );
-        newIndex = foundIndex >= 0 ? foundIndex : 0;
+        newIndex = afterIndex >= 0 ? afterIndex : 0;
       }
     }
     const focusable = target.at(newIndex);
@@ -505,7 +508,7 @@ var RovingTabIndex = class _RovingTabIndex {
     for (const focusable of this.#focusables) {
       if (!current.has(focusable)) {
         _RovingTabIndex.#initialized.delete(focusable);
-        restoreAttributes([focusable]);
+        restoreAttributes(focusable);
         this.#focusables.delete(focusable);
         for (const [key, focusables] of this.#focusablesByFirstChar) {
           const index = focusables.indexOf(focusable);
@@ -527,7 +530,7 @@ var RovingTabIndex = class _RovingTabIndex {
       this.#focusables.add(focusable);
       _RovingTabIndex.#initialized.add(focusable);
       if (!navigationOnly) {
-        saveAttributes([focusable], ["tabindex"]);
+        saveAttributes(focusable, "tabindex");
         focusable.setAttribute("tabindex", "-1");
       }
       if (!typeahead) {
@@ -540,7 +543,7 @@ var RovingTabIndex = class _RovingTabIndex {
       );
       if (char) {
         keys.add(char);
-        saveAttributes([focusable], ["aria-keyshortcuts"]);
+        saveAttributes(focusable, "aria-keyshortcuts");
         addTokenToAttribute(focusable, "aria-keyshortcuts", char, {
           caseInsensitive: true
         });
@@ -565,7 +568,7 @@ var RovingTabIndex = class _RovingTabIndex {
   }
   #createSelectorFilter() {
     const { selector } = this.#settings;
-    return (element) => !selector || element.matches(selector);
+    return (element) => !selector || [...this.#container.querySelectorAll(selector)].includes(element);
   }
   #getFocusables() {
     return getFocusables(this.#container, {
@@ -581,7 +584,7 @@ var RovingTabIndex = class _RovingTabIndex {
  * Lightweight roving tabindex utility with fully focus management.
  * Designed for accessible menus, tabs, toolbars, and composite widgets.
  *
- * @version 3.1.16
+ * @version 3.1.18
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -593,7 +596,7 @@ var RovingTabIndex = class _RovingTabIndex {
   (**
    * Attributes Utils
    *
-   * @version 1.1.3
+   * @version 1.1.4
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane
@@ -606,7 +609,7 @@ power-focusable/dist/index.js:
    * High-precision focus management utility with full composed tree support.
    * Handles complex focus rules including tabindex ordering, radio groups, inert.
    *
-   * @version 4.3.20
+   * @version 4.3.21
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.cjs

@@ -91,7 +91,7 @@ var RovingTabIndex = class _RovingTabIndex {
     this.#controller = null;
     this.#focusables.forEach((focusable) => {
       _RovingTabIndex.#initialized.delete(focusable);
-      attributesUtils.restoreAttributes([focusable]);
+      attributesUtils.restoreAttributes(focusable);
     });
     this.#focusables.clear();
     this.#focusablesByFirstChar.clear();
@@ -145,16 +145,16 @@ var RovingTabIndex = class _RovingTabIndex {
     if (!(active instanceof Element)) {
       return;
     }
-    const current = this.#getFocusables().filter(
+    const candidates = this.#getFocusables().filter(
       (focusable2) => this.#focusables.has(focusable2)
     );
-    if (!current.includes(active)) {
+    if (!candidates.includes(active)) {
       return;
     }
     event.preventDefault();
-    const currentIndex = current.indexOf(active);
+    const activeIndex = candidates.indexOf(active);
     let newIndex;
-    let target = current;
+    let target = candidates;
     switch (key) {
       case "End":
         newIndex = -1;
@@ -164,25 +164,26 @@ var RovingTabIndex = class _RovingTabIndex {
         break;
       case "ArrowLeft":
       case "ArrowUp": {
-        const rawIndex = currentIndex - 1;
+        const rawIndex = activeIndex - 1;
         newIndex = wrap ? rawIndex : Math.max(rawIndex, 0);
         break;
       }
       case "ArrowRight":
       case "ArrowDown": {
-        const rawIndex = currentIndex + 1;
-        newIndex = wrap ? rawIndex % current.length : Math.min(rawIndex, current.length - 1);
+        const rawIndex = activeIndex + 1;
+        const length = target.length;
+        newIndex = wrap ? rawIndex % length : Math.min(rawIndex, length - 1);
         break;
       }
       default: {
         const focusables = new Set(
           this.#focusablesByFirstChar.get(key.toUpperCase()) ?? []
         );
-        target = current.filter((focusable2) => focusables.has(focusable2));
-        const foundIndex = target.findIndex(
-          (focusable2) => current.indexOf(focusable2) > currentIndex
+        target = candidates.filter((focusable2) => focusables.has(focusable2));
+        const afterIndex = target.findIndex(
+          (focusable2) => candidates.indexOf(focusable2) > activeIndex
         );
-        newIndex = foundIndex >= 0 ? foundIndex : 0;
+        newIndex = afterIndex >= 0 ? afterIndex : 0;
       }
     }
     const focusable = target.at(newIndex);
@@ -193,7 +194,7 @@ var RovingTabIndex = class _RovingTabIndex {
     for (const focusable of this.#focusables) {
       if (!current.has(focusable)) {
         _RovingTabIndex.#initialized.delete(focusable);
-        attributesUtils.restoreAttributes([focusable]);
+        attributesUtils.restoreAttributes(focusable);
         this.#focusables.delete(focusable);
         for (const [key, focusables] of this.#focusablesByFirstChar) {
           const index = focusables.indexOf(focusable);
@@ -215,7 +216,7 @@ var RovingTabIndex = class _RovingTabIndex {
       this.#focusables.add(focusable);
       _RovingTabIndex.#initialized.add(focusable);
       if (!navigationOnly) {
-        attributesUtils.saveAttributes([focusable], ["tabindex"]);
+        attributesUtils.saveAttributes(focusable, "tabindex");
         focusable.setAttribute("tabindex", "-1");
       }
       if (!typeahead) {
@@ -228,7 +229,7 @@ var RovingTabIndex = class _RovingTabIndex {
       );
       if (char) {
         keys.add(char);
-        attributesUtils.saveAttributes([focusable], ["aria-keyshortcuts"]);
+        attributesUtils.saveAttributes(focusable, "aria-keyshortcuts");
         attributesUtils.addTokenToAttribute(focusable, "aria-keyshortcuts", char, {
           caseInsensitive: true
         });
@@ -253,7 +254,7 @@ var RovingTabIndex = class _RovingTabIndex {
   }
   #createSelectorFilter() {
     const { selector } = this.#settings;
-    return (element) => !selector || element.matches(selector);
+    return (element) => !selector || [...this.#container.querySelectorAll(selector)].includes(element);
   }
   #getFocusables() {
     return powerFocusable.getFocusables(this.#container, {
@@ -269,7 +270,7 @@ var RovingTabIndex = class _RovingTabIndex {
  * Lightweight roving tabindex utility with fully focus management.
  * Designed for accessible menus, tabs, toolbars, and composite widgets.
  *
- * @version 3.1.16
+ * @version 3.1.18
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.d.cts

@@ -3,7 +3,7 @@
  * Lightweight roving tabindex utility with fully focus management.
  * Designed for accessible menus, tabs, toolbars, and composite widgets.
  *
- * @version 3.1.16
+ * @version 3.1.18
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.d.ts

@@ -3,7 +3,7 @@
  * Lightweight roving tabindex utility with fully focus management.
  * Designed for accessible menus, tabs, toolbars, and composite widgets.
  *
- * @version 3.1.16
+ * @version 3.1.18
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.js

@@ -89,7 +89,7 @@ var RovingTabIndex = class _RovingTabIndex {
     this.#controller = null;
     this.#focusables.forEach((focusable) => {
       _RovingTabIndex.#initialized.delete(focusable);
-      restoreAttributes([focusable]);
+      restoreAttributes(focusable);
     });
     this.#focusables.clear();
     this.#focusablesByFirstChar.clear();
@@ -143,16 +143,16 @@ var RovingTabIndex = class _RovingTabIndex {
     if (!(active instanceof Element)) {
       return;
     }
-    const current = this.#getFocusables().filter(
+    const candidates = this.#getFocusables().filter(
       (focusable2) => this.#focusables.has(focusable2)
     );
-    if (!current.includes(active)) {
+    if (!candidates.includes(active)) {
       return;
     }
     event.preventDefault();
-    const currentIndex = current.indexOf(active);
+    const activeIndex = candidates.indexOf(active);
     let newIndex;
-    let target = current;
+    let target = candidates;
     switch (key) {
       case "End":
         newIndex = -1;
@@ -162,25 +162,26 @@ var RovingTabIndex = class _RovingTabIndex {
         break;
       case "ArrowLeft":
       case "ArrowUp": {
-        const rawIndex = currentIndex - 1;
+        const rawIndex = activeIndex - 1;
         newIndex = wrap ? rawIndex : Math.max(rawIndex, 0);
         break;
       }
       case "ArrowRight":
       case "ArrowDown": {
-        const rawIndex = currentIndex + 1;
-        newIndex = wrap ? rawIndex % current.length : Math.min(rawIndex, current.length - 1);
+        const rawIndex = activeIndex + 1;
+        const length = target.length;
+        newIndex = wrap ? rawIndex % length : Math.min(rawIndex, length - 1);
         break;
       }
       default: {
         const focusables = new Set(
           this.#focusablesByFirstChar.get(key.toUpperCase()) ?? []
         );
-        target = current.filter((focusable2) => focusables.has(focusable2));
-        const foundIndex = target.findIndex(
-          (focusable2) => current.indexOf(focusable2) > currentIndex
+        target = candidates.filter((focusable2) => focusables.has(focusable2));
+        const afterIndex = target.findIndex(
+          (focusable2) => candidates.indexOf(focusable2) > activeIndex
         );
-        newIndex = foundIndex >= 0 ? foundIndex : 0;
+        newIndex = afterIndex >= 0 ? afterIndex : 0;
       }
     }
     const focusable = target.at(newIndex);
@@ -191,7 +192,7 @@ var RovingTabIndex = class _RovingTabIndex {
     for (const focusable of this.#focusables) {
       if (!current.has(focusable)) {
         _RovingTabIndex.#initialized.delete(focusable);
-        restoreAttributes([focusable]);
+        restoreAttributes(focusable);
         this.#focusables.delete(focusable);
         for (const [key, focusables] of this.#focusablesByFirstChar) {
           const index = focusables.indexOf(focusable);
@@ -213,7 +214,7 @@ var RovingTabIndex = class _RovingTabIndex {
       this.#focusables.add(focusable);
       _RovingTabIndex.#initialized.add(focusable);
       if (!navigationOnly) {
-        saveAttributes([focusable], ["tabindex"]);
+        saveAttributes(focusable, "tabindex");
         focusable.setAttribute("tabindex", "-1");
       }
       if (!typeahead) {
@@ -226,7 +227,7 @@ var RovingTabIndex = class _RovingTabIndex {
       );
       if (char) {
         keys.add(char);
-        saveAttributes([focusable], ["aria-keyshortcuts"]);
+        saveAttributes(focusable, "aria-keyshortcuts");
         addTokenToAttribute(focusable, "aria-keyshortcuts", char, {
           caseInsensitive: true
         });
@@ -251,7 +252,7 @@ var RovingTabIndex = class _RovingTabIndex {
   }
   #createSelectorFilter() {
     const { selector } = this.#settings;
-    return (element) => !selector || element.matches(selector);
+    return (element) => !selector || [...this.#container.querySelectorAll(selector)].includes(element);
   }
   #getFocusables() {
     return getFocusables(this.#container, {
@@ -267,7 +268,7 @@ var RovingTabIndex = class _RovingTabIndex {
  * Lightweight roving tabindex utility with fully focus management.
  * Designed for accessible menus, tabs, toolbars, and composite widgets.
  *
- * @version 3.1.16
+ * @version 3.1.18
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@y14e/roving-tabindex",
-  "version": "3.1.16",
+  "version": "3.1.18",
   "description": "Lightweight roving tabindex utility with fully focus management",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -56,7 +56,7 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@y14e/attributes-utils": "^1.1.3",
-    "power-focusable": "^4.3.20"
+    "@y14e/attributes-utils": "^1.1.4",
+    "power-focusable": "^4.3.21"
   }
 }