@y14e/accordion 1.4.8 → 1.4.10

package/README.md

@@ -10,14 +10,14 @@ npm i @y14e/accordion
 
 ```ts
 // npm
-import Accordion from '@y14e/accordion@1.4.8';
+import Accordion from '@y14e/accordion@1.4.10';
 
 // CDNs
-import Accordion from 'https://esm.sh/@y14e/accordion@1.4.8';
+import Accordion from 'https://esm.sh/@y14e/accordion@1.4.10';
 // or
-import Accordion from 'https://cdn.jsdelivr.net/npm/@y14e/accordion@1.4.8/+esm';
+import Accordion from 'https://cdn.jsdelivr.net/npm/@y14e/accordion@1.4.10/+esm';
 // or
-import Accordion from 'https://esm.unpkg.com/@y14e/accordion@1.4.8';
+import Accordion from 'https://esm.unpkg.com/@y14e/accordion@1.4.10';
 ```
 
 ## Usage

package/dist/index.cjs

@@ -1,13 +1,13 @@
 'use strict';
 
 // node_modules/@y14e/attributes-utils/dist/index.js
-var defaultParser = (value) => value.split(/\s+/);
-var defaultSerializer = (tokens) => tokens.join(" ");
+var DEFAULT_PARSER = (value) => value.split(/\s+/);
+var DEFAULT_SERIALIZER = (tokens) => tokens.join(" ");
 function addTokenToAttribute(element, attribute, token, options = {}) {
   const {
     caseInsensitive = false,
-    parse = defaultParser,
-    serialize = defaultSerializer
+    parse = DEFAULT_PARSER,
+    serialize = DEFAULT_SERIALIZER
   } = options;
   const value = element.getAttribute(attribute)?.trim();
   const tokens = value ? parse(value).filter(Boolean) : [];
@@ -17,11 +17,11 @@ function addTokenToAttribute(element, attribute, token, options = {}) {
       tokens.push(token);
       element.setAttribute(attribute, serialize(tokens));
     }
-    return;
+  } else {
+    const set = new Set(tokens);
+    set.add(token);
+    element.setAttribute(attribute, serialize([...set]));
   }
