@y14e/accordion 1.4.11 → 1.4.13

package/README.md

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

package/dist/index.cjs

@@ -1,54 +1,5 @@
 'use strict';
 
-// node_modules/@y14e/attributes-utils/dist/index.js
-var DEFAULT_PARSER = (value) => value.split(/\s+/);
-var DEFAULT_SERIALIZER = (tokens) => tokens.join(" ");
-function addTokenToAttribute(element, attribute, token, options = {}) {
-  const {
-    caseInsensitive = false,
-    parse = DEFAULT_PARSER,
-    serialize = DEFAULT_SERIALIZER
-  } = options;
-  const value = element.getAttribute(attribute)?.trim();
-  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(attribute, serialize(tokens));
-    }
-  } else {
-    const set = new Set(tokens);
-    set.add(token);
-    element.setAttribute(attribute, serialize([...set]));
-  }
-}
-var snapshots = /* @__PURE__ */ new WeakMap();
-function restoreAttributes(elements) {
-  for (const element of 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);
-    }
-    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/@y14e/button/dist/index.js
 var Button = class {
   #element;
@@ -106,13 +57,13 @@ function getActiveElement() {
 }
 
 // node_modules/@y14e/roving-tabindex/dist/index.js
-var DEFAULT_PARSER2 = (value) => value.split(/\s+/);
-var DEFAULT_SERIALIZER2 = (tokens) => tokens.join(" ");
-function addTokenToAttribute2(element, attribute, token, options = {}) {
+var DEFAULT_PARSER = (value) => value.split(/\s+/);
+var DEFAULT_SERIALIZER = (tokens) => tokens.join(" ");
+function addTokenToAttribute(element, attribute, token, options = {}) {
   const {
     caseInsensitive = false,
-    parse = DEFAULT_PARSER2,
-    serialize = DEFAULT_SERIALIZER2
+    parse = DEFAULT_PARSER,
+    serialize = DEFAULT_SERIALIZER
   } = options;
   const value = element.getAttribute(attribute)?.trim();
   const tokens = value ? parse(value).filter(Boolean) : [];
@@ -128,25 +79,25 @@ function addTokenToAttribute2(element, attribute, token, options = {}) {
     element.setAttribute(attribute, serialize([...set]));
   }
 }
-var snapshots2 = /* @__PURE__ */ new WeakMap();
-function restoreAttributes2(elements) {
+var snapshots = /* @__PURE__ */ new WeakMap();
+function restoreAttributes(elements) {
   for (const element of elements) {
-    const snapshot = snapshots2.get(element);
+    const snapshot = snapshots.get(element);
     if (!snapshot) {
       continue;
     }
     for (const [attribute, value] of snapshot.entries()) {
       value === null ? element.removeAttribute(attribute) : element.setAttribute(attribute, value);
     }
-    snapshots2.delete(element);
+    snapshots.delete(element);
   }
 }
-function saveAttributes2(elements, attributes) {
+function saveAttributes(elements, attributes) {
   elements.forEach((element) => {
-    let snapshot = snapshots2.get(element);
+    let snapshot = snapshots.get(element);
     if (!snapshot) {
       snapshot = /* @__PURE__ */ new Map();
-      snapshots2.set(element, snapshot);
+      snapshots.set(element, snapshot);
     }
     attributes.forEach((attribute) => {
       snapshot.set(attribute, element.getAttribute(attribute));
@@ -385,60 +336,12 @@ function createRovingTabIndex(container, options = {}) {
     return () => {
     };
   }
-  let {
-    direction,
-    navigationOnly = false,
-    noMemory = false,
-    noStart = false,
-    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 (typeof navigationOnly !== "boolean") {
-    console.warn("Invalid navigationOnly option. Fallback: false.");
-    navigationOnly = false;
-  }
-  if (typeof noMemory !== "boolean") {
-    console.warn("Invalid noMemory option. Fallback: false.");
-    noMemory = false;
-  }
-  if (typeof noStart !== "boolean") {
-    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 (typeof typeahead !== "boolean") {
-    console.warn("Invalid typeahead option. Fallback: false.");
-    typeahead = false;
-  }
-  if (typeof wrap !== "boolean") {
-    console.warn("Invalid wrap option. Fallback: false.");
-    wrap = false;
-  }
-  const settings = {
-    navigationOnly,
-    noMemory,
-    noStart,
-    typeahead,
-    wrap
-  };
-  direction && Object.assign(settings, { direction });
-  selector && Object.assign(settings, { selector });
-  const roving = new RovingTabIndex(container, settings);
+  const roving = new RovingTabIndex(container, options);
   return () => roving.destroy();
 }
 var RovingTabIndex = class {
   #container;
-  #options;
+  #settings;
   #focusables = /* @__PURE__ */ new Set();
   #focusablesByFirstChar = /* @__PURE__ */ new Map();
   #selectorFilter;
@@ -446,7 +349,54 @@ var RovingTabIndex = class {
   #isDestroyed = false;
   constructor(container, options = {}) {
     this.#container = container;
-    this.#options = options;
+    let {
+      direction,
+      navigationOnly = false,
+      noMemory = false,
+      noStart = false,
+      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 (typeof navigationOnly !== "boolean") {
+      console.warn("Invalid navigationOnly option. Fallback: false.");
+      navigationOnly = false;
+    }
+    if (typeof noMemory !== "boolean") {
+      console.warn("Invalid noMemory option. Fallback: false.");
+      noMemory = false;
+    }
+    if (typeof noStart !== "boolean") {
+      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 (typeof typeahead !== "boolean") {
+      console.warn("Invalid typeahead option. Fallback: false.");
+      typeahead = false;
+    }
+    if (typeof wrap !== "boolean") {
+      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.#selectorFilter = this.#createSelectorFilter();
     this.#initialize();
   }
@@ -457,7 +407,7 @@ var RovingTabIndex = class {
     this.#isDestroyed = true;
     this.#controller?.abort();
     this.#controller = null;
-    restoreAttributes2([...this.#focusables]);
+    restoreAttributes([...this.#focusables]);
     this.#focusables.clear();
     this.#focusablesByFirstChar.clear();
     this.#container.removeAttribute("data-roving-tabindex-initialized");
@@ -482,7 +432,7 @@ var RovingTabIndex = class {
       return;
     }
     const isFocusable22 = this.#focusables.has(target);
-    this.#options.noMemory && !isFocusable22 ? this.#update(null) : isFocusable22 && this.#update(target);
+    this.#settings.noMemory && !isFocusable22 ? this.#update(null) : isFocusable22 && this.#update(target);
   };
   #onKeyDown = (event) => {
     if (!event.composedPath().includes(this.#container)) {
@@ -492,7 +442,7 @@ var RovingTabIndex = class {
     if (altKey || ctrlKey || metaKey || shiftKey) {
       return;
     }
-    const { direction, typeahead, wrap } = this.#options;
+    const { direction, typeahead, wrap } = this.#settings;
     const isBoth = !direction;
     const isHorizontal = direction === "horizontal";
     if (![
@@ -551,7 +501,7 @@ var RovingTabIndex = class {
     const current = new Set(this.#getFocusables());
     for (const focusable of this.#focusables) {
       if (!current.has(focusable)) {
-        focusable.isConnected && restoreAttributes2([focusable]);
+        focusable.isConnected && restoreAttributes([focusable]);
         this.#focusables.delete(focusable);
         this.#focusablesByFirstChar.forEach((focusables) => {
           const index = focusables.indexOf(focusable);
@@ -559,14 +509,14 @@ var RovingTabIndex = class {
         });
       }
     }
-    const { navigationOnly, noStart, typeahead } = this.#options;
+    const { navigationOnly, noStart, typeahead } = this.#settings;
     for (const focusable of current) {
       if (this.#focusables.has(focusable)) {
         continue;
       }
       this.#focusables.add(focusable);
       if (!navigationOnly) {
-        saveAttributes2([focusable], ["tabindex"]);
+        saveAttributes([focusable], ["tabindex"]);
         focusable.setAttribute("tabindex", "-1");
       }
       if (!typeahead) {
@@ -579,8 +529,8 @@ var RovingTabIndex = class {
       );
       if (char) {
         keys.add(char);
-        saveAttributes2([focusable], ["aria-keyshortcuts"]);
-        addTokenToAttribute2(focusable, "aria-keyshortcuts", char, {
+        saveAttributes([focusable], ["aria-keyshortcuts"]);
+        addTokenToAttribute(focusable, "aria-keyshortcuts", char, {
           caseInsensitive: true
         });
       }
@@ -603,14 +553,14 @@ var RovingTabIndex = class {
     }
   }
   #createSelectorFilter() {
-    const { selector } = this.#options;
+    const { selector } = this.#settings;
     return (element) => !selector || [...this.#container.querySelectorAll(selector)].includes(element);
   }
   #getFocusables() {
     return getFocusables(this.#container, {
       composed: true,
       filter: this.#selectorFilter,
-      skipNegativeTabIndexCheck: !this.#options.navigationOnly,
+      skipNegativeTabIndexCheck: !this.#settings.navigationOnly,
       skipVisibilityCheck: true
     });
   }
@@ -680,11 +630,12 @@ var Accordion = class _Accordion {
     }
     this.#triggerElements.forEach((trigger2, i) => {
       const content2 = this.#contentElements[i];
-      if (content2) {
-        const binding = createBinding(trigger2, content2);
-        this.#bindings.set(trigger2, binding);
-        this.#bindings.set(content2, binding);
+      if (!content2) {
+        return;
       }
+      const binding = createBinding(trigger2, content2);
+      this.#bindings.set(trigger2, binding);
+      this.#bindings.set(content2, binding);
     });
     this.#initialize();
   }
@@ -692,11 +643,11 @@ var Accordion = class _Accordion {
     if (this.#isDestroyed) {
       return;
     }
-    if (!(trigger instanceof HTMLElement)) {
+    if (!(trigger instanceof HTMLElement) || !this.#bindings.has(trigger)) {
       console.warn("Invalid trigger element");
       return;
     }
-    this.#bindings.has(trigger) && this.#toggle(trigger, false);
+    this.#toggle(trigger, false);
   }
   async destroy(force = false) {
     if (this.#isDestroyed) {
@@ -727,11 +678,11 @@ var Accordion = class _Accordion {
     if (this.#isDestroyed) {
       return;
     }
-    if (!(trigger instanceof HTMLElement)) {
+    if (!(trigger instanceof HTMLElement) || !this.#bindings.has(trigger)) {
       console.warn("Invalid trigger element");
       return;
     }
-    this.#bindings.has(trigger) && this.#toggle(trigger, true);
+    this.#toggle(trigger, true);
   }
   #initialize() {
     saveAttributes(this.#triggerElements, [
@@ -793,7 +744,10 @@ var Accordion = class _Accordion {
       return;
     }
     const binding = this.#bindings.get(content);
-    binding && binding.trigger.ariaExpanded === "false" && this.#toggle(binding.trigger, true, true);
+    if (!binding) {
+      return;
+    }
+    binding.trigger.ariaExpanded === "false" && this.#toggle(binding.trigger, true, true);
   };
   #toggle(trigger, isOpen, isMatch = false) {
     if (trigger.ariaExpanded === String(isOpen)) {
@@ -858,7 +812,10 @@ var Accordion = class _Accordion {
   }
   #onAnimationFinish(content) {
     const trigger = this.#bindings.get(content)?.trigger;
-    if (trigger && trigger.ariaExpanded === "false") {
+    if (!trigger) {
+      return;
+    }
+    if (trigger.ariaExpanded === "false") {
       content.setAttribute("hidden", "until-found");
     }
     ["block-size", "overflow"].forEach((name) => {
@@ -893,7 +850,7 @@ function waitAnimationFinish(animation) {
  * Accordion
  * WAI-ARIA compliant accordion pattern implementation in TypeScript.
  *
- * @version 1.4.11
+ * @version 1.4.12
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -901,17 +858,6 @@ function waitAnimationFinish(animation) {
  */
 /*! Bundled license information:
 
-@y14e/attributes-utils/dist/index.js:
-  (**
-   * Attributes Utils
-   *
-   * @version 1.1.2
-   * @author Yusuke Kamiyamane
-   * @license MIT
-   * @copyright Copyright (c) Yusuke Kamiyamane
-   * @see {@link https://github.com/y14e/attributes-utils}
-   *)
-
 @y14e/button/dist/index.js:
   (**
    * Button
@@ -929,7 +875,7 @@ function waitAnimationFinish(animation) {
    * Lightweight roving tabindex utility with fully focus management.
    * Designed for accessible menus, tabs, toolbars, and composite widgets.
    *
-   * @version 3.0.5
+   * @version 3.0.7
    * @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.11
+ * @version 1.4.12
  * @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.11
+ * @version 1.4.12
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.js

@@ -1,52 +1,3 @@
-// node_modules/@y14e/attributes-utils/dist/index.js
-var DEFAULT_PARSER = (value) => value.split(/\s+/);
-var DEFAULT_SERIALIZER = (tokens) => tokens.join(" ");
-function addTokenToAttribute(element, attribute, token, options = {}) {
-  const {
-    caseInsensitive = false,
-    parse = DEFAULT_PARSER,
-    serialize = DEFAULT_SERIALIZER
-  } = options;
-  const value = element.getAttribute(attribute)?.trim();
-  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(attribute, serialize(tokens));
-    }
-  } else {
-    const set = new Set(tokens);
-    set.add(token);
-    element.setAttribute(attribute, serialize([...set]));
-  }
-}
-var snapshots = /* @__PURE__ */ new WeakMap();
-function restoreAttributes(elements) {
-  for (const element of 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);
-    }
-    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/@y14e/button/dist/index.js
 var Button = class {
   #element;
@@ -104,13 +55,13 @@ function getActiveElement() {
 }
 
 // node_modules/@y14e/roving-tabindex/dist/index.js
-var DEFAULT_PARSER2 = (value) => value.split(/\s+/);
-var DEFAULT_SERIALIZER2 = (tokens) => tokens.join(" ");
-function addTokenToAttribute2(element, attribute, token, options = {}) {
+var DEFAULT_PARSER = (value) => value.split(/\s+/);
+var DEFAULT_SERIALIZER = (tokens) => tokens.join(" ");
+function addTokenToAttribute(element, attribute, token, options = {}) {
   const {
     caseInsensitive = false,
-    parse = DEFAULT_PARSER2,
-    serialize = DEFAULT_SERIALIZER2
+    parse = DEFAULT_PARSER,
+    serialize = DEFAULT_SERIALIZER
   } = options;
   const value = element.getAttribute(attribute)?.trim();
   const tokens = value ? parse(value).filter(Boolean) : [];
@@ -126,25 +77,25 @@ function addTokenToAttribute2(element, attribute, token, options = {}) {
     element.setAttribute(attribute, serialize([...set]));
   }
 }
-var snapshots2 = /* @__PURE__ */ new WeakMap();
-function restoreAttributes2(elements) {
+var snapshots = /* @__PURE__ */ new WeakMap();
+function restoreAttributes(elements) {
   for (const element of elements) {
-    const snapshot = snapshots2.get(element);
+    const snapshot = snapshots.get(element);
     if (!snapshot) {
       continue;
     }
     for (const [attribute, value] of snapshot.entries()) {
       value === null ? element.removeAttribute(attribute) : element.setAttribute(attribute, value);
     }
-    snapshots2.delete(element);
+    snapshots.delete(element);
   }
 }
-function saveAttributes2(elements, attributes) {
+function saveAttributes(elements, attributes) {
   elements.forEach((element) => {
-    let snapshot = snapshots2.get(element);
+    let snapshot = snapshots.get(element);
     if (!snapshot) {
       snapshot = /* @__PURE__ */ new Map();
-      snapshots2.set(element, snapshot);
+      snapshots.set(element, snapshot);
     }
     attributes.forEach((attribute) => {
       snapshot.set(attribute, element.getAttribute(attribute));
@@ -383,60 +334,12 @@ function createRovingTabIndex(container, options = {}) {
     return () => {
     };
   }
-  let {
-    direction,
-    navigationOnly = false,
-    noMemory = false,
-    noStart = false,
-    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 (typeof navigationOnly !== "boolean") {
-    console.warn("Invalid navigationOnly option. Fallback: false.");
-    navigationOnly = false;
-  }
-  if (typeof noMemory !== "boolean") {
-    console.warn("Invalid noMemory option. Fallback: false.");
-    noMemory = false;
-  }
-  if (typeof noStart !== "boolean") {
-    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 (typeof typeahead !== "boolean") {
-    console.warn("Invalid typeahead option. Fallback: false.");
-    typeahead = false;
-  }
-  if (typeof wrap !== "boolean") {
-    console.warn("Invalid wrap option. Fallback: false.");
-    wrap = false;
-  }
-  const settings = {
-    navigationOnly,
-    noMemory,
-    noStart,
-    typeahead,
-    wrap
-  };
-  direction && Object.assign(settings, { direction });
-  selector && Object.assign(settings, { selector });
-  const roving = new RovingTabIndex(container, settings);
+  const roving = new RovingTabIndex(container, options);
   return () => roving.destroy();
 }
 var RovingTabIndex = class {
   #container;
-  #options;
+  #settings;
   #focusables = /* @__PURE__ */ new Set();
   #focusablesByFirstChar = /* @__PURE__ */ new Map();
   #selectorFilter;
@@ -444,7 +347,54 @@ var RovingTabIndex = class {
   #isDestroyed = false;
   constructor(container, options = {}) {
     this.#container = container;
-    this.#options = options;
+    let {
+      direction,
+      navigationOnly = false,
+      noMemory = false,
+      noStart = false,
+      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 (typeof navigationOnly !== "boolean") {
+      console.warn("Invalid navigationOnly option. Fallback: false.");
+      navigationOnly = false;
+    }
+    if (typeof noMemory !== "boolean") {
+      console.warn("Invalid noMemory option. Fallback: false.");
+      noMemory = false;
+    }
+    if (typeof noStart !== "boolean") {
+      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 (typeof typeahead !== "boolean") {
+      console.warn("Invalid typeahead option. Fallback: false.");
+      typeahead = false;
+    }
+    if (typeof wrap !== "boolean") {
+      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.#selectorFilter = this.#createSelectorFilter();
     this.#initialize();
   }
@@ -455,7 +405,7 @@ var RovingTabIndex = class {
     this.#isDestroyed = true;
     this.#controller?.abort();
     this.#controller = null;
-    restoreAttributes2([...this.#focusables]);
+    restoreAttributes([...this.#focusables]);
     this.#focusables.clear();
     this.#focusablesByFirstChar.clear();
     this.#container.removeAttribute("data-roving-tabindex-initialized");
@@ -480,7 +430,7 @@ var RovingTabIndex = class {
       return;
     }
     const isFocusable22 = this.#focusables.has(target);
-    this.#options.noMemory && !isFocusable22 ? this.#update(null) : isFocusable22 && this.#update(target);
+    this.#settings.noMemory && !isFocusable22 ? this.#update(null) : isFocusable22 && this.#update(target);
   };
   #onKeyDown = (event) => {
     if (!event.composedPath().includes(this.#container)) {
@@ -490,7 +440,7 @@ var RovingTabIndex = class {
     if (altKey || ctrlKey || metaKey || shiftKey) {
       return;
     }
-    const { direction, typeahead, wrap } = this.#options;
+    const { direction, typeahead, wrap } = this.#settings;
     const isBoth = !direction;
     const isHorizontal = direction === "horizontal";
     if (![
@@ -549,7 +499,7 @@ var RovingTabIndex = class {
     const current = new Set(this.#getFocusables());
     for (const focusable of this.#focusables) {
       if (!current.has(focusable)) {
-        focusable.isConnected && restoreAttributes2([focusable]);
+        focusable.isConnected && restoreAttributes([focusable]);
         this.#focusables.delete(focusable);
         this.#focusablesByFirstChar.forEach((focusables) => {
           const index = focusables.indexOf(focusable);
@@ -557,14 +507,14 @@ var RovingTabIndex = class {
         });
       }
     }
-    const { navigationOnly, noStart, typeahead } = this.#options;
+    const { navigationOnly, noStart, typeahead } = this.#settings;
     for (const focusable of current) {
       if (this.#focusables.has(focusable)) {
         continue;
       }
       this.#focusables.add(focusable);
       if (!navigationOnly) {
-        saveAttributes2([focusable], ["tabindex"]);
+        saveAttributes([focusable], ["tabindex"]);
         focusable.setAttribute("tabindex", "-1");
       }
       if (!typeahead) {
@@ -577,8 +527,8 @@ var RovingTabIndex = class {
       );
       if (char) {
         keys.add(char);
-        saveAttributes2([focusable], ["aria-keyshortcuts"]);
-        addTokenToAttribute2(focusable, "aria-keyshortcuts", char, {
+        saveAttributes([focusable], ["aria-keyshortcuts"]);
+        addTokenToAttribute(focusable, "aria-keyshortcuts", char, {
           caseInsensitive: true
         });
       }
@@ -601,14 +551,14 @@ var RovingTabIndex = class {
     }
   }
   #createSelectorFilter() {
-    const { selector } = this.#options;
+    const { selector } = this.#settings;
     return (element) => !selector || [...this.#container.querySelectorAll(selector)].includes(element);
   }
   #getFocusables() {
     return getFocusables(this.#container, {
       composed: true,
       filter: this.#selectorFilter,
-      skipNegativeTabIndexCheck: !this.#options.navigationOnly,
+      skipNegativeTabIndexCheck: !this.#settings.navigationOnly,
       skipVisibilityCheck: true
     });
   }
@@ -678,11 +628,12 @@ var Accordion = class _Accordion {
     }
     this.#triggerElements.forEach((trigger2, i) => {
       const content2 = this.#contentElements[i];
-      if (content2) {
-        const binding = createBinding(trigger2, content2);
-        this.#bindings.set(trigger2, binding);
-        this.#bindings.set(content2, binding);
+      if (!content2) {
+        return;
       }
+      const binding = createBinding(trigger2, content2);
+      this.#bindings.set(trigger2, binding);
+      this.#bindings.set(content2, binding);
     });
     this.#initialize();
   }
@@ -690,11 +641,11 @@ var Accordion = class _Accordion {
     if (this.#isDestroyed) {
       return;
     }
-    if (!(trigger instanceof HTMLElement)) {
+    if (!(trigger instanceof HTMLElement) || !this.#bindings.has(trigger)) {
       console.warn("Invalid trigger element");
       return;
     }
-    this.#bindings.has(trigger) && this.#toggle(trigger, false);
+    this.#toggle(trigger, false);
   }
   async destroy(force = false) {
     if (this.#isDestroyed) {
@@ -725,11 +676,11 @@ var Accordion = class _Accordion {
     if (this.#isDestroyed) {
       return;
     }
-    if (!(trigger instanceof HTMLElement)) {
+    if (!(trigger instanceof HTMLElement) || !this.#bindings.has(trigger)) {
       console.warn("Invalid trigger element");
       return;
     }
-    this.#bindings.has(trigger) && this.#toggle(trigger, true);
+    this.#toggle(trigger, true);
   }
   #initialize() {
     saveAttributes(this.#triggerElements, [
@@ -791,7 +742,10 @@ var Accordion = class _Accordion {
       return;
     }
     const binding = this.#bindings.get(content);
-    binding && binding.trigger.ariaExpanded === "false" && this.#toggle(binding.trigger, true, true);
+    if (!binding) {
+      return;
+    }
+    binding.trigger.ariaExpanded === "false" && this.#toggle(binding.trigger, true, true);
   };
   #toggle(trigger, isOpen, isMatch = false) {
     if (trigger.ariaExpanded === String(isOpen)) {
@@ -856,7 +810,10 @@ var Accordion = class _Accordion {
   }
   #onAnimationFinish(content) {
     const trigger = this.#bindings.get(content)?.trigger;
-    if (trigger && trigger.ariaExpanded === "false") {
+    if (!trigger) {
+      return;
+    }
+    if (trigger.ariaExpanded === "false") {
       content.setAttribute("hidden", "until-found");
     }
     ["block-size", "overflow"].forEach((name) => {
@@ -891,7 +848,7 @@ function waitAnimationFinish(animation) {
  * Accordion
  * WAI-ARIA compliant accordion pattern implementation in TypeScript.
  *
- * @version 1.4.11
+ * @version 1.4.12
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -899,17 +856,6 @@ function waitAnimationFinish(animation) {
  */
 /*! Bundled license information:
 
-@y14e/attributes-utils/dist/index.js:
-  (**
-   * Attributes Utils
-   *
-   * @version 1.1.2
-   * @author Yusuke Kamiyamane
-   * @license MIT
-   * @copyright Copyright (c) Yusuke Kamiyamane
-   * @see {@link https://github.com/y14e/attributes-utils}
-   *)
-
 @y14e/button/dist/index.js:
   (**
    * Button
@@ -927,7 +873,7 @@ function waitAnimationFinish(animation) {
    * Lightweight roving tabindex utility with fully focus management.
    * Designed for accessible menus, tabs, toolbars, and composite widgets.
    *
-   * @version 3.0.5
+   * @version 3.0.7
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane

package/package.json

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