@y14e/roving-tabindex 1.2.3 → 1.2.5

package/dist/index.cjs

@@ -1,23 +1,28 @@
 'use strict';
 
 // node_modules/@y14e/attributes-utils/dist/index.js
+var defaultParser = (value) => value.split(/\s+/);
+var defaultSerializer = (tokens) => tokens.join(" ");
 function addTokenToAttribute(element, attribute, token, options = {}) {
-  const { caseInsensitive = false } = options;
+  const {
+    caseInsensitive = false,
+    parse = defaultParser,
+    serialize = defaultSerializer
+  } = options;
   const value = element.getAttribute(attribute)?.trim();
-  const tokens = value ? value.split(/\s+/) : [];
+  const tokens = value ? parse(value).filter(Boolean) : [];
   if (caseInsensitive) {
     const lower = token.toLowerCase();
     if (tokens.some((token2) => token2.toLowerCase() === lower)) {
       return;
     }
     tokens.push(token);
-    element.setAttribute(attribute, tokens.join(" "));
+    element.setAttribute(attribute, serialize(tokens));
     return;
   }
   const set = new Set(tokens);
   set.add(token);
-  element.setAttribute(attribute, [...set].join(" "));
-  return;
+  element.setAttribute(attribute, serialize([...set]));
 }
 var snapshots = /* @__PURE__ */ new WeakMap();
 function restoreAttributes(elements) {
@@ -27,11 +32,7 @@ function restoreAttributes(elements) {
       continue;
     }
     for (const [attribute, value] of snapshot.entries()) {
-      if (value === null) {
-        element.removeAttribute(attribute);
-      } else {
-        element.setAttribute(attribute, value);
-      }
+      value === null ? element.removeAttribute(attribute) : element.setAttribute(attribute, value);
     }
     snapshots.delete(element);
   }
