@y14e/roving-tabindex 3.1.12 → 3.1.13

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.13';
 // 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.13/+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.13';
 ```
 
 ## 📦 APIs

package/dist/index.bundle.cjs

@@ -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,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;
     }
@@ -481,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
         );
@@ -495,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;
@@ -509,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);
@@ -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.13
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.bundle.js

@@ -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,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;
     }
@@ -479,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
         );
@@ -493,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;
@@ -507,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);
@@ -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.13
  * @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,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.12
+ * @version 3.1.13
  * @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.13
  * @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.13
  * @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,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.12
+ * @version 3.1.13
  * @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.13",
   "description": "Lightweight roving tabindex utility with fully focus management",
   "type": "module",
   "main": "./dist/index.cjs",