@y14e/accordion 2.0.3 → 2.0.5

package/README.md

@@ -10,14 +10,14 @@ npm i @y14e/accordion
 
 ```ts
 // npm
-import Accordion from '@y14e/accordion';
+import Accordion from "@y14e/accordion";
 
 // CDNs
-import Accordion from 'https://esm.sh/@y14e/accordion@2.0.3';
+import Accordion from "https://esm.sh/@y14e/accordion@2.0.5";
 // or
-import Accordion from 'https://cdn.jsdelivr.net/npm/@y14e/accordion@2.0.3/+esm';
+import Accordion from "https://cdn.jsdelivr.net/npm/@y14e/accordion@2.0.5/+esm";
 // or
-import Accordion from 'https://esm.unpkg.com/@y14e/accordion@2.0.3';
+import Accordion from "https://esm.unpkg.com/@y14e/accordion@2.0.5";
 ```
 
 ## Usage
@@ -28,7 +28,6 @@ new Accordion(root, options);
 //
 // root: HTMLElement
 // options (optional): AccordionOptions
-
 ```
 
 ## 🪄 Options
@@ -52,15 +51,15 @@ interface AccordionOptions {
 Override the global default settings applied to all accordion instances.
 
 ```ts
-import Accordion from '@y14e/accordion';
+import Accordion from "@y14e/accordion";
 
 Accordion.defaults = {
   animation: {
     duration: 1000,
   },
   selector: {
-    content: '.content',
-    trigger: '.trigger',
+    content: ".content",
+    trigger: ".trigger",
   },
 };
 

package/dist/index.bundle.cjs

@@ -1,10 +1,10 @@
 'use strict';
 
-// node_modules/@y14e/attributes-utils/dist/index.js
+// node_modules/@y14e/attribute-util/dist/index.js
 var DEFAULT_PARSER = (value) => value.split(/\s+/);
 var DEFAULT_SERIALIZER = (tokens) => tokens.join(" ");