@@ -344,16 +345,16 @@ var RovingTabIndex = class {
     if (!(active instanceof HTMLElement)) {
       return;
     }
-    const focusables = this.#getFocusables();
-    if (!focusables.includes(active)) {
+    const current = this.#getFocusables();
+    if (!current.includes(active)) {
       return;
     }
     event.preventDefault();
     event.stopPropagation();
-    const currentIndex = focusables.indexOf(active);
+    const currentIndex = current.indexOf(active);
     let rawIndex;
     let newIndex = currentIndex;
-    let target = focusables;
+    let target = current;
     switch (key) {
       case "End":
         newIndex = -1;
@@ -369,7 +370,7 @@ var RovingTabIndex = class {
       case "ArrowRight":
       case "ArrowDown":
         rawIndex = currentIndex + 1;
-        newIndex = wrap ? rawIndex % focusables.length : Math.min(rawIndex, focusables.length - 1);
+        newIndex = wrap ? rawIndex % current.length : Math.min(rawIndex, current.length - 1);
         break;
       default: {
         if (!typeahead) {
@@ -377,7 +378,7 @@ var RovingTabIndex = class {
         }
         target = this.#focusablesByFirstChar.get(key.toUpperCase()) ?? [];
         const foundIndex = target.findIndex(
-          (focusable2) => focusables.indexOf(focusable2) > currentIndex
+          (focusable2) => current.indexOf(focusable2) > currentIndex
         );
         newIndex = foundIndex !== -1 ? foundIndex : 0;
       }
@@ -407,36 +408,36 @@ var RovingTabIndex = class {
       this.#focusables.delete(focusable);
       this.#focusablesByFirstChar.forEach((focusables) => {
         const index = focusables.indexOf(focusable);
-        if (index !== -1) {
+        if (index >= 0) {
           focusables.splice(index, 1);
         }
       });
     }
-    for (const c of current) {
-      if (this.#focusables.has(c)) {
+    for (const focusable of current) {
+      if (this.#focusables.has(focusable)) {
         continue;
       }
-      this.#focusables.add(c);
-      saveAttributes([c], ["tabindex"]);
-      c.setAttribute("tabindex", "-1");
+      this.#focusables.add(focusable);
+      saveAttributes([focusable], ["tabindex"]);
+      focusable.setAttribute("tabindex", "-1");
       if (!this.#options.typeahead) {
         continue;
       }
-      const value = c.ariaKeyShortcuts?.trim();
+      const value = focusable.ariaKeyShortcuts?.trim();
       const keys = new Set(
         value ? value.split(/\s+/).filter((key) => /^\S$/i.test(key)).map((key) => key.toUpperCase()) : []
       );
-      const char = c.textContent?.trim()?.at(0)?.toUpperCase();
+      const char = focusable.textContent?.trim()?.at(0)?.toUpperCase();
       if (char) {
         keys.add(char);
-        saveAttributes([c], ["aria-keyshortcuts"]);
-        addTokenToAttribute(c, "aria-keyshortcuts", char, {
+        saveAttributes([focusable], ["aria-keyshortcuts"]);
+        addTokenToAttribute(focusable, "aria-keyshortcuts", char, {
           caseInsensitive: true
         });
       }
       keys.forEach((key) => {
         const focusables = this.#focusablesByFirstChar.get(key) ?? [];
-        focusables.push(c);
+        focusables.push(focusable);
         this.#focusablesByFirstChar.set(key, focusables);
       });
     }
@@ -477,7 +478,7 @@ function getActiveElement() {
  * Lightweight roving tabindex utility with fully focus management.
  * Designed for accessible menus, tabs, toolbars, and composite widgets.
  *
- * @version 1.2.3
+ * @version 1.2.5
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -489,7 +490,7 @@ function getActiveElement() {
   (**
    * Attributes Utils
    *
-   * @version 1.0.3
+   * @version 1.0.5
    * @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 1.2.3
+ * @version 1.2.5
  * @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 1.2.3
+ * @version 1.2.5
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.js

@@ -1,21 +1,26 @@
 // node_modules/@y14e/attributes-utils/dist/index.js
+var defaultParser = (value) => value.split(/\s+/);
+var defaultSerializer = (tokens) => tokens.join(" ");
 function addTokenToAttribute(element, attribute, token, options = {}) {
-  const { caseInsensitive = false } = options;
+  const {
+    caseInsensitive = false,
+    parse = defaultParser,
+    serialize = defaultSerializer
+  } = options;
   const value = element.getAttribute(attribute)?.trim();
-  const tokens = value ? value.split(/\s+/) : [];
+  const tokens = value ? parse(value).filter(Boolean) : [];
   if (caseInsensitive) {
     const lower = token.toLowerCase();
     if (tokens.some((token2) => token2.toLowerCase() === lower)) {
       return;
     }
     tokens.push(token);
-    element.setAttribute(attribute, tokens.join(" "));
+    element.setAttribute(attribute, serialize(tokens));
     return;
   }
   const set = new Set(tokens);
   set.add(token);
-  element.setAttribute(attribute, [...set].join(" "));
-  return;
+  element.setAttribute(attribute, serialize([...set]));
 }
 var snapshots = /* @__PURE__ */ new WeakMap();
 function restoreAttributes(elements) {
@@ -25,11 +30,7 @@ function restoreAttributes(elements) {
       continue;
     }
     for (const [attribute, value] of snapshot.entries()) {
-      if (value === null) {
-        element.removeAttribute(attribute);
-      } else {
-        element.setAttribute(attribute, value);
-      }
+      value === null ? element.removeAttribute(attribute) : element.setAttribute(attribute, value);
     }
     snapshots.delete(element);
   }
@@ -342,16 +343,16 @@ var RovingTabIndex = class {
     if (!(active instanceof HTMLElement)) {
       return;
     }
-    const focusables = this.#getFocusables();
-    if (!focusables.includes(active)) {
+    const current = this.#getFocusables();
+    if (!current.includes(active)) {
       return;
     }
     event.preventDefault();
     event.stopPropagation();
-    const currentIndex = focusables.indexOf(active);
+    const currentIndex = current.indexOf(active);
     let rawIndex;
     let newIndex = currentIndex;
-    let target = focusables;
+    let target = current;
     switch (key) {
       case "End":
         newIndex = -1;
@@ -367,7 +368,7 @@ var RovingTabIndex = class {
       case "ArrowRight":
       case "ArrowDown":
         rawIndex = currentIndex + 1;
-        newIndex = wrap ? rawIndex % focusables.length : Math.min(rawIndex, focusables.length - 1);
+        newIndex = wrap ? rawIndex % current.length : Math.min(rawIndex, current.length - 1);
         break;
       default: {
         if (!typeahead) {
@@ -375,7 +376,7 @@ var RovingTabIndex = class {
         }
         target = this.#focusablesByFirstChar.get(key.toUpperCase()) ?? [];
         const foundIndex = target.findIndex(
-          (focusable2) => focusables.indexOf(focusable2) > currentIndex
+          (focusable2) => current.indexOf(focusable2) > currentIndex
         );
         newIndex = foundIndex !== -1 ? foundIndex : 0;
       }
@@ -405,36 +406,36 @@ var RovingTabIndex = class {
       this.#focusables.delete(focusable);
       this.#focusablesByFirstChar.forEach((focusables) => {
         const index = focusables.indexOf(focusable);
-        if (index !== -1) {
+        if (index >= 0) {
           focusables.splice(index, 1);
         }
       });
     }
-    for (const c of current) {
-      if (this.#focusables.has(c)) {
+    for (const focusable of current) {
+      if (this.#focusables.has(focusable)) {
         continue;
       }
-      this.#focusables.add(c);
-      saveAttributes([c], ["tabindex"]);
-      c.setAttribute("tabindex", "-1");
+      this.#focusables.add(focusable);
+      saveAttributes([focusable], ["tabindex"]);
+      focusable.setAttribute("tabindex", "-1");
       if (!this.#options.typeahead) {
         continue;
       }
-      const value = c.ariaKeyShortcuts?.trim();
+      const value = focusable.ariaKeyShortcuts?.trim();
       const keys = new Set(
         value ? value.split(/\s+/).filter((key) => /^\S$/i.test(key)).map((key) => key.toUpperCase()) : []
       );
-      const char = c.textContent?.trim()?.at(0)?.toUpperCase();
+      const char = focusable.textContent?.trim()?.at(0)?.toUpperCase();
       if (char) {
         keys.add(char);
-        saveAttributes([c], ["aria-keyshortcuts"]);
-        addTokenToAttribute(c, "aria-keyshortcuts", char, {
+        saveAttributes([focusable], ["aria-keyshortcuts"]);
+        addTokenToAttribute(focusable, "aria-keyshortcuts", char, {
           caseInsensitive: true
         });
       }
       keys.forEach((key) => {
         const focusables = this.#focusablesByFirstChar.get(key) ?? [];
-        focusables.push(c);
+        focusables.push(focusable);
         this.#focusablesByFirstChar.set(key, focusables);
       });
     }
@@ -475,7 +476,7 @@ function getActiveElement() {
  * Lightweight roving tabindex utility with fully focus management.
  * Designed for accessible menus, tabs, toolbars, and composite widgets.
  *
- * @version 1.2.3
+ * @version 1.2.5
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -487,7 +488,7 @@ function getActiveElement() {
   (**
    * Attributes Utils
    *
-   * @version 1.0.3
+   * @version 1.0.5
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@y14e/roving-tabindex",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "Lightweight roving tabindex utility with fully focus management",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -48,7 +48,7 @@
   },
   "homepage": "https://github.com/y14e/roving-tabindex#readme",
   "devDependencies": {
-    "@y14e/attributes-utils": "^1.0.3",
+    "@y14e/attributes-utils": "^1.0.5",
     "bun-types": "latest",
     "power-focusable": "^4.1.7",
     "tsup": "^8.0.0",