@y14e/roving-tabindex 1.0.0 → 1.0.2

package/dist/index.cjs

@@ -1,5 +1,36 @@
 'use strict';
 
+// node_modules/@y14e/attributes-utils/dist/index.js
+var snapshots = /* @__PURE__ */ new WeakMap();
+function restoreAttributes(elements) {
+  elements.forEach((element) => {
+    const snapshot = snapshots.get(element);
+    if (!snapshot) {
+      return;
+    }
+    for (const [attribute, value] of snapshot.entries()) {
+      if (value === null) {
+        element.removeAttribute(attribute);
+      } else {
+        element.setAttribute(attribute, value);
+      }
+    }
+    snapshots.delete(element);
+  });
+}
+function saveAttributes(elements, attributes) {
+  elements.forEach((element) => {
+    let snapshot = snapshots.get(element);
+    if (!snapshot) {
+      snapshot = /* @__PURE__ */ new Map();
+      snapshots.set(element, snapshot);
+    }
+    attributes.forEach((attribute) => {
+      snapshot.set(attribute, element.getAttribute(attribute));
+    });
+  });
+}
+
 // 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"])`;
 function getFocusables(container = document.body, options = {}) {
@@ -207,6 +238,19 @@ function createRovingTabIndex(container, options = {}) {
   if (!(container instanceof Element)) {
     throw new Error("Invalid container element");
   }
+  const { direction, selector, wrap = false } = options;
+  if (direction && !["horizontal", "vertical"].includes(direction)) {
+    console.warn("Invalid direction. Fallback: both (undefined).");
+    Object.assign(options, { direction: void 0 });
+  }
+  if (typeof selector !== "string") {
+    console.warn("Invalid selector. Fallback: all focusable elements.");
+    Object.assign(options, { selector: void 0 });
+  }
+  if (typeof wrap !== "boolean") {
+    console.warn("Invalid wrap. Fallback: false.");
+    Object.assign(options, { wrap: false });
+  }
   const roving = new RovingTabIndex(container, options);
   return () => roving.destroy();
 }
@@ -214,26 +258,12 @@ var RovingTabIndex = class {
   #container;
   #options;
   #focusables = /* @__PURE__ */ new Set();
-  #tabIndexes = /* @__PURE__ */ new Map();
   #selectorFilter;
   #controller = null;
   #isDestroyed = false;
   constructor(container, options = {}) {
     this.#container = container;
     this.#options = options;
-    const { direction, selector, wrap = false } = this.#options;
-    if (direction && !["horizontal", "vertical"].includes(direction)) {
-      console.warn("Invalid direction. Fallback: both (undefined).");
-      Object.assign(this.#options, { direction: void 0 });
-    }
-    if (typeof selector !== "string") {
-      console.warn("Invalid selector. Fallback: all focusable elements.");
-      Object.assign(this.#options, { selector: void 0 });
-    }
-    if (typeof wrap !== "boolean") {
-      console.warn("Invalid wrap. Fallback: false.");
-      Object.assign(this.#options, { wrap: false });
-    }
     this.#selectorFilter = this.#createSelectorFilter();
     this.#initialize();
   }
@@ -244,16 +274,8 @@ var RovingTabIndex = class {
     this.#isDestroyed = true;
     this.#controller?.abort();
     this.#controller = null;
-    this.#focusables.forEach((focusable) => {
-      const index = this.#tabIndexes.get(focusable);
-      if (index == null) {
-        focusable.removeAttribute("tabindex");
-      } else {
-        focusable.setAttribute("tabindex", index);
-      }
-    });
+    restoreAttributes([...this.#focusables]);
     this.#focusables.clear();
-    this.#tabIndexes.clear();
     this.#container.removeAttribute("data-roving-tabindex-initialized");
   }
   #initialize() {
@@ -336,22 +358,16 @@ var RovingTabIndex = class {
         return;
       }
       if (focusable.isConnected) {
-        const index = this.#tabIndexes.get(focusable);
-        if (index == null) {
-          focusable.removeAttribute("tabindex");
-        } else {
-          focusable.setAttribute("tabindex", index);
-        }
+        restoreAttributes([focusable]);
       }
       this.#focusables.delete(focusable);
-      this.#tabIndexes.delete(focusable);
     });
     current.forEach((c) => {
       if (this.#focusables.has(c)) {
         return;
       }
       this.#focusables.add(c);
-      this.#tabIndexes.set(c, c.getAttribute("tabindex"));
+      saveAttributes([c], ["tabindex"]);
       c.setAttribute("tabindex", "-1");
     });
     if (active && this.#focusables.has(active)) {
@@ -366,7 +382,7 @@ var RovingTabIndex = class {
   }
   #createSelectorFilter() {
     const { selector } = this.#options;
-    return (element) => !selector || element.matches(selector);
+    return (element) => !selector || [...this.#container.querySelectorAll(selector)].includes(element);
   }
   #getFocusables() {
     return getFocusables(this.#container, {
@@ -391,7 +407,7 @@ function getActiveElement() {
  * Lightweight roving tabindex utility with fully focus management.
  * Designed for accessible menus, tabs, toolbars, and composite widgets.
  *
- * @version 1.0.0
+ * @version 1.0.2
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -399,6 +415,17 @@ function getActiveElement() {
  */
 /*! Bundled license information:
 
+@y14e/attributes-utils/dist/index.js:
+  (**
+   * Attributes Utils
+   *
+   * @version 1.0.0
+   * @author Yusuke Kamiyamane
+   * @license MIT
+   * @copyright Copyright (c) Yusuke Kamiyamane
+   * @see {@link https://github.com/y14e/attributes-utils}
+   *)
+
 power-focusable/dist/index.js:
   (**
    * Power Focusable

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.0.0
+ * @version 1.0.2
  * @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.0.0
+ * @version 1.0.2
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.js

@@ -1,3 +1,34 @@
+// node_modules/@y14e/attributes-utils/dist/index.js
+var snapshots = /* @__PURE__ */ new WeakMap();
+function restoreAttributes(elements) {
+  elements.forEach((element) => {
+    const snapshot = snapshots.get(element);
+    if (!snapshot) {
+      return;
+    }
+    for (const [attribute, value] of snapshot.entries()) {
+      if (value === null) {
+        element.removeAttribute(attribute);
+      } else {
+        element.setAttribute(attribute, value);
+      }
+    }
+    snapshots.delete(element);
+  });
+}
+function saveAttributes(elements, attributes) {
+  elements.forEach((element) => {
+    let snapshot = snapshots.get(element);
+    if (!snapshot) {
+      snapshot = /* @__PURE__ */ new Map();
+      snapshots.set(element, snapshot);
+    }
+    attributes.forEach((attribute) => {
+      snapshot.set(attribute, element.getAttribute(attribute));
+    });
+  });
+}
+
 // 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"])`;
 function getFocusables(container = document.body, options = {}) {
@@ -205,6 +236,19 @@ function createRovingTabIndex(container, options = {}) {
   if (!(container instanceof Element)) {
     throw new Error("Invalid container element");
   }
+  const { direction, selector, wrap = false } = options;
+  if (direction && !["horizontal", "vertical"].includes(direction)) {
+    console.warn("Invalid direction. Fallback: both (undefined).");
+    Object.assign(options, { direction: void 0 });
+  }
+  if (typeof selector !== "string") {
+    console.warn("Invalid selector. Fallback: all focusable elements.");
+    Object.assign(options, { selector: void 0 });
+  }
+  if (typeof wrap !== "boolean") {
+    console.warn("Invalid wrap. Fallback: false.");
+    Object.assign(options, { wrap: false });
+  }
   const roving = new RovingTabIndex(container, options);
   return () => roving.destroy();
 }
@@ -212,26 +256,12 @@ var RovingTabIndex = class {
   #container;
   #options;
   #focusables = /* @__PURE__ */ new Set();
-  #tabIndexes = /* @__PURE__ */ new Map();
   #selectorFilter;
   #controller = null;
   #isDestroyed = false;
   constructor(container, options = {}) {
     this.#container = container;
     this.#options = options;
-    const { direction, selector, wrap = false } = this.#options;
-    if (direction && !["horizontal", "vertical"].includes(direction)) {
-      console.warn("Invalid direction. Fallback: both (undefined).");
-      Object.assign(this.#options, { direction: void 0 });
-    }
-    if (typeof selector !== "string") {
-      console.warn("Invalid selector. Fallback: all focusable elements.");
-      Object.assign(this.#options, { selector: void 0 });
-    }
-    if (typeof wrap !== "boolean") {
-      console.warn("Invalid wrap. Fallback: false.");
-      Object.assign(this.#options, { wrap: false });
-    }
     this.#selectorFilter = this.#createSelectorFilter();
     this.#initialize();
   }
@@ -242,16 +272,8 @@ var RovingTabIndex = class {
     this.#isDestroyed = true;
     this.#controller?.abort();
     this.#controller = null;
-    this.#focusables.forEach((focusable) => {
-      const index = this.#tabIndexes.get(focusable);
-      if (index == null) {
-        focusable.removeAttribute("tabindex");
-      } else {
-        focusable.setAttribute("tabindex", index);
-      }
-    });
+    restoreAttributes([...this.#focusables]);
     this.#focusables.clear();
-    this.#tabIndexes.clear();
     this.#container.removeAttribute("data-roving-tabindex-initialized");
   }
   #initialize() {
@@ -334,22 +356,16 @@ var RovingTabIndex = class {
         return;
       }
       if (focusable.isConnected) {
-        const index = this.#tabIndexes.get(focusable);
-        if (index == null) {
-          focusable.removeAttribute("tabindex");
-        } else {
-          focusable.setAttribute("tabindex", index);
-        }
+        restoreAttributes([focusable]);
       }
       this.#focusables.delete(focusable);
-      this.#tabIndexes.delete(focusable);
     });
     current.forEach((c) => {
       if (this.#focusables.has(c)) {
         return;
       }
       this.#focusables.add(c);
-      this.#tabIndexes.set(c, c.getAttribute("tabindex"));
+      saveAttributes([c], ["tabindex"]);
       c.setAttribute("tabindex", "-1");
     });
     if (active && this.#focusables.has(active)) {
@@ -364,7 +380,7 @@ var RovingTabIndex = class {
   }
   #createSelectorFilter() {
     const { selector } = this.#options;
-    return (element) => !selector || element.matches(selector);
+    return (element) => !selector || [...this.#container.querySelectorAll(selector)].includes(element);
   }
   #getFocusables() {
     return getFocusables(this.#container, {
@@ -389,7 +405,7 @@ function getActiveElement() {
  * Lightweight roving tabindex utility with fully focus management.
  * Designed for accessible menus, tabs, toolbars, and composite widgets.
  *
- * @version 1.0.0
+ * @version 1.0.2
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -397,6 +413,17 @@ function getActiveElement() {
  */
 /*! Bundled license information:
 
+@y14e/attributes-utils/dist/index.js:
+  (**
+   * Attributes Utils
+   *
+   * @version 1.0.0
+   * @author Yusuke Kamiyamane
+   * @license MIT
+   * @copyright Copyright (c) Yusuke Kamiyamane
+   * @see {@link https://github.com/y14e/attributes-utils}
+   *)
+
 power-focusable/dist/index.js:
   (**
    * Power Focusable

package/package.json

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