-  const set = new Set(tokens);
-  set.add(token);
-  element.setAttribute(attribute, serialize([...set]));
 }
 var snapshots = /* @__PURE__ */ new WeakMap();
 function restoreAttributes(elements) {
@@ -90,11 +90,10 @@ var Button = class {
       return;
     }
     const active = getActiveElement();
-    if (!(active instanceof HTMLElement)) {
-      return;
+    if (active instanceof HTMLElement) {
+      event.preventDefault();
+      active.click();
     }
-    event.preventDefault();
-    active.click();
   };
 };
 function getActiveElement() {
@@ -106,13 +105,13 @@ function getActiveElement() {
 }
 
 // node_modules/@y14e/roving-tabindex/dist/index.js
-var defaultParser2 = (value) => value.split(/\s+/);
-var defaultSerializer2 = (tokens) => tokens.join(" ");
+var DEFAULT_PARSER2 = (value) => value.split(/\s+/);
+var DEFAULT_SERIALIZER2 = (tokens) => tokens.join(" ");
 function addTokenToAttribute2(element, attribute, token, options = {}) {
   const {
     caseInsensitive = false,
-    parse = defaultParser2,
-    serialize = defaultSerializer2
+    parse = DEFAULT_PARSER2,
+    serialize = DEFAULT_SERIALIZER2
   } = options;
   const value = element.getAttribute(attribute)?.trim();
   const tokens = value ? parse(value).filter(Boolean) : [];
@@ -122,11 +121,11 @@ function addTokenToAttribute2(element, attribute, token, options = {}) {
       tokens.push(token);
       element.setAttribute(attribute, serialize(tokens));
     }
-    return;
+  } else {
+    const set = new Set(tokens);
+    set.add(token);
+    element.setAttribute(attribute, serialize([...set]));
   }
-  const set = new Set(tokens);
-  set.add(token);
-  element.setAttribute(attribute, serialize([...set]));
 }
 var snapshots2 = /* @__PURE__ */ new WeakMap();
 function restoreAttributes2(elements) {
@@ -193,21 +192,16 @@ function getFocusables(container = document.body, options = {}) {
   const elements = [];
   if (composed || include) {
     let traverse2 = function(node) {
-      if (node instanceof Element) {
-        if (isFocusable(node, {
-          skipNegativeTabIndexCheck,
-          skipVisibilityCheck
-        }) || include?.(node)) {
-          elements[elements.length] = node;
-        }
+      if (!(node instanceof Element)) {
+        return;
+      }
+      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];
-        if (!child) {
-          continue;
-        }
-        traverse2(child);
+        child && traverse2(child);
       }
     };
     traverse2(container);
@@ -215,10 +209,7 @@ function getFocusables(container = document.body, options = {}) {
     const candidates = container.querySelectorAll(FOCUSABLE_SELECTOR);
     for (let i = 0, l = candidates.length; i < l; i++) {
       const candidate = candidates[i];
-      if (!(candidate instanceof Element)) {
-        continue;
-      }
-      if (isFocusable(candidate, {
+      if (candidate && isFocusable(candidate, {
         skipNegativeTabIndexCheck,
         skipVisibilityCheck
       })) {
@@ -321,23 +312,19 @@ function normalizeRadioGroup(elements) {
   for (const group of map.values()) {
     placeholder.add(group.find((radio) => radio.checked) ?? group[0]);
   }
-  return elements.filter((element) => {
-    if (isUngroupedRadio(element)) {
-      return placeholder.has(element);
-    }
-    return true;
-  });
+  return elements.filter(
+    (element) => isUngroupedRadio(element) ? placeholder.has(element) : true
+  );
 }
 function sortByTabIndex(elements) {
   const ordered = [];
   const natural = [];
   for (let i = 0, l = elements.length; i < l; i++) {
     const element = elements[i];
-    if (!element) {
-      continue;
+    if (element) {
+      const target = getTabIndex(element) > 0 ? ordered : natural;
+      target[target.length] = element;
     }
-    const target = getTabIndex(element) > 0 ? ordered : natural;
-    target[target.length] = element;
   }
   ordered.sort((a, b) => getTabIndex(a) - getTabIndex(b));
   let count = 0;
@@ -490,15 +477,10 @@ var RovingTabIndex = class {
   }
   #onFocusIn = (event) => {
     const { target } = event;
-    if (!(target instanceof Element)) {
-      return;
-    }
-    const isFocusable22 = this.#focusables.has(target);
-    if (this.#options.noMemory && !isFocusable22) {
-      this.#update(null);
-      return;
+    if (target instanceof Element) {
+      const isFocusable22 = this.#focusables.has(target);
+      this.#options.noMemory && !isFocusable22 ? this.#update(null) : isFocusable22 && this.#update(target);
     }
-    isFocusable22 && this.#update(target);
   };
   #onKeyDown = (event) => {
     if (!event.composedPath().includes(this.#container)) {
@@ -531,8 +513,7 @@ var RovingTabIndex = class {
     }
     event.preventDefault();
     const currentIndex = current.indexOf(active);
-    let rawIndex;
-    let newIndex = currentIndex;
+    let newIndex;
     let target = current;
     switch (key) {
       case "End":
@@ -542,15 +523,17 @@ var RovingTabIndex = class {
         newIndex = 0;
         break;
       case "ArrowLeft":
-      case "ArrowUp":
-        rawIndex = currentIndex - 1;
+      case "ArrowUp": {
+        const rawIndex = currentIndex - 1;
         newIndex = wrap ? rawIndex : Math.max(rawIndex, 0);
         break;
+      }
       case "ArrowRight":
-      case "ArrowDown":
-        rawIndex = currentIndex + 1;
+      case "ArrowDown": {
+        const rawIndex = currentIndex + 1;
         newIndex = wrap ? rawIndex % current.length : Math.min(rawIndex, current.length - 1);
         break;
+      }
       default: {
         target = this.#focusablesByFirstChar.get(key.toUpperCase()) ?? [];
         const foundIndex = target.findIndex(
@@ -565,15 +548,14 @@ var RovingTabIndex = class {
   #update(active) {
     const current = new Set(this.#getFocusables());
     for (const focusable of this.#focusables) {
-      if (current.has(focusable)) {
-        continue;
+      if (!current.has(focusable)) {
+        focusable.isConnected && restoreAttributes2([focusable]);
+        this.#focusables.delete(focusable);
+        this.#focusablesByFirstChar.forEach((focusables) => {
+          const index = focusables.indexOf(focusable);
+          index >= 0 && focusables.splice(index, 1);
+        });
       }
-      focusable.isConnected && restoreAttributes2([focusable]);
-      this.#focusables.delete(focusable);
-      this.#focusablesByFirstChar.forEach((focusables) => {
-        const index = focusables.indexOf(focusable);
-        index >= 0 && focusables.splice(index, 1);
-      });
     }
     const { navigationOnly, noStart, typeahead } = this.#options;
     for (const focusable of current) {
@@ -588,11 +570,11 @@ var RovingTabIndex = class {
       if (!typeahead) {
         continue;
       }
+      const char = focusable.textContent?.trim()?.at(0)?.toUpperCase();
       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 = focusable.textContent?.trim()?.at(0)?.toUpperCase();
       if (char) {
         keys.add(char);
         saveAttributes2([focusable], ["aria-keyshortcuts"]);
@@ -606,18 +588,17 @@ var RovingTabIndex = class {
         this.#focusablesByFirstChar.set(key, focusables);
       });
     }
-    if (navigationOnly) {
-      return;
-    }
-    if (active && this.#focusables.has(active)) {
-      this.#focusables.forEach((focusable) => {
-        focusable.setAttribute("tabindex", focusable === active ? "0" : "-1");
-      });
-      return;
+    if (!navigationOnly) {
+      if (active && this.#focusables.has(active)) {
+        this.#focusables.forEach((focusable) => {
+          focusable.setAttribute("tabindex", focusable === active ? "0" : "-1");
+        });
+      } else {
+        [...this.#focusables].forEach((focusable, i) => {
+          focusable.setAttribute("tabindex", i || noStart ? "-1" : "0");
+        });
+      }
     }
-    [...this.#focusables].forEach((focusable, i) => {
-      focusable.setAttribute("tabindex", i || noStart ? "-1" : "0");
-    });
   }
   #createSelectorFilter() {
     const { selector } = this.#options;
@@ -697,12 +678,11 @@ var Accordion = class _Accordion {
     }
     this.#triggerElements.forEach((trigger2, i) => {
       const content2 = this.#contentElements[i];
-      if (!content2) {
-        return;
+      if (content2) {
+        const binding = createBinding(trigger2, content2);
+        this.#bindings.set(trigger2, binding);
+        this.#bindings.set(content2, binding);
       }
-      const binding = createBinding(trigger2, content2);
-      this.#bindings.set(trigger2, binding);
-      this.#bindings.set(content2, binding);
     });
     this.#initialize();
   }
@@ -710,11 +690,11 @@ var Accordion = class _Accordion {
     if (this.#isDestroyed) {
       return;
     }
-    if (!(trigger instanceof HTMLElement) || !this.#bindings.has(trigger)) {
+    if (trigger instanceof HTMLElement && this.#bindings.has(trigger)) {
+      this.#toggle(trigger, false);
+    } else {
       console.warn("Invalid trigger element");
-      return;
     }
-    this.#toggle(trigger, false);
   }
   async destroy(force = false) {
     if (this.#isDestroyed) {
@@ -745,11 +725,11 @@ var Accordion = class _Accordion {
     if (this.#isDestroyed) {
       return;
     }
-    if (!(trigger instanceof HTMLElement) || !this.#bindings.has(trigger)) {
+    if (trigger instanceof HTMLElement && this.#bindings.has(trigger)) {
+      this.#toggle(trigger, true);
+    } else {
       console.warn("Invalid trigger element");
-      return;
     }
-    this.#toggle(trigger, true);
   }
   #initialize() {
     saveAttributes(this.#triggerElements, [
@@ -800,21 +780,16 @@ var Accordion = class _Accordion {
   #onTriggerClick = (event) => {
     event.preventDefault();
     const trigger = event.currentTarget;
-    if (!(trigger instanceof HTMLElement)) {
-      return;
+    if (trigger instanceof HTMLElement) {
+      this.#toggle(trigger, trigger.ariaExpanded === "false");
     }
-    this.#toggle(trigger, trigger.ariaExpanded === "false");
   };
   #onContentBeforeMatch = (event) => {
     const content = event.currentTarget;
-    if (!(content instanceof HTMLElement)) {
-      return;
-    }
-    const binding = this.#bindings.get(content);
-    if (!binding) {
-      return;
+    if (content instanceof HTMLElement) {
+      const binding = this.#bindings.get(content);
+      binding && binding.trigger.ariaExpanded === "false" && this.#toggle(binding.trigger, true, true);
     }
-    binding.trigger.ariaExpanded === "false" && this.#toggle(binding.trigger, true, true);
   };
   #toggle(trigger, isOpen, isMatch = false) {
     if (trigger.ariaExpanded === String(isOpen)) {
@@ -863,11 +838,10 @@ var Accordion = class _Accordion {
     animation.addEventListener(
       "finish",
       () => {
-        if (binding?.animation !== animation) {
-          return;
+        if (binding?.animation === animation) {
+          this.#onAnimationFinish(content);
+          cleanup();
         }
-        this.#onAnimationFinish(content);
-        cleanup();
       },
       { once: true, signal }
     );
@@ -880,10 +854,7 @@ var Accordion = class _Accordion {
   }
   #onAnimationFinish(content) {
     const trigger = this.#bindings.get(content)?.trigger;
-    if (!trigger) {
-      return;
-    }
-    if (trigger.ariaExpanded === "false") {
+    if (trigger && trigger.ariaExpanded === "false") {
       content.setAttribute("hidden", "until-found");
     }
     ["block-size", "overflow"].forEach((name) => {
@@ -908,16 +879,17 @@ function isFocusable2(element) {
 function waitAnimationFinish(animation) {
   if (["idle", "finished"].includes(animation.playState)) {
     return Promise.resolve();
+  } else {
+    return new Promise(
+      (resolve) => animation.addEventListener("finish", () => resolve(), { once: true })
+    );
   }
-  return new Promise(
-    (resolve) => animation.addEventListener("finish", () => resolve(), { once: true })
-  );
 }
 /**
  * Accordion
  * WAI-ARIA compliant accordion pattern implementation in TypeScript.
  *
- * @version 1.4.8
+ * @version 1.4.10
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -929,7 +901,7 @@ function waitAnimationFinish(animation) {
   (**
    * Attributes Utils
    *
-   * @version 1.1.1
+   * @version 1.1.2
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane
@@ -940,7 +912,7 @@ function waitAnimationFinish(animation) {
   (**
    * Button
    *
-   * @version 1.0.0
+   * @version 1.0.1
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane
@@ -953,7 +925,7 @@ function waitAnimationFinish(animation) {
    * Lightweight roving tabindex utility with fully focus management.
    * Designed for accessible menus, tabs, toolbars, and composite widgets.
    *
-   * @version 3.0.0
+   * @version 3.0.4
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane
@@ -965,7 +937,7 @@ function waitAnimationFinish(animation) {
     (**
      * Attributes Utils
      *
-     * @version 1.1.1
+     * @version 1.1.2
      * @author Yusuke Kamiyamane
      * @license MIT
      * @copyright Copyright (c) Yusuke Kamiyamane
@@ -978,7 +950,7 @@ function waitAnimationFinish(animation) {
      * High-precision focus management utility with full composed tree support.
      * Handles complex focus rules including tabindex ordering, radio groups, inert.
      *
-     * @version 4.3.2
+     * @version 4.3.3
      * @author Yusuke Kamiyamane
      * @license MIT
      * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.d.cts

@@ -2,7 +2,7 @@
  * Accordion
  * WAI-ARIA compliant accordion pattern implementation in TypeScript.
  *
- * @version 1.4.8
+ * @version 1.4.10
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.d.ts

@@ -2,7 +2,7 @@
  * Accordion
  * WAI-ARIA compliant accordion pattern implementation in TypeScript.
  *
- * @version 1.4.8
+ * @version 1.4.10
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.js

@@ -1,11 +1,11 @@
 // node_modules/@y14e/attributes-utils/dist/index.js
-var defaultParser = (value) => value.split(/\s+/);
-var defaultSerializer = (tokens) => tokens.join(" ");
+var DEFAULT_PARSER = (value) => value.split(/\s+/);
+var DEFAULT_SERIALIZER = (tokens) => tokens.join(" ");
 function addTokenToAttribute(element, attribute, token, options = {}) {
   const {
     caseInsensitive = false,
-    parse = defaultParser,
-    serialize = defaultSerializer
+    parse = DEFAULT_PARSER,
+    serialize = DEFAULT_SERIALIZER
   } = options;
   const value = element.getAttribute(attribute)?.trim();
   const tokens = value ? parse(value).filter(Boolean) : [];
@@ -15,11 +15,11 @@ function addTokenToAttribute(element, attribute, token, options = {}) {
       tokens.push(token);
       element.setAttribute(attribute, serialize(tokens));
     }
-    return;
+  } else {
+    const set = new Set(tokens);
+    set.add(token);
+    element.setAttribute(attribute, serialize([...set]));
   }
-  const set = new Set(tokens);
-  set.add(token);
-  element.setAttribute(attribute, serialize([...set]));
 }
 var snapshots = /* @__PURE__ */ new WeakMap();
 function restoreAttributes(elements) {
@@ -88,11 +88,10 @@ var Button = class {
       return;
     }
     const active = getActiveElement();
-    if (!(active instanceof HTMLElement)) {
-      return;
+    if (active instanceof HTMLElement) {
+      event.preventDefault();
+      active.click();
     }
-    event.preventDefault();
-    active.click();
   };
 };
 function getActiveElement() {
@@ -104,13 +103,13 @@ function getActiveElement() {
 }
 
 // node_modules/@y14e/roving-tabindex/dist/index.js
-var defaultParser2 = (value) => value.split(/\s+/);
-var defaultSerializer2 = (tokens) => tokens.join(" ");
+var DEFAULT_PARSER2 = (value) => value.split(/\s+/);
+var DEFAULT_SERIALIZER2 = (tokens) => tokens.join(" ");
 function addTokenToAttribute2(element, attribute, token, options = {}) {
   const {
     caseInsensitive = false,
-    parse = defaultParser2,
-    serialize = defaultSerializer2
+    parse = DEFAULT_PARSER2,
+    serialize = DEFAULT_SERIALIZER2
   } = options;
   const value = element.getAttribute(attribute)?.trim();
   const tokens = value ? parse(value).filter(Boolean) : [];
@@ -120,11 +119,11 @@ function addTokenToAttribute2(element, attribute, token, options = {}) {
       tokens.push(token);
       element.setAttribute(attribute, serialize(tokens));
     }
-    return;
+  } else {
+    const set = new Set(tokens);
+    set.add(token);
+    element.setAttribute(attribute, serialize([...set]));
   }
-  const set = new Set(tokens);
-  set.add(token);
-  element.setAttribute(attribute, serialize([...set]));
 }
 var snapshots2 = /* @__PURE__ */ new WeakMap();
 function restoreAttributes2(elements) {
@@ -191,21 +190,16 @@ function getFocusables(container = document.body, options = {}) {
   const elements = [];
   if (composed || include) {
     let traverse2 = function(node) {
-      if (node instanceof Element) {
-        if (isFocusable(node, {
-          skipNegativeTabIndexCheck,
-          skipVisibilityCheck
-        }) || include?.(node)) {
-          elements[elements.length] = node;
-        }
+      if (!(node instanceof Element)) {
+        return;
+      }
+      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];
-        if (!child) {
-          continue;
-        }
-        traverse2(child);
+        child && traverse2(child);
       }
     };
     traverse2(container);
@@ -213,10 +207,7 @@ function getFocusables(container = document.body, options = {}) {
     const candidates = container.querySelectorAll(FOCUSABLE_SELECTOR);
     for (let i = 0, l = candidates.length; i < l; i++) {
       const candidate = candidates[i];
-      if (!(candidate instanceof Element)) {
-        continue;
-      }
-      if (isFocusable(candidate, {
+      if (candidate && isFocusable(candidate, {
         skipNegativeTabIndexCheck,
         skipVisibilityCheck
       })) {
@@ -319,23 +310,19 @@ function normalizeRadioGroup(elements) {
   for (const group of map.values()) {
     placeholder.add(group.find((radio) => radio.checked) ?? group[0]);
   }
-  return elements.filter((element) => {
-    if (isUngroupedRadio(element)) {
-      return placeholder.has(element);
-    }
-    return true;
-  });
+  return elements.filter(
+    (element) => isUngroupedRadio(element) ? placeholder.has(element) : true
+  );
 }
 function sortByTabIndex(elements) {
   const ordered = [];
   const natural = [];
   for (let i = 0, l = elements.length; i < l; i++) {
     const element = elements[i];
-    if (!element) {
-      continue;
+    if (element) {
+      const target = getTabIndex(element) > 0 ? ordered : natural;
+      target[target.length] = element;
     }
-    const target = getTabIndex(element) > 0 ? ordered : natural;
-    target[target.length] = element;
   }
   ordered.sort((a, b) => getTabIndex(a) - getTabIndex(b));
   let count = 0;
@@ -488,15 +475,10 @@ var RovingTabIndex = class {
   }
   #onFocusIn = (event) => {
     const { target } = event;
-    if (!(target instanceof Element)) {
-      return;
-    }
-    const isFocusable22 = this.#focusables.has(target);
-    if (this.#options.noMemory && !isFocusable22) {
-      this.#update(null);
-      return;
+    if (target instanceof Element) {
+      const isFocusable22 = this.#focusables.has(target);
+      this.#options.noMemory && !isFocusable22 ? this.#update(null) : isFocusable22 && this.#update(target);
     }
-    isFocusable22 && this.#update(target);
   };
   #onKeyDown = (event) => {
     if (!event.composedPath().includes(this.#container)) {
@@ -529,8 +511,7 @@ var RovingTabIndex = class {
     }
     event.preventDefault();
     const currentIndex = current.indexOf(active);
-    let rawIndex;
-    let newIndex = currentIndex;
+    let newIndex;
     let target = current;
     switch (key) {
       case "End":
@@ -540,15 +521,17 @@ var RovingTabIndex = class {
         newIndex = 0;
         break;
       case "ArrowLeft":
-      case "ArrowUp":
-        rawIndex = currentIndex - 1;
+      case "ArrowUp": {
+        const rawIndex = currentIndex - 1;
         newIndex = wrap ? rawIndex : Math.max(rawIndex, 0);
         break;
+      }
       case "ArrowRight":
-      case "ArrowDown":
-        rawIndex = currentIndex + 1;
+      case "ArrowDown": {
+        const rawIndex = currentIndex + 1;
         newIndex = wrap ? rawIndex % current.length : Math.min(rawIndex, current.length - 1);
         break;
+      }
       default: {
         target = this.#focusablesByFirstChar.get(key.toUpperCase()) ?? [];
         const foundIndex = target.findIndex(
@@ -563,15 +546,14 @@ var RovingTabIndex = class {
   #update(active) {
     const current = new Set(this.#getFocusables());
     for (const focusable of this.#focusables) {
-      if (current.has(focusable)) {
-        continue;
+      if (!current.has(focusable)) {
+        focusable.isConnected && restoreAttributes2([focusable]);
+        this.#focusables.delete(focusable);
+        this.#focusablesByFirstChar.forEach((focusables) => {
+          const index = focusables.indexOf(focusable);
+          index >= 0 && focusables.splice(index, 1);
+        });
       }
-      focusable.isConnected && restoreAttributes2([focusable]);
-      this.#focusables.delete(focusable);
-      this.#focusablesByFirstChar.forEach((focusables) => {
-        const index = focusables.indexOf(focusable);
-        index >= 0 && focusables.splice(index, 1);
-      });
     }
     const { navigationOnly, noStart, typeahead } = this.#options;
     for (const focusable of current) {
@@ -586,11 +568,11 @@ var RovingTabIndex = class {
       if (!typeahead) {
         continue;
       }
+      const char = focusable.textContent?.trim()?.at(0)?.toUpperCase();
       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 = focusable.textContent?.trim()?.at(0)?.toUpperCase();
       if (char) {
         keys.add(char);
         saveAttributes2([focusable], ["aria-keyshortcuts"]);
@@ -604,18 +586,17 @@ var RovingTabIndex = class {
         this.#focusablesByFirstChar.set(key, focusables);
       });
     }
-    if (navigationOnly) {
-      return;
-    }
-    if (active && this.#focusables.has(active)) {
-      this.#focusables.forEach((focusable) => {
-        focusable.setAttribute("tabindex", focusable === active ? "0" : "-1");
-      });
-      return;
+    if (!navigationOnly) {
+      if (active && this.#focusables.has(active)) {
+        this.#focusables.forEach((focusable) => {
+          focusable.setAttribute("tabindex", focusable === active ? "0" : "-1");
+        });
+      } else {
+        [...this.#focusables].forEach((focusable, i) => {
+          focusable.setAttribute("tabindex", i || noStart ? "-1" : "0");
+        });
+      }
     }
-    [...this.#focusables].forEach((focusable, i) => {
-      focusable.setAttribute("tabindex", i || noStart ? "-1" : "0");
-    });
   }
   #createSelectorFilter() {
     const { selector } = this.#options;
@@ -695,12 +676,11 @@ var Accordion = class _Accordion {
     }
     this.#triggerElements.forEach((trigger2, i) => {
       const content2 = this.#contentElements[i];
-      if (!content2) {
-        return;
+      if (content2) {
+        const binding = createBinding(trigger2, content2);
+        this.#bindings.set(trigger2, binding);
+        this.#bindings.set(content2, binding);
       }
-      const binding = createBinding(trigger2, content2);
-      this.#bindings.set(trigger2, binding);
-      this.#bindings.set(content2, binding);
     });
     this.#initialize();
   }
@@ -708,11 +688,11 @@ var Accordion = class _Accordion {
     if (this.#isDestroyed) {
       return;
     }
-    if (!(trigger instanceof HTMLElement) || !this.#bindings.has(trigger)) {
+    if (trigger instanceof HTMLElement && this.#bindings.has(trigger)) {
+      this.#toggle(trigger, false);
+    } else {
       console.warn("Invalid trigger element");
-      return;
     }
-    this.#toggle(trigger, false);
   }
   async destroy(force = false) {
     if (this.#isDestroyed) {
@@ -743,11 +723,11 @@ var Accordion = class _Accordion {
     if (this.#isDestroyed) {
       return;
     }
-    if (!(trigger instanceof HTMLElement) || !this.#bindings.has(trigger)) {
+    if (trigger instanceof HTMLElement && this.#bindings.has(trigger)) {
+      this.#toggle(trigger, true);
+    } else {
       console.warn("Invalid trigger element");
-      return;
     }
-    this.#toggle(trigger, true);
   }
   #initialize() {
     saveAttributes(this.#triggerElements, [
@@ -798,21 +778,16 @@ var Accordion = class _Accordion {
   #onTriggerClick = (event) => {
     event.preventDefault();
     const trigger = event.currentTarget;
-    if (!(trigger instanceof HTMLElement)) {
-      return;
+    if (trigger instanceof HTMLElement) {
+      this.#toggle(trigger, trigger.ariaExpanded === "false");
     }
-    this.#toggle(trigger, trigger.ariaExpanded === "false");
   };
   #onContentBeforeMatch = (event) => {
     const content = event.currentTarget;
-    if (!(content instanceof HTMLElement)) {
-      return;
-    }
-    const binding = this.#bindings.get(content);
-    if (!binding) {
-      return;
+    if (content instanceof HTMLElement) {
+      const binding = this.#bindings.get(content);
+      binding && binding.trigger.ariaExpanded === "false" && this.#toggle(binding.trigger, true, true);
     }
-    binding.trigger.ariaExpanded === "false" && this.#toggle(binding.trigger, true, true);
   };
   #toggle(trigger, isOpen, isMatch = false) {
     if (trigger.ariaExpanded === String(isOpen)) {
@@ -861,11 +836,10 @@ var Accordion = class _Accordion {
     animation.addEventListener(
       "finish",
       () => {
-        if (binding?.animation !== animation) {
-          return;
+        if (binding?.animation === animation) {
+          this.#onAnimationFinish(content);
+          cleanup();
         }
-        this.#onAnimationFinish(content);
-        cleanup();
       },
       { once: true, signal }
     );
@@ -878,10 +852,7 @@ var Accordion = class _Accordion {
   }
   #onAnimationFinish(content) {
     const trigger = this.#bindings.get(content)?.trigger;
-    if (!trigger) {
-      return;
-    }
-    if (trigger.ariaExpanded === "false") {
+    if (trigger && trigger.ariaExpanded === "false") {
       content.setAttribute("hidden", "until-found");
     }
     ["block-size", "overflow"].forEach((name) => {
@@ -906,16 +877,17 @@ function isFocusable2(element) {
 function waitAnimationFinish(animation) {
   if (["idle", "finished"].includes(animation.playState)) {
     return Promise.resolve();
+  } else {
+    return new Promise(
+      (resolve) => animation.addEventListener("finish", () => resolve(), { once: true })
+    );
   }
-  return new Promise(
-    (resolve) => animation.addEventListener("finish", () => resolve(), { once: true })
-  );
 }
 /**
  * Accordion
  * WAI-ARIA compliant accordion pattern implementation in TypeScript.
  *
- * @version 1.4.8
+ * @version 1.4.10
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -927,7 +899,7 @@ function waitAnimationFinish(animation) {
   (**
    * Attributes Utils
    *
-   * @version 1.1.1
+   * @version 1.1.2
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane
@@ -938,7 +910,7 @@ function waitAnimationFinish(animation) {
   (**
    * Button
    *
-   * @version 1.0.0
+   * @version 1.0.1
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane
@@ -951,7 +923,7 @@ function waitAnimationFinish(animation) {
    * Lightweight roving tabindex utility with fully focus management.
    * Designed for accessible menus, tabs, toolbars, and composite widgets.
    *
-   * @version 3.0.0
+   * @version 3.0.4
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane
@@ -963,7 +935,7 @@ function waitAnimationFinish(animation) {
     (**
      * Attributes Utils
      *
-     * @version 1.1.1
+     * @version 1.1.2
      * @author Yusuke Kamiyamane
      * @license MIT
      * @copyright Copyright (c) Yusuke Kamiyamane
@@ -976,7 +948,7 @@ function waitAnimationFinish(animation) {
      * High-precision focus management utility with full composed tree support.
      * Handles complex focus rules including tabindex ordering, radio groups, inert.
      *
-     * @version 4.3.2
+     * @version 4.3.3
      * @author Yusuke Kamiyamane
      * @license MIT
      * @copyright Copyright (c) Yusuke Kamiyamane

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@y14e/accordion",
-  "version": "1.4.8",
+  "version": "1.4.10",
   "description": "WAI-ARIA compliant accordion pattern implementation in TypeScript",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -43,9 +43,9 @@
   },
   "homepage": "https://github.com/y14e/accordion#readme",
   "devDependencies": {
-    "@y14e/attributes-utils": "^1.1.1",
-    "@y14e/button": "^1.0.0",
-    "@y14e/roving-tabindex": "^3.0.0",
+    "@y14e/attributes-utils": "^1.1.2",
+    "@y14e/button": "^1.0.1",
+    "@y14e/roving-tabindex": "^3.0.4",
     "bun-types": "latest",
     "tsup": "^8.0.0",
     "typescript": "^5.6.0",