-function addTokenToAttribute(element, attribute, token, options = {}) {
-  const value = element.getAttribute(attribute)?.trim();
+function addAttributeToken(element, name, token, options = {}) {
+  const value = element.getAttribute(name)?.trim();
   const {
     caseInsensitive = false,
     parse = DEFAULT_PARSER,
@@ -15,42 +15,47 @@ function addTokenToAttribute(element, attribute, token, options = {}) {
     const lower = token.toLowerCase();
     if (tokens.every((token2) => token2.toLowerCase() !== lower)) {
       tokens.push(token);
-      element.setAttribute(attribute, serialize(tokens));
+      element.setAttribute(name, serialize(tokens));
     }
   } else {
     const set = new Set(tokens);
     set.add(token);
-    element.setAttribute(attribute, serialize([...set]));
+    element.setAttribute(name, serialize([...set]));
   }
 }
 var snapshots = /* @__PURE__ */ new WeakMap();
-function restoreAttributes(elements) {
-  for (const element of elements) {
+function restoreAttributes(element_or_elements) {
+  for (const element of Array.isArray(element_or_elements) ? element_or_elements : [element_or_elements]) {
     const snapshot = snapshots.get(element);
     if (!snapshot) {
       continue;
     }
-    for (const [attribute, value] of snapshot.entries()) {
-      value === null ? element.removeAttribute(attribute) : element.setAttribute(attribute, value);
+    for (const [name, value] of snapshot.entries()) {
+      value === null ? element.removeAttribute(name) : element.setAttribute(name, value);
     }
     snapshots.delete(element);
   }
 }
-function saveAttributes(elements, attributes) {
-  elements.forEach((element) => {
+function saveAttributes(element_or_elements, name_or_names) {
+  const names = Array.isArray(name_or_names) ? name_or_names : [name_or_names];
+  (Array.isArray(element_or_elements) ? element_or_elements : [element_or_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));
+    names.forEach((name) => {
+      snapshot.set(name, element.getAttribute(name));
     });
   });
 }
 
 // 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_TABINDEX = 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.");
@@ -87,36 +92,43 @@ function getFocusables(container = document.body, options = {}) {
     console.warn("Invalid skipVisibilityCheck option. Fallback: false.");
     skipVisibilityCheck = false;
   }
-  const elements = [];
+  const candidates = [];
   if (composed || include) {
     let traverse2 = function(node) {
-      if (!(node instanceof Element)) {
-        return;
-      }
-      if (isFocusable(node, { skipNegativeTabIndexCheck, skipVisibilityCheck }) || include?.(node)) {
-        elements[elements.length] = node;
+      if (isFocusable(node, {
+        skipNegativeTabIndexCheck,
+        skipVisibilityCheck
+      }) || include?.(node)) {
+        candidates[candidates.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);
-    for (let i = 0, l = candidates.length; i < l; i++) {
-      const candidate = candidates[i];
-      if (candidate && isFocusable(candidate, {
+    const matches = container.querySelectorAll(
+      skipNegativeTabIndexCheck ? FOCUSABLE_SELECTOR_WITH_NEGATIVE_TABINDEX : FOCUSABLE_SELECTOR
+    );
+    for (let i = 0, l = matches.length; i < l; i++) {
+      const matched = matches[i];
+      if (matched && isFocusable(matched, {
         skipNegativeTabIndexCheck,
         skipVisibilityCheck
       })) {
-        elements[elements.length] = candidate;
+        candidates[candidates.length] = matched;
       }
     }
   }
-  const unfiltered = normalizeRadioGroup(sortByTabIndex(elements));
-  return filter ? unfiltered.filter(filter) : unfiltered;
+  return normalizeRadioGroup(
+    sortByTabIndex(filter ? candidates.filter(filter) : candidates)
+  );
 }
 function isFocusable(element, options = {}) {
   if (!(element instanceof Element)) {
@@ -139,7 +151,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_TABINDEX : FOCUSABLE_SELECTOR
   )) {
     return false;
   }
@@ -197,22 +209,42 @@ function normalizeRadioGroup(elements) {
     if (!map) {
       map = /* @__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 value = map.get(root);
+    if (!value) {
+      value = /* @__PURE__ */ new Map();
+      map.set(root, value);
+    }
+    let v = value.get(element.form);
+    if (!v) {
+      v = /* @__PURE__ */ new Map();
+      value.set(element.form, v);
+    }
+    let vv = v.get(element.name);
+    if (!vv) {
+      vv = [];
+      v.set(element.name, vv);
     }
+    vv[vv.length] = element;
   }
   if (!map) {
     return elements;
   }
   const placeholder = /* @__PURE__ */ new Set();
-  for (const group of map.values()) {
-    placeholder.add(group.find((radio) => radio.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);
+      }
+    }
   }
-  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 +316,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;
 }
 
 // node_modules/@y14e/button/dist/index.js
@@ -336,6 +368,56 @@ var Button = class {
   };
 };
 
+// node_modules/@y14e/attributes-utils/dist/index.js
+var DEFAULT_PARSER2 = (value) => value.split(/\s+/);
+var DEFAULT_SERIALIZER2 = (tokens) => tokens.join(" ");
+function addTokenToAttribute(element, name, token, options = {}) {
+  const value = element.getAttribute(name)?.trim();
+  const {
+    caseInsensitive = false,
+    parse = DEFAULT_PARSER2,
+    serialize = DEFAULT_SERIALIZER2
+  } = options;
+  const tokens = value ? parse(value).filter(Boolean) : [];
+  if (caseInsensitive) {
+    const lower = token.toLowerCase();
+    if (tokens.every((token2) => token2.toLowerCase() !== lower)) {
+      tokens.push(token);
+      element.setAttribute(name, serialize(tokens));
+    }
+  } else {
+    const set = new Set(tokens);
+    set.add(token);
+    element.setAttribute(name, serialize([...set]));
+  }
+}
+var snapshots2 = /* @__PURE__ */ new WeakMap();
+function restoreAttributes2(element_or_elements) {
+  for (const element of Array.isArray(element_or_elements) ? element_or_elements : [element_or_elements]) {
+    const snapshot = snapshots2.get(element);
+    if (!snapshot) {
+      continue;
+    }
+    for (const [name, value] of snapshot.entries()) {
+      value === null ? element.removeAttribute(name) : element.setAttribute(name, value);
+    }
+    snapshots2.delete(element);
+  }
+}
+function saveAttributes2(element_or_elements, name_or_names) {
+  const names = Array.isArray(name_or_names) ? name_or_names : [name_or_names];
+  (Array.isArray(element_or_elements) ? element_or_elements : [element_or_elements]).forEach((element) => {
+    let snapshot = snapshots2.get(element);
+    if (!snapshot) {
+      snapshot = /* @__PURE__ */ new Map();
+      snapshots2.set(element, snapshot);
+    }
+    names.forEach((name) => {
+      snapshot.set(name, element.getAttribute(name));
+    });
+  });
+}
+
 // node_modules/@y14e/roving-tabindex/dist/index.js
 function createRovingTabIndex(container, options = {}) {
   if (!(container instanceof Element)) {
@@ -343,14 +425,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();
@@ -364,17 +440,17 @@ var RovingTabIndex = class _RovingTabIndex {
   constructor(container, options = {}) {
     this.#container = container;
     let {
-      direction,
+      direction = "both",
       navigationOnly = false,
       noMemory = false,
       noStart = false,
-      selector,
+      selector = "",
       typeahead = false,
       wrap = false
     } = options;
-    if (typeof direction !== "undefined" && !["horizontal", "vertical"].includes(direction)) {
-      console.warn("Invalid direction option. Fallback: both (undefined).");
-      direction = void 0;
+    if (!["both", "horizontal", "vertical"].includes(direction)) {
+      console.warn("Invalid direction option. Fallback: 'both'.");
+      direction = "both";
     }
     if (typeof navigationOnly !== "boolean") {
       console.warn("Invalid navigationOnly option. Fallback: false.");
@@ -388,11 +464,21 @@ var RovingTabIndex = class _RovingTabIndex {
       console.warn("Invalid noStart option. Fallback: false.");
       noStart = false;
     }
-    if (typeof selector !== "undefined" && (typeof selector !== "string" || !selector.trim())) {
-      console.warn(
-        "Invalid selector. Fallback: all focusable elements (undefined)."
-      );
-      selector = void 0;
+    if (selector !== "") {
+      let hasError = false;
+      if (typeof selector !== "string" || !selector.trim()) {
+        hasError = true;
+      } else {
+        try {
+          this.#container.querySelector(selector);
+        } catch {
+          hasError = true;
+        }
+      }
+      if (hasError) {
+        console.warn("Invalid selector. Fallback: no selector string.");
+        selector = "";
+      }
     }
     if (typeof typeahead !== "boolean") {
       console.warn("Invalid typeahead option. Fallback: false.");
@@ -402,9 +488,15 @@ var RovingTabIndex = class _RovingTabIndex {
       console.warn("Invalid wrap option. Fallback: false.");
       wrap = false;
     }
-    this.#settings = { navigationOnly, noMemory, noStart, typeahead, wrap };
-    direction && Object.assign(this.#settings, { direction });
-    selector && Object.assign(this.#settings, { selector });
+    this.#settings = {
+      direction,
+      navigationOnly,
+      noMemory,
+      noStart,
+      selector,
+      typeahead,
+      wrap
+    };
     this.#selectorFilter = this.#createSelectorFilter();
     this.#initialize();
   }
@@ -415,7 +507,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);
+      restoreAttributes2(focusable);
+    });
     this.#focusables.clear();
     this.#focusablesByFirstChar.clear();
   }
@@ -452,7 +547,7 @@ var RovingTabIndex = class _RovingTabIndex {
       return;
     }
     const { direction, typeahead, wrap } = this.#settings;
-    const isBoth = !direction;
+    const isBoth = direction === "both";
     const isHorizontal = direction === "horizontal";
     if (![
       "End",
@@ -464,18 +559,20 @@ var RovingTabIndex = class _RovingTabIndex {
         return;
       }
     }
+    const candidates = this.#getFocusables().filter(
+      (focusable2) => this.#focusables.has(focusable2)
+    );
     const active = getActiveElement();
     if (!(active instanceof Element)) {
       return;
     }
-    const current = this.#getFocusables();
-    if (!current.includes(active)) {
+    if (!candidates.includes(active)) {
       return;
     }
     event.preventDefault();
-    const currentIndex = current.indexOf(active);
     let newIndex;
-    let target = current;
+    const activeIndex = candidates.indexOf(active);
+    let focusables = candidates;
     switch (key) {
       case "End":
         newIndex = -1;
@@ -485,37 +582,47 @@ 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;
+        const length = focusables.length;
+        newIndex = wrap ? rawIndex % length : Math.min(rawIndex, length - 1);
         break;
       }
       default: {
-        target = this.#focusablesByFirstChar.get(key.toUpperCase()) ?? [];
-        const foundIndex = target.findIndex(
-          (focusable2) => current.indexOf(focusable2) > currentIndex
+        const focusablesByFirstChar = new Set(
+          this.#focusablesByFirstChar.get(key.toUpperCase()) ?? []
+        );
+        focusables = candidates.filter(
+          (candidate) => focusablesByFirstChar.has(candidate)
         );
-        newIndex = foundIndex >= 0 ? foundIndex : 0;
+        const afterIndex = focusables.findIndex(
+          (focusable2) => candidates.indexOf(focusable2) > activeIndex
+        );
+        newIndex = afterIndex >= 0 ? afterIndex : 0;
       }
     }
-    const focusable = target.at(newIndex);
+    const focusable = focusables.at(newIndex);
     focusable && focusElement(focusable);
   };
   #update(active) {
     const current = new Set(this.#getFocusables());
     for (const focusable of this.#focusables) {
       if (!current.has(focusable)) {
-        focusable.isConnected && restoreAttributes([focusable]);
+        _RovingTabIndex.#initialized.delete(focusable);
+        restoreAttributes2(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;
@@ -524,12 +631,12 @@ var RovingTabIndex = class _RovingTabIndex {
         continue;
       }
       if (_RovingTabIndex.#initialized.has(focusable)) {
-        throw new TypeError("Already initialized");
+        continue;
       }
       this.#focusables.add(focusable);
       _RovingTabIndex.#initialized.add(focusable);
       if (!navigationOnly) {
-        saveAttributes([focusable], ["tabindex"]);
+        saveAttributes2(focusable, "tabindex");
         focusable.setAttribute("tabindex", "-1");
       }
       if (!typeahead) {
@@ -542,7 +649,7 @@ var RovingTabIndex = class _RovingTabIndex {
       );
       if (char) {
         keys.add(char);
-        saveAttributes([focusable], ["aria-keyshortcuts"]);
+        saveAttributes2(focusable, "aria-keyshortcuts");
         addTokenToAttribute(focusable, "aria-keyshortcuts", char, {
           caseInsensitive: true
         });
@@ -673,7 +780,10 @@ var Accordion = class _Accordion {
     });
     this.#animationController?.abort();
     this.#animationController = null;
-    restoreAttributes([...this.#triggerElements, ...this.#contentElements]);
+    restoreAttributes([
+      ...this.#triggerElements,
+      ...this.#contentElements
+    ]);
     this.#triggerElements.length = 0;
     this.#contentElements.length = 0;
     this.#rootElement.removeAttribute("data-accordion-initialized");
@@ -696,7 +806,11 @@ var Accordion = class _Accordion {
       "style",
       "tabindex"
     ]);
-    saveAttributes(this.#contentElements, ["aria-labelledby", "id", "role"]);
+    saveAttributes(this.#contentElements, [
+      "aria-labelledby",
+      "id",
+      "role"
+    ]);
     this.#eventController = new AbortController();
     const { signal } = this.#eventController;
     this.#triggerElements.forEach((trigger2, i) => {
@@ -706,7 +820,7 @@ var Accordion = class _Accordion {
         return;
       }
       content2.id ||= `accordion-content-${id}`;
-      addTokenToAttribute(trigger2, "aria-controls", content2.id);
+      addAttributeToken(trigger2, "aria-controls", content2.id);
       trigger2.setAttribute(
         "aria-expanded",
         String(trigger2.ariaExpanded === "true")
@@ -718,7 +832,7 @@ var Accordion = class _Accordion {
         trigger2.style.setProperty("pointer-events", "none");
       }
       trigger2.addEventListener("click", this.#onTriggerClick, { signal });
-      addTokenToAttribute(content2, "aria-labelledby", trigger2.id);
+      addAttributeToken(content2, "aria-labelledby", trigger2.id);
       content2.setAttribute("role", "region");
       content2.addEventListener("beforematch", this.#onContentBeforeMatch, {
         signal
@@ -822,7 +936,7 @@ var Accordion = class _Accordion {
     );
   }
   #createBinding(trigger, content) {
-    return { trigger, content, animation: null };
+    return { animation: null, content, trigger };
   }
   #isFocusable(element) {
     return !element.hasAttribute("disabled") && element.tabIndex >= 0;
@@ -853,7 +967,7 @@ function waitAnimationFinish(animation) {
  * Accordion
  * WAI-ARIA compliant accordion pattern implementation in TypeScript.
  *
- * @version 2.0.3
+ * @version 2.0.5
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -861,15 +975,15 @@ function waitAnimationFinish(animation) {
  */
 /*! Bundled license information:
 
-@y14e/attributes-utils/dist/index.js:
+@y14e/attribute-util/dist/index.js:
   (**
-   * Attributes Utils
+   * Attribute Util
    *
-   * @version 1.1.3
+   * @version 2.0.0
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane
-   * @see {@link https://github.com/y14e/attributes-utils}
+   * @see {@link https://github.com/y14e/attribute-util}
    *)
 
 power-focusable/dist/index.js:
@@ -878,7 +992,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.10
+   * @version 4.3.23
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane
@@ -896,13 +1010,24 @@ power-focusable/dist/index.js:
    * @see {@link https://github.com/y14e/button}
    *)
 
+@y14e/attributes-utils/dist/index.js:
+  (**
+   * Attributes Utils
+   *
+   * @version 1.1.7
+   * @author Yusuke Kamiyamane
+   * @license MIT
+   * @copyright Copyright (c) Yusuke Kamiyamane
+   * @see {@link https://github.com/y14e/attributes-utils}
+   *)
+
 @y14e/roving-tabindex/dist/index.js:
   (**
    * Roving Tabindex
    * Lightweight roving tabindex utility with fully focus management.
    * Designed for accessible menus, tabs, toolbars, and composite widgets.
    *
-   * @version 3.1.9
+   * @version 3.1.20
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane