npm - @y14e/roving-tabindex - Versions diffs - 3.1.11 → 3.1.13 - Mend

@y14e/roving-tabindex 3.1.11 → 3.1.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/README.md CHANGED Viewed

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

package/dist/index.bundle.cjs CHANGED Viewed

@@ -51,6 +51,10 @@ 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(
+  /(,\s*)?\[tabindex="-1"\]/g,
+  ""
+);
 function getFocusables(container = document.body, options = {}) {
   if (!(container instanceof Element)) {
     console.warn("Invalid container element. Fallback: <body> element.");
@@ -90,21 +94,27 @@ function getFocusables(container = document.body, options = {}) {
   const elements = [];
   if (composed || include) {
     let traverse2 = function(node) {
-      if (!(node instanceof Element)) {
-        return;
-      }
-      if (isFocusable(node, { skipNegativeTabIndexCheck, skipVisibilityCheck }) || include?.(node)) {
+      if (isFocusable(node, {
+        skipNegativeTabIndexCheck,
+        skipVisibilityCheck
+      }) || include?.(node)) {
         elements[elements.length] = node;
       }
-      const children = getComposedChildren(node);
-      for (let i = 0, l = children.length; i < l; i++) {
-        const child = children[i];
+      const children2 = composed ? getComposedChildren(node) : getChildren(node);
+      for (let i = 0, l = children2.length; i < l; i++) {
+        const child = children2[i];
         child && traverse2(child);
       }
     };
-    traverse2(container);
+    const children = composed ? getComposedChildren(container) : getChildren(container);
+    for (let i = 0, l = children.length; i < l; i++) {
+      const child = children[i];
+      child && traverse2(child);
+    }
   } else {
-    const candidates = container.querySelectorAll(FOCUSABLE_SELECTOR);
+    const candidates = container.querySelectorAll(
+      skipNegativeTabIndexCheck ? FOCUSABLE_SELECTOR_WITH_NEGATIVE_TAB_INDEX : FOCUSABLE_SELECTOR
+    );
     for (let i = 0, l = candidates.length; i < l; i++) {
       const candidate = candidates[i];
       if (candidate && isFocusable(candidate, {
@@ -115,8 +125,8 @@ function getFocusables(container = document.body, options = {}) {
       }
     }
   }
-  const unfiltered = normalizeRadioGroup(sortByTabIndex(elements));
-  return filter ? unfiltered.filter(filter) : unfiltered;
+  const filtered = filter ? elements.filter(filter) : elements;
+  return normalizeRadioGroup(sortByTabIndex(filtered));
 }
 function isFocusable(element, options = {}) {
   if (!(element instanceof Element)) {
@@ -139,7 +149,7 @@ function isFocusable(element, options = {}) {
     return false;
   }
   if (!element.matches(
-    skipNegativeTabIndexCheck ? FOCUSABLE_SELECTOR.replace(/(,\s*)?\[tabindex="-1"\]/g, "") : FOCUSABLE_SELECTOR
+    skipNegativeTabIndexCheck ? FOCUSABLE_SELECTOR_WITH_NEGATIVE_TAB_INDEX : FOCUSABLE_SELECTOR
   )) {
     return false;
   }
@@ -185,7 +195,7 @@ function isDisabledDeep(element) {
   return false;
 }
 function normalizeRadioGroup(elements) {
-  let map = null;
+  let rootMap = null;
   for (let i = 0, l = elements.length; i < l; i++) {
     const element = elements[i];
     if (!(element instanceof HTMLInputElement)) {
@@ -194,25 +204,45 @@ function normalizeRadioGroup(elements) {
     if (!isUngroupedRadio(element)) {
       continue;
     }
-    if (!map) {
-      map = /* @__PURE__ */ new Map();
+    if (!rootMap) {
+      rootMap = /* @__PURE__ */ new Map();
     }
-    const key = `${element.form?.id ?? "no-form"}::${element.name}`;
-    const group = map.get(key) ?? map.set(key, []).get(key);
-    if (group) {
-      group[group.length] = element;
+    const root = element.getRootNode();
+    let formMap = rootMap.get(root);
+    if (!formMap) {
+      formMap = /* @__PURE__ */ new Map();
+      rootMap.set(root, formMap);
     }
+    let nameMap = formMap.get(element.form);
+    if (!nameMap) {
+      nameMap = /* @__PURE__ */ new Map();
+      formMap.set(element.form, nameMap);
+    }
+    let group = nameMap.get(element.name);
+    if (!group) {
+      group = [];
+      nameMap.set(element.name, group);
+    }
+    group[group.length] = element;
   }
-  if (!map) {
+  if (!rootMap) {
     return elements;
   }
   const placeholder = /* @__PURE__ */ new Set();
-  for (const group of map.values()) {
-    placeholder.add(group.find((radio) => radio.checked) ?? group[0]);
+  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];
+        radio && placeholder.add(radio);
+      }
+    }
   }
-  return elements.filter(
-    (element) => isUngroupedRadio(element) ? placeholder.has(element) : true
-  );
+  return elements.filter((element) => {
+    if (!(element instanceof HTMLInputElement)) {
+      return true;
+    }
+    return !isUngroupedRadio(element) || placeholder.has(element);
+  });
 }
 function sortByTabIndex(elements) {
   const ordered = [];
@@ -284,7 +314,7 @@ function isInert(element) {
   return "inert" in element && !!element.inert;
 }
 function isUngroupedRadio(element) {
-  return element instanceof HTMLInputElement && element.type === "radio" && !!element.name;
+  return element.type === "radio" && !!element.name;
 }
 // src/index.ts
@@ -294,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();
@@ -339,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.");
@@ -370,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();
   }
@@ -423,7 +459,9 @@ var RovingTabIndex = class _RovingTabIndex {
     if (!(active instanceof Element)) {
       return;
     }
-    const current = this.#getFocusables();
+    const current = this.#getFocusables().filter(
+      (focusable2) => this.#focusables.has(focusable2)
+    );
     if (!current.includes(active)) {
       return;
     }
@@ -451,7 +489,10 @@ var RovingTabIndex = class _RovingTabIndex {
         break;
       }
       default: {
-        target = this.#focusablesByFirstChar.get(key.toUpperCase()) ?? [];
+        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
         );
@@ -465,12 +506,16 @@ var RovingTabIndex = class _RovingTabIndex {
     const current = new Set(this.#getFocusables());
     for (const focusable of this.#focusables) {
       if (!current.has(focusable)) {
-        focusable.isConnected && restoreAttributes([focusable]);
+        _RovingTabIndex.#initialized.delete(focusable);
+        restoreAttributes([focusable]);
         this.#focusables.delete(focusable);
-        this.#focusablesByFirstChar.forEach((focusables) => {
+        for (const [key, focusables] of this.#focusablesByFirstChar) {
           const index = focusables.indexOf(focusable);
-          index >= 0 && focusables.splice(index, 1);
-        });
+          if (index >= 0) {
+            focusables.splice(index, 1);
+            !focusables.length && this.#focusablesByFirstChar.delete(key);
+          }
+        }
       }
     }
     const { navigationOnly, noStart, typeahead } = this.#settings;
@@ -479,7 +524,7 @@ var RovingTabIndex = class _RovingTabIndex {
         continue;
       }
       if (_RovingTabIndex.#initialized.has(focusable)) {
-        throw new TypeError("Already initialized");
+        continue;
       }
       this.#focusables.add(focusable);
       _RovingTabIndex.#initialized.add(focusable);
@@ -522,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, {
@@ -538,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.11
+ * @version 3.1.13
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -563,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.11
+   * @version 4.3.12
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.bundle.js CHANGED Viewed

@@ -49,6 +49,10 @@ 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(
+  /(,\s*)?\[tabindex="-1"\]/g,
+  ""
+);
 function getFocusables(container = document.body, options = {}) {
   if (!(container instanceof Element)) {
     console.warn("Invalid container element. Fallback: <body> element.");
@@ -88,21 +92,27 @@ function getFocusables(container = document.body, options = {}) {
   const elements = [];
   if (composed || include) {
     let traverse2 = function(node) {
-      if (!(node instanceof Element)) {
-        return;
-      }
-      if (isFocusable(node, { skipNegativeTabIndexCheck, skipVisibilityCheck }) || include?.(node)) {
+      if (isFocusable(node, {
+        skipNegativeTabIndexCheck,
+        skipVisibilityCheck
+      }) || include?.(node)) {
         elements[elements.length] = node;
       }
-      const children = getComposedChildren(node);
-      for (let i = 0, l = children.length; i < l; i++) {
-        const child = children[i];
+      const children2 = composed ? getComposedChildren(node) : getChildren(node);
+      for (let i = 0, l = children2.length; i < l; i++) {
+        const child = children2[i];
         child && traverse2(child);
       }
     };
-    traverse2(container);
+    const children = composed ? getComposedChildren(container) : getChildren(container);
+    for (let i = 0, l = children.length; i < l; i++) {
+      const child = children[i];
+      child && traverse2(child);
+    }
   } else {
-    const candidates = container.querySelectorAll(FOCUSABLE_SELECTOR);
+    const candidates = container.querySelectorAll(
+      skipNegativeTabIndexCheck ? FOCUSABLE_SELECTOR_WITH_NEGATIVE_TAB_INDEX : FOCUSABLE_SELECTOR
+    );
     for (let i = 0, l = candidates.length; i < l; i++) {
       const candidate = candidates[i];
       if (candidate && isFocusable(candidate, {
@@ -113,8 +123,8 @@ function getFocusables(container = document.body, options = {}) {
       }
     }
   }
-  const unfiltered = normalizeRadioGroup(sortByTabIndex(elements));
-  return filter ? unfiltered.filter(filter) : unfiltered;
+  const filtered = filter ? elements.filter(filter) : elements;
+  return normalizeRadioGroup(sortByTabIndex(filtered));
 }
 function isFocusable(element, options = {}) {
   if (!(element instanceof Element)) {
@@ -137,7 +147,7 @@ function isFocusable(element, options = {}) {
     return false;
   }
   if (!element.matches(
-    skipNegativeTabIndexCheck ? FOCUSABLE_SELECTOR.replace(/(,\s*)?\[tabindex="-1"\]/g, "") : FOCUSABLE_SELECTOR
+    skipNegativeTabIndexCheck ? FOCUSABLE_SELECTOR_WITH_NEGATIVE_TAB_INDEX : FOCUSABLE_SELECTOR
   )) {
     return false;
   }
@@ -183,7 +193,7 @@ function isDisabledDeep(element) {
   return false;
 }
 function normalizeRadioGroup(elements) {
-  let map = null;
+  let rootMap = null;
   for (let i = 0, l = elements.length; i < l; i++) {
     const element = elements[i];
     if (!(element instanceof HTMLInputElement)) {
@@ -192,25 +202,45 @@ function normalizeRadioGroup(elements) {
     if (!isUngroupedRadio(element)) {
       continue;
     }
-    if (!map) {
-      map = /* @__PURE__ */ new Map();
+    if (!rootMap) {
+      rootMap = /* @__PURE__ */ new Map();
     }
-    const key = `${element.form?.id ?? "no-form"}::${element.name}`;
-    const group = map.get(key) ?? map.set(key, []).get(key);
-    if (group) {
-      group[group.length] = element;
+    const root = element.getRootNode();
+    let formMap = rootMap.get(root);
+    if (!formMap) {
+      formMap = /* @__PURE__ */ new Map();
+      rootMap.set(root, formMap);
     }
+    let nameMap = formMap.get(element.form);
+    if (!nameMap) {
+      nameMap = /* @__PURE__ */ new Map();
+      formMap.set(element.form, nameMap);
+    }
+    let group = nameMap.get(element.name);
+    if (!group) {
+      group = [];
+      nameMap.set(element.name, group);
+    }
+    group[group.length] = element;
   }
-  if (!map) {
+  if (!rootMap) {
     return elements;
   }
   const placeholder = /* @__PURE__ */ new Set();
-  for (const group of map.values()) {
-    placeholder.add(group.find((radio) => radio.checked) ?? group[0]);
+  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];
+        radio && placeholder.add(radio);
+      }
+    }
   }
-  return elements.filter(
-    (element) => isUngroupedRadio(element) ? placeholder.has(element) : true
-  );
+  return elements.filter((element) => {
+    if (!(element instanceof HTMLInputElement)) {
+      return true;
+    }
+    return !isUngroupedRadio(element) || placeholder.has(element);
+  });
 }
 function sortByTabIndex(elements) {
   const ordered = [];
@@ -282,7 +312,7 @@ function isInert(element) {
   return "inert" in element && !!element.inert;
 }
 function isUngroupedRadio(element) {
-  return element instanceof HTMLInputElement && element.type === "radio" && !!element.name;
+  return element.type === "radio" && !!element.name;
 }
 // src/index.ts
@@ -292,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();
@@ -337,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.");
@@ -368,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();
   }
@@ -421,7 +457,9 @@ var RovingTabIndex = class _RovingTabIndex {
     if (!(active instanceof Element)) {
       return;
     }
-    const current = this.#getFocusables();
+    const current = this.#getFocusables().filter(
+      (focusable2) => this.#focusables.has(focusable2)
+    );
     if (!current.includes(active)) {
       return;
     }
@@ -449,7 +487,10 @@ var RovingTabIndex = class _RovingTabIndex {
         break;
       }
       default: {
-        target = this.#focusablesByFirstChar.get(key.toUpperCase()) ?? [];
+        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
         );
@@ -463,12 +504,16 @@ var RovingTabIndex = class _RovingTabIndex {
     const current = new Set(this.#getFocusables());
     for (const focusable of this.#focusables) {
       if (!current.has(focusable)) {
-        focusable.isConnected && restoreAttributes([focusable]);
+        _RovingTabIndex.#initialized.delete(focusable);
+        restoreAttributes([focusable]);
         this.#focusables.delete(focusable);
-        this.#focusablesByFirstChar.forEach((focusables) => {
+        for (const [key, focusables] of this.#focusablesByFirstChar) {
           const index = focusables.indexOf(focusable);
-          index >= 0 && focusables.splice(index, 1);
-        });
+          if (index >= 0) {
+            focusables.splice(index, 1);
+            !focusables.length && this.#focusablesByFirstChar.delete(key);
+          }
+        }
       }
     }
     const { navigationOnly, noStart, typeahead } = this.#settings;
@@ -477,7 +522,7 @@ var RovingTabIndex = class _RovingTabIndex {
         continue;
       }
       if (_RovingTabIndex.#initialized.has(focusable)) {
-        throw new TypeError("Already initialized");
+        continue;
       }
       this.#focusables.add(focusable);
       _RovingTabIndex.#initialized.add(focusable);
@@ -520,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, {
@@ -536,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.11
+ * @version 3.1.13
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -561,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.11
+   * @version 4.3.12
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.cjs CHANGED Viewed

@@ -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,7 +145,9 @@ var RovingTabIndex = class _RovingTabIndex {
     if (!(active instanceof Element)) {
       return;
     }
-    const current = this.#getFocusables();
+    const current = this.#getFocusables().filter(
+      (focusable2) => this.#focusables.has(focusable2)
+    );
     if (!current.includes(active)) {
       return;
     }
@@ -167,7 +175,10 @@ var RovingTabIndex = class _RovingTabIndex {
         break;
       }
       default: {
-        target = this.#focusablesByFirstChar.get(key.toUpperCase()) ?? [];
+        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
         );
@@ -181,12 +192,16 @@ var RovingTabIndex = class _RovingTabIndex {
     const current = new Set(this.#getFocusables());
     for (const focusable of this.#focusables) {
       if (!current.has(focusable)) {
-        focusable.isConnected && attributesUtils.restoreAttributes([focusable]);
+        _RovingTabIndex.#initialized.delete(focusable);
+        attributesUtils.restoreAttributes([focusable]);
         this.#focusables.delete(focusable);
-        this.#focusablesByFirstChar.forEach((focusables) => {
+        for (const [key, focusables] of this.#focusablesByFirstChar) {
           const index = focusables.indexOf(focusable);
-          index >= 0 && focusables.splice(index, 1);
-        });
+          if (index >= 0) {
+            focusables.splice(index, 1);
+            !focusables.length && this.#focusablesByFirstChar.delete(key);
+          }
+        }
       }
     }
     const { navigationOnly, noStart, typeahead } = this.#settings;
@@ -195,7 +210,7 @@ var RovingTabIndex = class _RovingTabIndex {
         continue;
       }
       if (_RovingTabIndex.#initialized.has(focusable)) {
-        throw new TypeError("Already initialized");
+        continue;
       }
       this.#focusables.add(focusable);
       _RovingTabIndex.#initialized.add(focusable);
@@ -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.11
+ * @version 3.1.13
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.d.cts CHANGED Viewed

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

package/dist/index.d.ts CHANGED Viewed

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

package/dist/index.js CHANGED Viewed

@@ -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,7 +143,9 @@ var RovingTabIndex = class _RovingTabIndex {
     if (!(active instanceof Element)) {
       return;
     }
-    const current = this.#getFocusables();
+    const current = this.#getFocusables().filter(
+      (focusable2) => this.#focusables.has(focusable2)
+    );
     if (!current.includes(active)) {
       return;
     }
@@ -165,7 +173,10 @@ var RovingTabIndex = class _RovingTabIndex {
         break;
       }
       default: {
-        target = this.#focusablesByFirstChar.get(key.toUpperCase()) ?? [];
+        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
         );
@@ -179,12 +190,16 @@ var RovingTabIndex = class _RovingTabIndex {
     const current = new Set(this.#getFocusables());
     for (const focusable of this.#focusables) {
       if (!current.has(focusable)) {
-        focusable.isConnected && restoreAttributes([focusable]);
+        _RovingTabIndex.#initialized.delete(focusable);
+        restoreAttributes([focusable]);
         this.#focusables.delete(focusable);
-        this.#focusablesByFirstChar.forEach((focusables) => {
+        for (const [key, focusables] of this.#focusablesByFirstChar) {
           const index = focusables.indexOf(focusable);
-          index >= 0 && focusables.splice(index, 1);
-        });
+          if (index >= 0) {
+            focusables.splice(index, 1);
+            !focusables.length && this.#focusablesByFirstChar.delete(key);
+          }
+        }
       }
     }
     const { navigationOnly, noStart, typeahead } = this.#settings;
@@ -193,7 +208,7 @@ var RovingTabIndex = class _RovingTabIndex {
         continue;
       }
       if (_RovingTabIndex.#initialized.has(focusable)) {
-        throw new TypeError("Already initialized");
+        continue;
       }
       this.#focusables.add(focusable);
       _RovingTabIndex.#initialized.add(focusable);
@@ -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.11
+ * @version 3.1.13
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@y14e/roving-tabindex",
-  "version": "3.1.11",
+  "version": "3.1.13",
   "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.11"
+    "power-focusable": "^4.3.12"
   }
 }