@y14e/roving-tabindex 3.1.12 → 3.1.14

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.12';
+import { createRovingTabIndex } from 'https://esm.sh/@y14e/roving-tabindex@3.1.14';
 // or
-import { createRovingTabIndex } from 'https://cdn.jsdelivr.net/npm/@y14e/roving-tabindex@3.1.12/+esm';
+import { createRovingTabIndex } from 'https://cdn.jsdelivr.net/npm/@y14e/roving-tabindex@3.1.14/+esm';
 // or
-import { createRovingTabIndex } from 'https://esm.unpkg.com/@y14e/roving-tabindex@3.1.12';
+import { createRovingTabIndex } from 'https://esm.unpkg.com/@y14e/roving-tabindex@3.1.14';
 ```
 
 ## 📦 APIs

package/dist/index.bundle.cjs

@@ -51,7 +51,7 @@ function saveAttributes(elements, attributes) {
 
 // node_modules/power-focusable/dist/index.js
 var FOCUSABLE_SELECTOR = `:is(a[href], area[href], button, embed, iframe, input:not([type="hidden" i]), object, select, details > summary:first-of-type, textarea, [contenteditable]:not([contenteditable="false" i]), [controls], [tabindex]):not(:disabled, [hidden], [inert], [tabindex="-1"])`;
-var FOCUSABLE_SELECTOR_WITH_NEGATIVE_TAB_INDEX = FOCUSABLE_SELECTOR.replace(
+var FOCUSABLE_SELECTOR_WITH_NEGATIVE_TABINDEX = FOCUSABLE_SELECTOR.replace(
   /(,\s*)?\[tabindex="-1"\]/g,
   ""
 );
@@ -113,7 +113,7 @@ function getFocusables(container = document.body, options = {}) {
     }
   } else {
     const candidates = container.querySelectorAll(
-      skipNegativeTabIndexCheck ? FOCUSABLE_SELECTOR_WITH_NEGATIVE_TAB_INDEX : FOCUSABLE_SELECTOR
+      skipNegativeTabIndexCheck ? FOCUSABLE_SELECTOR_WITH_NEGATIVE_TABINDEX : FOCUSABLE_SELECTOR
     );
     for (let i = 0, l = candidates.length; i < l; i++) {
       const candidate = candidates[i];
@@ -149,7 +149,7 @@ function isFocusable(element, options = {}) {
     return false;
   }
   if (!element.matches(
-    skipNegativeTabIndexCheck ? FOCUSABLE_SELECTOR_WITH_NEGATIVE_TAB_INDEX : FOCUSABLE_SELECTOR
+    skipNegativeTabIndexCheck ? FOCUSABLE_SELECTOR_WITH_NEGATIVE_TABINDEX : FOCUSABLE_SELECTOR
   )) {
     return false;
   }
@@ -195,7 +195,7 @@ function isDisabledDeep(element) {
   return false;
 }
 function normalizeRadioGroup(elements) {
-  let rootMap = null;
+  let map = null;
   for (let i = 0, l = elements.length; i < l; i++) {
     const element = elements[i];
     if (!(element instanceof HTMLInputElement)) {
@@ -204,35 +204,35 @@ function normalizeRadioGroup(elements) {
     if (!isUngroupedRadio(element)) {
       continue;
     }
-    if (!rootMap) {
-      rootMap = /* @__PURE__ */ new Map();
+    if (!map) {
+      map = /* @__PURE__ */ new Map();
     }
     const root = element.getRootNode();
-    let formMap = rootMap.get(root);
-    if (!formMap) {
-      formMap = /* @__PURE__ */ new Map();
-      rootMap.set(root, formMap);
+    let value = map.get(root);
+    if (!value) {
+      value = /* @__PURE__ */ new Map();
+      map.set(root, value);
     }
-    let nameMap = formMap.get(element.form);
-    if (!nameMap) {
-      nameMap = /* @__PURE__ */ new Map();
-      formMap.set(element.form, nameMap);
+    let v = value.get(element.form);
+    if (!v) {
+      v = /* @__PURE__ */ new Map();
+      value.set(element.form, v);
     }
-    let group = nameMap.get(element.name);
-    if (!group) {
-      group = [];
-      nameMap.set(element.name, group);
+    let vv = v.get(element.name);
+    if (!vv) {
+      vv = [];
+      v.set(element.name, vv);
     }
-    group[group.length] = element;
+    vv[vv.length] = element;
   }
-  if (!rootMap) {
+  if (!map) {
     return elements;
   }
   const placeholder = /* @__PURE__ */ new Set();
-  for (const formMap of rootMap.values()) {
-    for (const nameMap of formMap.values()) {
-      for (const group of nameMap.values()) {
-        const radio = group.find((element) => element.checked) ?? group[0];
+  for (const value of map.values()) {
+    for (const v of value.values()) {
+      for (const vv of v.values()) {
+        const radio = vv.find((element) => element.checked) ?? vv[0];
         radio && placeholder.add(radio);
       }
     }
@@ -324,14 +324,8 @@ function createRovingTabIndex(container, options = {}) {
     return () => {
     };
   }
-  try {
-    const roving = new RovingTabIndex(container, options);
-    return () => roving.destroy();
-  } catch (error) {
-    error instanceof Error && console.warn(error.message || error);
-    return () => {
-    };
-  }
+  const roving = new RovingTabIndex(container, options);
+  return () => roving.destroy();
 }
 var RovingTabIndex = class _RovingTabIndex {
   static #initialized = /* @__PURE__ */ new Set();
@@ -369,9 +363,18 @@ var RovingTabIndex = class _RovingTabIndex {
       console.warn("Invalid noStart option. Fallback: false.");
       noStart = false;
     }
-    if (selector !== "" && (typeof selector !== "string" || !selector.trim())) {
-      console.warn("Invalid selector. Fallback: no selector string.");
-      selector = "";
+    if (selector !== "") {
+      if (typeof selector !== "string" || !selector.trim()) {
+        console.warn("Invalid selector. Fallback: no selector string.");
+        selector = "";
+      } else {
+        try {
+          container.querySelector(selector);
+        } catch {
+          console.warn("Invalid selector. Fallback: no selector string.");
+          selector = "";
+        }
+      }
     }
     if (typeof typeahead !== "boolean") {
       console.warn("Invalid typeahead option. Fallback: false.");
@@ -400,7 +403,10 @@ var RovingTabIndex = class _RovingTabIndex {
     this.#isDestroyed = true;
     this.#controller?.abort();
     this.#controller = null;
-    restoreAttributes([...this.#focusables]);
+    this.#focusables.forEach((focusable) => {
+      _RovingTabIndex.#initialized.delete(focusable);
+      restoreAttributes([focusable]);
+    });
     this.#focusables.clear();
     this.#focusablesByFirstChar.clear();
   }
@@ -453,14 +459,16 @@ var RovingTabIndex = class _RovingTabIndex {
     if (!(active instanceof Element)) {
       return;
     }
-    const current = this.#getFocusables();
-    if (!current.includes(active)) {
+    const candidates = this.#getFocusables().filter(
+      (focusable2) => this.#focusables.has(focusable2)
+    );
+    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;
@@ -470,46 +478,53 @@ 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;
+        newIndex = wrap ? rawIndex % candidates.length : Math.min(rawIndex, candidates.length - 1);
         break;
       }
       default: {
-        target = this.#focusablesByFirstChar.get(key.toUpperCase()) ?? [];
-        const foundIndex = target.findIndex(
-          (focusable2) => current.indexOf(focusable2) > currentIndex
+        const focusables = new Set(
+          this.#focusablesByFirstChar.get(key.toUpperCase()) ?? []
+        );
+        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);
     focusable && focusElement(focusable);
   };
   #update(active) {
-    const current = new Set(this.#getFocusables());
+    const focusables = new Set(this.#getFocusables());
     for (const focusable of this.#focusables) {
-      if (!current.has(focusable)) {
-        focusable.isConnected && restoreAttributes([focusable]);
+      if (!focusables.has(focusable)) {
+        _RovingTabIndex.#initialized.delete(focusable);
+        restoreAttributes([focusable]);
         this.#focusables.delete(focusable);
-        this.#focusablesByFirstChar.forEach((focusables) => {
-          const index = focusables.indexOf(focusable);
-          index >= 0 && focusables.splice(index, 1);
-        });
+        for (const [key, focusables2] of this.#focusablesByFirstChar) {
+          const index = focusables2.indexOf(focusable);
+          if (index >= 0) {
+            focusables2.splice(index, 1);
+            !focusables2.length && this.#focusablesByFirstChar.delete(key);
+          }
+        }
       }
     }
     const { navigationOnly, noStart, typeahead } = this.#settings;
-    for (const focusable of current) {
+    for (const focusable of focusables) {
       if (this.#focusables.has(focusable)) {
         continue;
       }
       if (_RovingTabIndex.#initialized.has(focusable)) {
-        throw new TypeError("Already initialized");
+        continue;
       }
       this.#focusables.add(focusable);
       _RovingTabIndex.#initialized.add(focusable);
@@ -533,9 +548,9 @@ var RovingTabIndex = class _RovingTabIndex {
         });
       }
       keys.forEach((key) => {
-        const focusables = this.#focusablesByFirstChar.get(key) ?? [];
-        focusables.push(focusable);
-        this.#focusablesByFirstChar.set(key, focusables);
+        const focusables2 = this.#focusablesByFirstChar.get(key) ?? [];
+        focusables2.push(focusable);
+        this.#focusablesByFirstChar.set(key, focusables2);
       });
     }
     if (!navigationOnly) {
@@ -552,7 +567,7 @@ var RovingTabIndex = class _RovingTabIndex {
   }
   #createSelectorFilter() {
     const { selector } = this.#settings;
-    return (element) => !selector || [...this.#container.querySelectorAll(selector)].includes(element);
+    return (element) => !selector || element.matches(selector);
   }
   #getFocusables() {
     return getFocusables(this.#container, {
@@ -568,7 +583,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.12
+ * @version 3.1.14
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -593,7 +608,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.12
+   * @version 4.3.18
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.bundle.js

@@ -49,7 +49,7 @@ function saveAttributes(elements, attributes) {
 
 // node_modules/power-focusable/dist/index.js
 var FOCUSABLE_SELECTOR = `:is(a[href], area[href], button, embed, iframe, input:not([type="hidden" i]), object, select, details > summary:first-of-type, textarea, [contenteditable]:not([contenteditable="false" i]), [controls], [tabindex]):not(:disabled, [hidden], [inert], [tabindex="-1"])`;
-var FOCUSABLE_SELECTOR_WITH_NEGATIVE_TAB_INDEX = FOCUSABLE_SELECTOR.replace(
+var FOCUSABLE_SELECTOR_WITH_NEGATIVE_TABINDEX = FOCUSABLE_SELECTOR.replace(
   /(,\s*)?\[tabindex="-1"\]/g,
   ""
 );
@@ -111,7 +111,7 @@ function getFocusables(container = document.body, options = {}) {
     }
   } else {
     const candidates = container.querySelectorAll(
-      skipNegativeTabIndexCheck ? FOCUSABLE_SELECTOR_WITH_NEGATIVE_TAB_INDEX : FOCUSABLE_SELECTOR
+      skipNegativeTabIndexCheck ? FOCUSABLE_SELECTOR_WITH_NEGATIVE_TABINDEX : FOCUSABLE_SELECTOR
     );
     for (let i = 0, l = candidates.length; i < l; i++) {
       const candidate = candidates[i];
@@ -147,7 +147,7 @@ function isFocusable(element, options = {}) {
     return false;
   }
   if (!element.matches(
-    skipNegativeTabIndexCheck ? FOCUSABLE_SELECTOR_WITH_NEGATIVE_TAB_INDEX : FOCUSABLE_SELECTOR
+    skipNegativeTabIndexCheck ? FOCUSABLE_SELECTOR_WITH_NEGATIVE_TABINDEX : FOCUSABLE_SELECTOR
   )) {
     return false;
   }
@@ -193,7 +193,7 @@ function isDisabledDeep(element) {
   return false;
 }
 function normalizeRadioGroup(elements) {
-  let rootMap = null;
+  let map = null;
   for (let i = 0, l = elements.length; i < l; i++) {
     const element = elements[i];
     if (!(element instanceof HTMLInputElement)) {
@@ -202,35 +202,35 @@ function normalizeRadioGroup(elements) {
     if (!isUngroupedRadio(element)) {
       continue;
     }
-    if (!rootMap) {
-      rootMap = /* @__PURE__ */ new Map();
+    if (!map) {
+      map = /* @__PURE__ */ new Map();
     }
     const root = element.getRootNode();
-    let formMap = rootMap.get(root);
-    if (!formMap) {
-      formMap = /* @__PURE__ */ new Map();
-      rootMap.set(root, formMap);
+    let value = map.get(root);
+    if (!value) {
+      value = /* @__PURE__ */ new Map();
+      map.set(root, value);
     }
-    let nameMap = formMap.get(element.form);
-    if (!nameMap) {
-      nameMap = /* @__PURE__ */ new Map();
-      formMap.set(element.form, nameMap);
+    let v = value.get(element.form);
+    if (!v) {
+      v = /* @__PURE__ */ new Map();
+      value.set(element.form, v);
     }
-    let group = nameMap.get(element.name);
-    if (!group) {
-      group = [];
-      nameMap.set(element.name, group);
+    let vv = v.get(element.name);
+    if (!vv) {
+      vv = [];
+      v.set(element.name, vv);
     }
-    group[group.length] = element;
+    vv[vv.length] = element;
   }
-  if (!rootMap) {
+  if (!map) {
     return elements;
   }
   const placeholder = /* @__PURE__ */ new Set();
-  for (const formMap of rootMap.values()) {
-    for (const nameMap of formMap.values()) {
-      for (const group of nameMap.values()) {
-        const radio = group.find((element) => element.checked) ?? group[0];
+  for (const value of map.values()) {
+    for (const v of value.values()) {
+      for (const vv of v.values()) {
+        const radio = vv.find((element) => element.checked) ?? vv[0];
         radio && placeholder.add(radio);
       }
     }
@@ -322,14 +322,8 @@ function createRovingTabIndex(container, options = {}) {
     return () => {
     };
   }
-  try {
-    const roving = new RovingTabIndex(container, options);
-    return () => roving.destroy();
-  } catch (error) {
-    error instanceof Error && console.warn(error.message || error);
-    return () => {
-    };
-  }
+  const roving = new RovingTabIndex(container, options);
+  return () => roving.destroy();
 }
 var RovingTabIndex = class _RovingTabIndex {
   static #initialized = /* @__PURE__ */ new Set();
@@ -367,9 +361,18 @@ var RovingTabIndex = class _RovingTabIndex {
       console.warn("Invalid noStart option. Fallback: false.");
       noStart = false;
     }
-    if (selector !== "" && (typeof selector !== "string" || !selector.trim())) {
-      console.warn("Invalid selector. Fallback: no selector string.");
-      selector = "";
+    if (selector !== "") {
+      if (typeof selector !== "string" || !selector.trim()) {
+        console.warn("Invalid selector. Fallback: no selector string.");
+        selector = "";
+      } else {
+        try {
+          container.querySelector(selector);
+        } catch {
+          console.warn("Invalid selector. Fallback: no selector string.");
+          selector = "";
+        }
+      }
     }
     if (typeof typeahead !== "boolean") {
       console.warn("Invalid typeahead option. Fallback: false.");
@@ -398,7 +401,10 @@ var RovingTabIndex = class _RovingTabIndex {
     this.#isDestroyed = true;
     this.#controller?.abort();
     this.#controller = null;
-    restoreAttributes([...this.#focusables]);
+    this.#focusables.forEach((focusable) => {
+      _RovingTabIndex.#initialized.delete(focusable);
+      restoreAttributes([focusable]);
+    });
     this.#focusables.clear();
     this.#focusablesByFirstChar.clear();
   }
@@ -451,14 +457,16 @@ var RovingTabIndex = class _RovingTabIndex {
     if (!(active instanceof Element)) {
       return;
     }
-    const current = this.#getFocusables();
-    if (!current.includes(active)) {
+    const candidates = this.#getFocusables().filter(
+      (focusable2) => this.#focusables.has(focusable2)
+    );
+    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;
@@ -468,46 +476,53 @@ 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;
+        newIndex = wrap ? rawIndex % candidates.length : Math.min(rawIndex, candidates.length - 1);
         break;
       }
       default: {
-        target = this.#focusablesByFirstChar.get(key.toUpperCase()) ?? [];
-        const foundIndex = target.findIndex(
-          (focusable2) => current.indexOf(focusable2) > currentIndex
+        const focusables = new Set(
+          this.#focusablesByFirstChar.get(key.toUpperCase()) ?? []
+        );
+        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);
     focusable && focusElement(focusable);
   };
   #update(active) {
-    const current = new Set(this.#getFocusables());
+    const focusables = new Set(this.#getFocusables());
     for (const focusable of this.#focusables) {
-      if (!current.has(focusable)) {
-        focusable.isConnected && restoreAttributes([focusable]);
+      if (!focusables.has(focusable)) {
+        _RovingTabIndex.#initialized.delete(focusable);
+        restoreAttributes([focusable]);
         this.#focusables.delete(focusable);
-        this.#focusablesByFirstChar.forEach((focusables) => {
-          const index = focusables.indexOf(focusable);
-          index >= 0 && focusables.splice(index, 1);
-        });
+        for (const [key, focusables2] of this.#focusablesByFirstChar) {
+          const index = focusables2.indexOf(focusable);
+          if (index >= 0) {
+            focusables2.splice(index, 1);
+            !focusables2.length && this.#focusablesByFirstChar.delete(key);
+          }
+        }
       }
     }
     const { navigationOnly, noStart, typeahead } = this.#settings;
-    for (const focusable of current) {
+    for (const focusable of focusables) {
       if (this.#focusables.has(focusable)) {
         continue;
       }
       if (_RovingTabIndex.#initialized.has(focusable)) {
-        throw new TypeError("Already initialized");
+        continue;
       }
       this.#focusables.add(focusable);
       _RovingTabIndex.#initialized.add(focusable);
@@ -531,9 +546,9 @@ var RovingTabIndex = class _RovingTabIndex {
         });
       }
       keys.forEach((key) => {
-        const focusables = this.#focusablesByFirstChar.get(key) ?? [];
-        focusables.push(focusable);
-        this.#focusablesByFirstChar.set(key, focusables);
+        const focusables2 = this.#focusablesByFirstChar.get(key) ?? [];
+        focusables2.push(focusable);
+        this.#focusablesByFirstChar.set(key, focusables2);
       });
     }
     if (!navigationOnly) {
@@ -550,7 +565,7 @@ var RovingTabIndex = class _RovingTabIndex {
   }
   #createSelectorFilter() {
     const { selector } = this.#settings;
-    return (element) => !selector || [...this.#container.querySelectorAll(selector)].includes(element);
+    return (element) => !selector || element.matches(selector);
   }
   #getFocusables() {
     return getFocusables(this.#container, {
@@ -566,7 +581,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.12
+ * @version 3.1.14
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -591,7 +606,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.12
+   * @version 4.3.18
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.cjs

@@ -10,14 +10,8 @@ function createRovingTabIndex(container, options = {}) {
     return () => {
     };
   }
-  try {
-    const roving = new RovingTabIndex(container, options);
-    return () => roving.destroy();
-  } catch (error) {
-    error instanceof Error && console.warn(error.message || error);
-    return () => {
-    };
-  }
+  const roving = new RovingTabIndex(container, options);
+  return () => roving.destroy();
 }
 var RovingTabIndex = class _RovingTabIndex {
   static #initialized = /* @__PURE__ */ new Set();
@@ -55,9 +49,18 @@ var RovingTabIndex = class _RovingTabIndex {
       console.warn("Invalid noStart option. Fallback: false.");
       noStart = false;
     }
-    if (selector !== "" && (typeof selector !== "string" || !selector.trim())) {
-      console.warn("Invalid selector. Fallback: no selector string.");
-      selector = "";
+    if (selector !== "") {
+      if (typeof selector !== "string" || !selector.trim()) {
+        console.warn("Invalid selector. Fallback: no selector string.");
+        selector = "";
+      } else {
+        try {
+          container.querySelector(selector);
+        } catch {
+          console.warn("Invalid selector. Fallback: no selector string.");
+          selector = "";
+        }
+      }
     }
     if (typeof typeahead !== "boolean") {
       console.warn("Invalid typeahead option. Fallback: false.");
@@ -86,7 +89,10 @@ var RovingTabIndex = class _RovingTabIndex {
     this.#isDestroyed = true;
     this.#controller?.abort();
     this.#controller = null;
-    attributesUtils.restoreAttributes([...this.#focusables]);
+    this.#focusables.forEach((focusable) => {
+      _RovingTabIndex.#initialized.delete(focusable);
+      attributesUtils.restoreAttributes([focusable]);
+    });
     this.#focusables.clear();
     this.#focusablesByFirstChar.clear();
   }
@@ -139,14 +145,16 @@ var RovingTabIndex = class _RovingTabIndex {
     if (!(active instanceof Element)) {
       return;
     }
-    const current = this.#getFocusables();
-    if (!current.includes(active)) {
+    const candidates = this.#getFocusables().filter(
+      (focusable2) => this.#focusables.has(focusable2)
+    );
+    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;
@@ -156,46 +164,53 @@ 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;
+        newIndex = wrap ? rawIndex % candidates.length : Math.min(rawIndex, candidates.length - 1);
         break;
       }
       default: {
-        target = this.#focusablesByFirstChar.get(key.toUpperCase()) ?? [];
-        const foundIndex = target.findIndex(
-          (focusable2) => current.indexOf(focusable2) > currentIndex
+        const focusables = new Set(
+          this.#focusablesByFirstChar.get(key.toUpperCase()) ?? []
+        );
+        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);
     focusable && powerFocusable.focusElement(focusable);
   };
   #update(active) {
-    const current = new Set(this.#getFocusables());
+    const focusables = new Set(this.#getFocusables());
     for (const focusable of this.#focusables) {
-      if (!current.has(focusable)) {
-        focusable.isConnected && attributesUtils.restoreAttributes([focusable]);
+      if (!focusables.has(focusable)) {
+        _RovingTabIndex.#initialized.delete(focusable);
+        attributesUtils.restoreAttributes([focusable]);
         this.#focusables.delete(focusable);
-        this.#focusablesByFirstChar.forEach((focusables) => {
-          const index = focusables.indexOf(focusable);
-          index >= 0 && focusables.splice(index, 1);
-        });
+        for (const [key, focusables2] of this.#focusablesByFirstChar) {
+          const index = focusables2.indexOf(focusable);
+          if (index >= 0) {
+            focusables2.splice(index, 1);
+            !focusables2.length && this.#focusablesByFirstChar.delete(key);
+          }
+        }
       }
     }
     const { navigationOnly, noStart, typeahead } = this.#settings;
-    for (const focusable of current) {
+    for (const focusable of focusables) {
       if (this.#focusables.has(focusable)) {
         continue;
       }
       if (_RovingTabIndex.#initialized.has(focusable)) {
-        throw new TypeError("Already initialized");
+        continue;
       }
       this.#focusables.add(focusable);
       _RovingTabIndex.#initialized.add(focusable);
@@ -219,9 +234,9 @@ var RovingTabIndex = class _RovingTabIndex {
         });
       }
       keys.forEach((key) => {
-        const focusables = this.#focusablesByFirstChar.get(key) ?? [];
-        focusables.push(focusable);
-        this.#focusablesByFirstChar.set(key, focusables);
+        const focusables2 = this.#focusablesByFirstChar.get(key) ?? [];
+        focusables2.push(focusable);
+        this.#focusablesByFirstChar.set(key, focusables2);
       });
     }
     if (!navigationOnly) {
@@ -238,7 +253,7 @@ var RovingTabIndex = class _RovingTabIndex {
   }
   #createSelectorFilter() {
     const { selector } = this.#settings;
-    return (element) => !selector || [...this.#container.querySelectorAll(selector)].includes(element);
+    return (element) => !selector || element.matches(selector);
   }
   #getFocusables() {
     return powerFocusable.getFocusables(this.#container, {
@@ -254,7 +269,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.12
+ * @version 3.1.14
  * @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.12
+ * @version 3.1.14
  * @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.12
+ * @version 3.1.14
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.js

@@ -8,14 +8,8 @@ function createRovingTabIndex(container, options = {}) {
     return () => {
     };
   }
-  try {
-    const roving = new RovingTabIndex(container, options);
-    return () => roving.destroy();
-  } catch (error) {
-    error instanceof Error && console.warn(error.message || error);
-    return () => {
-    };
-  }
+  const roving = new RovingTabIndex(container, options);
+  return () => roving.destroy();
 }
 var RovingTabIndex = class _RovingTabIndex {
   static #initialized = /* @__PURE__ */ new Set();
@@ -53,9 +47,18 @@ var RovingTabIndex = class _RovingTabIndex {
       console.warn("Invalid noStart option. Fallback: false.");
       noStart = false;
     }
-    if (selector !== "" && (typeof selector !== "string" || !selector.trim())) {
-      console.warn("Invalid selector. Fallback: no selector string.");
-      selector = "";
+    if (selector !== "") {
+      if (typeof selector !== "string" || !selector.trim()) {
+        console.warn("Invalid selector. Fallback: no selector string.");
+        selector = "";
+      } else {
+        try {
+          container.querySelector(selector);
+        } catch {
+          console.warn("Invalid selector. Fallback: no selector string.");
+          selector = "";
+        }
+      }
     }
     if (typeof typeahead !== "boolean") {
       console.warn("Invalid typeahead option. Fallback: false.");
@@ -84,7 +87,10 @@ var RovingTabIndex = class _RovingTabIndex {
     this.#isDestroyed = true;
     this.#controller?.abort();
     this.#controller = null;
-    restoreAttributes([...this.#focusables]);
+    this.#focusables.forEach((focusable) => {
+      _RovingTabIndex.#initialized.delete(focusable);
+      restoreAttributes([focusable]);
+    });
     this.#focusables.clear();
     this.#focusablesByFirstChar.clear();
   }
@@ -137,14 +143,16 @@ var RovingTabIndex = class _RovingTabIndex {
     if (!(active instanceof Element)) {
       return;
     }
-    const current = this.#getFocusables();
-    if (!current.includes(active)) {
+    const candidates = this.#getFocusables().filter(
+      (focusable2) => this.#focusables.has(focusable2)
+    );
+    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;
@@ -154,46 +162,53 @@ 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;
+        newIndex = wrap ? rawIndex % candidates.length : Math.min(rawIndex, candidates.length - 1);
         break;
       }
       default: {
-        target = this.#focusablesByFirstChar.get(key.toUpperCase()) ?? [];
-        const foundIndex = target.findIndex(
-          (focusable2) => current.indexOf(focusable2) > currentIndex
+        const focusables = new Set(
+          this.#focusablesByFirstChar.get(key.toUpperCase()) ?? []
+        );
+        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);
     focusable && focusElement(focusable);
   };
   #update(active) {
-    const current = new Set(this.#getFocusables());
+    const focusables = new Set(this.#getFocusables());
     for (const focusable of this.#focusables) {
-      if (!current.has(focusable)) {
-        focusable.isConnected && restoreAttributes([focusable]);
+      if (!focusables.has(focusable)) {
+        _RovingTabIndex.#initialized.delete(focusable);
+        restoreAttributes([focusable]);
         this.#focusables.delete(focusable);
-        this.#focusablesByFirstChar.forEach((focusables) => {
-          const index = focusables.indexOf(focusable);
-          index >= 0 && focusables.splice(index, 1);
-        });
+        for (const [key, focusables2] of this.#focusablesByFirstChar) {
+          const index = focusables2.indexOf(focusable);
+          if (index >= 0) {
+            focusables2.splice(index, 1);
+            !focusables2.length && this.#focusablesByFirstChar.delete(key);
+          }
+        }
       }
     }
     const { navigationOnly, noStart, typeahead } = this.#settings;
-    for (const focusable of current) {
+    for (const focusable of focusables) {
       if (this.#focusables.has(focusable)) {
         continue;
       }
       if (_RovingTabIndex.#initialized.has(focusable)) {
-        throw new TypeError("Already initialized");
+        continue;
       }
       this.#focusables.add(focusable);
       _RovingTabIndex.#initialized.add(focusable);
@@ -217,9 +232,9 @@ var RovingTabIndex = class _RovingTabIndex {
         });
       }
       keys.forEach((key) => {
-        const focusables = this.#focusablesByFirstChar.get(key) ?? [];
-        focusables.push(focusable);
-        this.#focusablesByFirstChar.set(key, focusables);
+        const focusables2 = this.#focusablesByFirstChar.get(key) ?? [];
+        focusables2.push(focusable);
+        this.#focusablesByFirstChar.set(key, focusables2);
       });
     }
     if (!navigationOnly) {
@@ -236,7 +251,7 @@ var RovingTabIndex = class _RovingTabIndex {
   }
   #createSelectorFilter() {
     const { selector } = this.#settings;
-    return (element) => !selector || [...this.#container.querySelectorAll(selector)].includes(element);
+    return (element) => !selector || element.matches(selector);
   }
   #getFocusables() {
     return getFocusables(this.#container, {
@@ -252,7 +267,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.12
+ * @version 3.1.14
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@y14e/roving-tabindex",
-  "version": "3.1.12",
+  "version": "3.1.14",
   "description": "Lightweight roving tabindex utility with fully focus management",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -57,6 +57,6 @@
   },
   "dependencies": {
     "@y14e/attributes-utils": "^1.1.3",
-    "power-focusable": "^4.3.12"
+    "power-focusable": "^4.3.18"
   }
 }