@y14e/accordion 1.4.18 → 2.0.2

package/README.md

@@ -13,11 +13,11 @@ npm i @y14e/accordion
 import Accordion from '@y14e/accordion';
 
 // CDNs
-import Accordion from 'https://esm.sh/@y14e/accordion@1.4.18';
+import Accordion from 'https://esm.sh/@y14e/accordion@2.0.2';
 // or
-import Accordion from 'https://cdn.jsdelivr.net/npm/@y14e/accordion@1.4.18/+esm';
+import Accordion from 'https://cdn.jsdelivr.net/npm/@y14e/accordion@2.0.2/+esm';
 // or
-import Accordion from 'https://esm.unpkg.com/@y14e/accordion@1.4.18';
+import Accordion from 'https://esm.unpkg.com/@y14e/accordion@2.0.2';
 ```
 
 ## Usage
@@ -36,12 +36,13 @@ new Accordion(root, options);
 ```ts
 interface AccordionOptions {
   animation?: {
-    duration?: number; // ms (default: 300)
-    easing?: string;   // <easing-function> (default: 'ease')
+    duration?: number;   // ms (default: 300)
+    easing?: string;     // <easing-function> (default: 'ease')
   };
+  collapsible?: boolean; // default: true
   selector?: {
-    content?: string;  // default: ':has(> [data-accordion-trigger]) + *'
-    trigger?: string;  // default: '[data-accordion-trigger]'
+    content?: string;    // default: '[data-accordion-content]'
+    trigger?: string;    // default: '[data-accordion-trigger]'
   };
 }
 ```
@@ -68,10 +69,10 @@ new Accordion(root);
 
 ## 📦 APIs
 
-### `close`
+### `collapse`
 
 ```ts
-accordion.close(trigger);
+accordion.collapse(trigger);
 // => void
 //
 // trigger: HTMLElement
@@ -88,10 +89,10 @@ accordion.destroy(force);
 // force (optional): If true, skips waiting for animations to finish.
 ```
 
-### `open`
+### `expand`
 
 ```ts
-accordion.open(trigger);
+accordion.expand(trigger);
 // => void
 //
 // trigger: HTMLElement

package/dist/index.bundle.cjs

@@ -4,12 +4,12 @@
 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();
   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();
@@ -402,13 +402,7 @@ var RovingTabIndex = class _RovingTabIndex {
       console.warn("Invalid wrap option. Fallback: false.");
       wrap = false;
     }
-    this.#settings = {
-      navigationOnly,
-      noMemory,
-      noStart,
-      typeahead,
-      wrap
-    };
+    this.#settings = { navigationOnly, noMemory, noStart, typeahead, wrap };
     direction && Object.assign(this.#settings, { direction });
     selector && Object.assign(this.#settings, { selector });
     this.#selectorFilter = this.#createSelectorFilter();
@@ -427,29 +421,32 @@ var RovingTabIndex = class _RovingTabIndex {
   }
   #initialize() {
     this.#update(getActiveElement());
-    if (!(this.#container instanceof HTMLElement)) {
-      return;
-    }
     this.#controller = new AbortController();
     const { signal } = this.#controller;
-    document.addEventListener("focusin", this.#onFocusIn, { signal });
-    this.#settings.noMemory && document.addEventListener("focusout", this.#onFocusOut, { signal });
+    this.#container.addEventListener("focusin", this.#onFocusIn, { signal });
+    this.#settings.noMemory && this.#container.addEventListener("focusout", this.#onFocusOut, {
+      signal
+    });
     this.#container.addEventListener("keydown", this.#onKeyDown, { signal });
   }
   #onFocusIn = (event) => {
-    const { target } = event;
-    if (!(target instanceof Element)) {
+    if (!(event instanceof FocusEvent)) {
       return;
     }
-    const isFocusable2 = this.#focusables.has(target);
-    this.#settings.noMemory && !isFocusable2 ? this.#update() : isFocusable2 && this.#update(target);
+    const { target } = event;
+    target instanceof Element && this.#update(target);
   };
   #onFocusOut = (event) => {
-    if (!event.relatedTarget) {
-      this.#update();
+    if (!(event instanceof FocusEvent)) {
+      return;
     }
+    const target = event.relatedTarget;
+    (!(target instanceof Element) || !this.#focusables.has(target)) && this.#update();
   };
   #onKeyDown = (event) => {
+    if (!(event instanceof KeyboardEvent)) {
+      return;
+    }
     const { key, altKey, ctrlKey, metaKey, shiftKey } = event;
     if (altKey || ctrlKey || metaKey || shiftKey) {
       return;
@@ -468,7 +465,7 @@ var RovingTabIndex = class _RovingTabIndex {
       }
     }
     const active = getActiveElement();
-    if (!(active instanceof HTMLElement)) {
+    if (!(active instanceof Element)) {
       return;
     }
     const current = this.#getFocusables();
@@ -588,8 +585,9 @@ var Accordion = class _Accordion {
   #rootElement;
   #defaults = {
     animation: { duration: 300, easing: "ease" },
+    collapsible: true,
     selector: {
-      content: ":has(> [data-accordion-trigger]) + *",
+      content: "[data-accordion-content]",
       trigger: "[data-accordion-trigger]"
     }
   };
@@ -645,7 +643,7 @@ var Accordion = class _Accordion {
     });
     this.#initialize();
   }
-  close(trigger) {
+  collapse(trigger) {
     if (this.#isDestroyed) {
       return;
     }
@@ -680,7 +678,7 @@ var Accordion = class _Accordion {
     this.#contentElements.length = 0;
     this.#rootElement.removeAttribute("data-accordion-initialized");
   }
-  open(trigger) {
+  expand(trigger) {
     if (this.#isDestroyed) {
       return;
     }
@@ -765,21 +763,24 @@ var Accordion = class _Accordion {
     }
     binding.trigger.ariaExpanded === "false" && this.#toggle(binding.trigger, true, true);
   };
-  #toggle(trigger, isOpen, isMatch = false) {
-    if (trigger.ariaExpanded === String(isOpen)) {
+  #toggle(trigger, isExpand, isMatch = false, isProgrammatic = false) {
+    if (trigger.ariaExpanded === String(isExpand)) {
+      return;
+    }
+    if (!isExpand && !isProgrammatic && !this.#settings.collapsible && this.#triggerElements.filter((trigger2) => trigger2.ariaExpanded === "true").length <= 1) {
       return;
     }
     const name = trigger.getAttribute("data-accordion-name");
-    if (name && isOpen) {
-      const open = this.#triggerElements.find(
+    if (name && isExpand) {
+      const expanded = this.#triggerElements.find(
         (t) => t !== trigger && t.getAttribute("data-accordion-name") === name && t.ariaExpanded === "true"
       );
-      open && this.#toggle(open, false, isMatch);
+      expanded && this.#toggle(expanded, false, isMatch, true);
     }
     trigger.setAttribute(
       "aria-label",
       trigger.getAttribute(
-        `data-accordion-${isOpen ? "expanded" : "collapsed"}-label`
+        `data-accordion-${isExpand ? "expanded" : "collapsed"}-label`
       ) ?? trigger.ariaLabel ?? ""
     );
     const binding = this.#bindings.get(trigger);
@@ -791,7 +792,7 @@ var Accordion = class _Accordion {
     if (content.hidden) {
       content.hidden = false;
     }
-    const endSize = isOpen ? content.scrollHeight : 0;
+    const endSize = isExpand ? content.scrollHeight : 0;
     binding.animation?.cancel();
     content.style.setProperty("overflow", "clip");
     const { duration, easing } = this.#settings.animation;
@@ -800,7 +801,7 @@ var Accordion = class _Accordion {
       { duration: isMatch ? 0 : duration, easing }
     );
     binding.animation = animation;
-    trigger.setAttribute("aria-expanded", String(isOpen));
+    trigger.setAttribute("aria-expanded", String(isExpand));
     function cleanup() {
       if (binding?.animation === animation) {
         binding.animation = null;
@@ -828,6 +829,8 @@ var Accordion = class _Accordion {
   }
   #mergeOptions(target, source) {
     return {
+      ...target,
+      ...source,
       animation: { ...target.animation, ...source.animation ?? {} },
       selector: { ...target.selector, ...source.selector ?? {} }
     };
@@ -850,7 +853,7 @@ function waitAnimationFinish(animation) {
  * Accordion
  * WAI-ARIA compliant accordion pattern implementation in TypeScript.
  *
- * @version 1.4.18
+ * @version 2.0.2
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -862,7 +865,7 @@ function waitAnimationFinish(animation) {
   (**
    * Attributes Utils
    *
-   * @version 1.1.2
+   * @version 1.1.3
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane
@@ -875,7 +878,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.5
+   * @version 4.3.8
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane
@@ -899,7 +902,7 @@ power-focusable/dist/index.js:
    * Lightweight roving tabindex utility with fully focus management.
    * Designed for accessible menus, tabs, toolbars, and composite widgets.
    *
-   * @version 3.1.2
+   * @version 3.1.6
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.bundle.js

@@ -2,12 +2,12 @@
 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();
   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();
@@ -400,13 +400,7 @@ var RovingTabIndex = class _RovingTabIndex {
       console.warn("Invalid wrap option. Fallback: false.");
       wrap = false;
     }
-    this.#settings = {
-      navigationOnly,
-      noMemory,
-      noStart,
-      typeahead,
-      wrap
-    };
+    this.#settings = { navigationOnly, noMemory, noStart, typeahead, wrap };
     direction && Object.assign(this.#settings, { direction });
     selector && Object.assign(this.#settings, { selector });
     this.#selectorFilter = this.#createSelectorFilter();
@@ -425,29 +419,32 @@ var RovingTabIndex = class _RovingTabIndex {
   }
   #initialize() {
     this.#update(getActiveElement());
-    if (!(this.#container instanceof HTMLElement)) {
-      return;
-    }
     this.#controller = new AbortController();
     const { signal } = this.#controller;
-    document.addEventListener("focusin", this.#onFocusIn, { signal });
-    this.#settings.noMemory && document.addEventListener("focusout", this.#onFocusOut, { signal });
+    this.#container.addEventListener("focusin", this.#onFocusIn, { signal });
+    this.#settings.noMemory && this.#container.addEventListener("focusout", this.#onFocusOut, {
+      signal
+    });
     this.#container.addEventListener("keydown", this.#onKeyDown, { signal });
   }
   #onFocusIn = (event) => {
-    const { target } = event;
-    if (!(target instanceof Element)) {
+    if (!(event instanceof FocusEvent)) {
       return;
     }
-    const isFocusable2 = this.#focusables.has(target);
-    this.#settings.noMemory && !isFocusable2 ? this.#update() : isFocusable2 && this.#update(target);
+    const { target } = event;
+    target instanceof Element && this.#update(target);
   };
   #onFocusOut = (event) => {
-    if (!event.relatedTarget) {
-      this.#update();
+    if (!(event instanceof FocusEvent)) {
+      return;
     }
+    const target = event.relatedTarget;
+    (!(target instanceof Element) || !this.#focusables.has(target)) && this.#update();
   };
   #onKeyDown = (event) => {
+    if (!(event instanceof KeyboardEvent)) {
+      return;
+    }
     const { key, altKey, ctrlKey, metaKey, shiftKey } = event;
     if (altKey || ctrlKey || metaKey || shiftKey) {
       return;
@@ -466,7 +463,7 @@ var RovingTabIndex = class _RovingTabIndex {
       }
     }
     const active = getActiveElement();
-    if (!(active instanceof HTMLElement)) {
+    if (!(active instanceof Element)) {
       return;
     }
     const current = this.#getFocusables();
@@ -586,8 +583,9 @@ var Accordion = class _Accordion {
   #rootElement;
   #defaults = {
     animation: { duration: 300, easing: "ease" },
+    collapsible: true,
     selector: {
-      content: ":has(> [data-accordion-trigger]) + *",
+      content: "[data-accordion-content]",
       trigger: "[data-accordion-trigger]"
     }
   };
@@ -643,7 +641,7 @@ var Accordion = class _Accordion {
     });
     this.#initialize();
   }
-  close(trigger) {
+  collapse(trigger) {
     if (this.#isDestroyed) {
       return;
     }
@@ -678,7 +676,7 @@ var Accordion = class _Accordion {
     this.#contentElements.length = 0;
     this.#rootElement.removeAttribute("data-accordion-initialized");
   }
-  open(trigger) {
+  expand(trigger) {
     if (this.#isDestroyed) {
       return;
     }
@@ -763,21 +761,24 @@ var Accordion = class _Accordion {
     }
     binding.trigger.ariaExpanded === "false" && this.#toggle(binding.trigger, true, true);
   };
-  #toggle(trigger, isOpen, isMatch = false) {
-    if (trigger.ariaExpanded === String(isOpen)) {
+  #toggle(trigger, isExpand, isMatch = false, isProgrammatic = false) {
+    if (trigger.ariaExpanded === String(isExpand)) {
+      return;
+    }
+    if (!isExpand && !isProgrammatic && !this.#settings.collapsible && this.#triggerElements.filter((trigger2) => trigger2.ariaExpanded === "true").length <= 1) {
       return;
     }
     const name = trigger.getAttribute("data-accordion-name");
-    if (name && isOpen) {
-      const open = this.#triggerElements.find(
+    if (name && isExpand) {
+      const expanded = this.#triggerElements.find(
         (t) => t !== trigger && t.getAttribute("data-accordion-name") === name && t.ariaExpanded === "true"
       );
-      open && this.#toggle(open, false, isMatch);
+      expanded && this.#toggle(expanded, false, isMatch, true);
     }
     trigger.setAttribute(
       "aria-label",
       trigger.getAttribute(
-        `data-accordion-${isOpen ? "expanded" : "collapsed"}-label`
+        `data-accordion-${isExpand ? "expanded" : "collapsed"}-label`
       ) ?? trigger.ariaLabel ?? ""
     );
     const binding = this.#bindings.get(trigger);
@@ -789,7 +790,7 @@ var Accordion = class _Accordion {
     if (content.hidden) {
       content.hidden = false;
     }
-    const endSize = isOpen ? content.scrollHeight : 0;
+    const endSize = isExpand ? content.scrollHeight : 0;
     binding.animation?.cancel();
     content.style.setProperty("overflow", "clip");
     const { duration, easing } = this.#settings.animation;
@@ -798,7 +799,7 @@ var Accordion = class _Accordion {
       { duration: isMatch ? 0 : duration, easing }
     );
     binding.animation = animation;
-    trigger.setAttribute("aria-expanded", String(isOpen));
+    trigger.setAttribute("aria-expanded", String(isExpand));
     function cleanup() {
       if (binding?.animation === animation) {
         binding.animation = null;
@@ -826,6 +827,8 @@ var Accordion = class _Accordion {
   }
   #mergeOptions(target, source) {
     return {
+      ...target,
+      ...source,
       animation: { ...target.animation, ...source.animation ?? {} },
       selector: { ...target.selector, ...source.selector ?? {} }
     };
@@ -848,7 +851,7 @@ function waitAnimationFinish(animation) {
  * Accordion
  * WAI-ARIA compliant accordion pattern implementation in TypeScript.
  *
- * @version 1.4.18
+ * @version 2.0.2
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -860,7 +863,7 @@ function waitAnimationFinish(animation) {
   (**
    * Attributes Utils
    *
-   * @version 1.1.2
+   * @version 1.1.3
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane
@@ -873,7 +876,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.5
+   * @version 4.3.8
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane
@@ -897,7 +900,7 @@ power-focusable/dist/index.js:
    * Lightweight roving tabindex utility with fully focus management.
    * Designed for accessible menus, tabs, toolbars, and composite widgets.
    *
-   * @version 3.1.2
+   * @version 3.1.6
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.cjs

@@ -14,8 +14,9 @@ var Accordion = class _Accordion {
   #rootElement;
   #defaults = {
     animation: { duration: 300, easing: "ease" },
+    collapsible: true,
     selector: {
-      content: ":has(> [data-accordion-trigger]) + *",
+      content: "[data-accordion-content]",
       trigger: "[data-accordion-trigger]"
     }
   };
@@ -71,7 +72,7 @@ var Accordion = class _Accordion {
     });
     this.#initialize();
   }
-  close(trigger) {
+  collapse(trigger) {
     if (this.#isDestroyed) {
       return;
     }
@@ -106,7 +107,7 @@ var Accordion = class _Accordion {
     this.#contentElements.length = 0;
     this.#rootElement.removeAttribute("data-accordion-initialized");
   }
-  open(trigger) {
+  expand(trigger) {
     if (this.#isDestroyed) {
       return;
     }
@@ -191,21 +192,24 @@ var Accordion = class _Accordion {
     }
     binding.trigger.ariaExpanded === "false" && this.#toggle(binding.trigger, true, true);
   };
-  #toggle(trigger, isOpen, isMatch = false) {
-    if (trigger.ariaExpanded === String(isOpen)) {
+  #toggle(trigger, isExpand, isMatch = false, isProgrammatic = false) {
+    if (trigger.ariaExpanded === String(isExpand)) {
+      return;
+    }
+    if (!isExpand && !isProgrammatic && !this.#settings.collapsible && this.#triggerElements.filter((trigger2) => trigger2.ariaExpanded === "true").length <= 1) {
       return;
     }
     const name = trigger.getAttribute("data-accordion-name");
-    if (name && isOpen) {
-      const open = this.#triggerElements.find(
+    if (name && isExpand) {
+      const expanded = this.#triggerElements.find(
         (t) => t !== trigger && t.getAttribute("data-accordion-name") === name && t.ariaExpanded === "true"
       );
-      open && this.#toggle(open, false, isMatch);
+      expanded && this.#toggle(expanded, false, isMatch, true);
     }
     trigger.setAttribute(
       "aria-label",
       trigger.getAttribute(
-        `data-accordion-${isOpen ? "expanded" : "collapsed"}-label`
+        `data-accordion-${isExpand ? "expanded" : "collapsed"}-label`
       ) ?? trigger.ariaLabel ?? ""
     );
     const binding = this.#bindings.get(trigger);
@@ -217,7 +221,7 @@ var Accordion = class _Accordion {
     if (content.hidden) {
       content.hidden = false;
     }
-    const endSize = isOpen ? content.scrollHeight : 0;
+    const endSize = isExpand ? content.scrollHeight : 0;
     binding.animation?.cancel();
     content.style.setProperty("overflow", "clip");
     const { duration, easing } = this.#settings.animation;
@@ -226,7 +230,7 @@ var Accordion = class _Accordion {
       { duration: isMatch ? 0 : duration, easing }
     );
     binding.animation = animation;
-    trigger.setAttribute("aria-expanded", String(isOpen));
+    trigger.setAttribute("aria-expanded", String(isExpand));
     function cleanup() {
       if (binding?.animation === animation) {
         binding.animation = null;
@@ -254,6 +258,8 @@ var Accordion = class _Accordion {
   }
   #mergeOptions(target, source) {
     return {
+      ...target,
+      ...source,
       animation: { ...target.animation, ...source.animation ?? {} },
       selector: { ...target.selector, ...source.selector ?? {} }
     };
@@ -276,7 +282,7 @@ function waitAnimationFinish(animation) {
  * Accordion
  * WAI-ARIA compliant accordion pattern implementation in TypeScript.
  *
- * @version 1.4.18
+ * @version 2.0.2
  * @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.18
+ * @version 2.0.2
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -13,6 +13,7 @@ interface AccordionOptions {
         readonly duration?: number;
         readonly easing?: string;
     };
+    readonly collapsible?: boolean;
     readonly selector?: {
         readonly content?: string;
         readonly trigger?: string;
@@ -22,9 +23,9 @@ declare class Accordion {
     #private;
     static defaults: AccordionOptions;
     constructor(root: HTMLElement, options?: AccordionOptions);
-    close(trigger: HTMLElement): void;
+    collapse(trigger: HTMLElement): void;
     destroy(force?: boolean): Promise<void>;
-    open(trigger: HTMLElement): void;
+    expand(trigger: HTMLElement): void;
 }
 
 export { type AccordionOptions, Accordion as default };

package/dist/index.d.ts

@@ -2,7 +2,7 @@
  * Accordion
  * WAI-ARIA compliant accordion pattern implementation in TypeScript.
  *
- * @version 1.4.18
+ * @version 2.0.2
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -13,6 +13,7 @@ interface AccordionOptions {
         readonly duration?: number;
         readonly easing?: string;
     };
+    readonly collapsible?: boolean;
     readonly selector?: {
         readonly content?: string;
         readonly trigger?: string;
@@ -22,9 +23,9 @@ declare class Accordion {
     #private;
     static defaults: AccordionOptions;
     constructor(root: HTMLElement, options?: AccordionOptions);
-    close(trigger: HTMLElement): void;
+    collapse(trigger: HTMLElement): void;
     destroy(force?: boolean): Promise<void>;
-    open(trigger: HTMLElement): void;
+    expand(trigger: HTMLElement): void;
 }
 
 export { type AccordionOptions, Accordion as default };

package/dist/index.js

@@ -8,8 +8,9 @@ var Accordion = class _Accordion {
   #rootElement;
   #defaults = {
     animation: { duration: 300, easing: "ease" },
+    collapsible: true,
     selector: {
-      content: ":has(> [data-accordion-trigger]) + *",
+      content: "[data-accordion-content]",
       trigger: "[data-accordion-trigger]"
     }
   };
@@ -65,7 +66,7 @@ var Accordion = class _Accordion {
     });
     this.#initialize();
   }
-  close(trigger) {
+  collapse(trigger) {
     if (this.#isDestroyed) {
       return;
     }
@@ -100,7 +101,7 @@ var Accordion = class _Accordion {
     this.#contentElements.length = 0;
     this.#rootElement.removeAttribute("data-accordion-initialized");
   }
-  open(trigger) {
+  expand(trigger) {
     if (this.#isDestroyed) {
       return;
     }
@@ -185,21 +186,24 @@ var Accordion = class _Accordion {
     }
     binding.trigger.ariaExpanded === "false" && this.#toggle(binding.trigger, true, true);
   };
-  #toggle(trigger, isOpen, isMatch = false) {
-    if (trigger.ariaExpanded === String(isOpen)) {
+  #toggle(trigger, isExpand, isMatch = false, isProgrammatic = false) {
+    if (trigger.ariaExpanded === String(isExpand)) {
+      return;
+    }
+    if (!isExpand && !isProgrammatic && !this.#settings.collapsible && this.#triggerElements.filter((trigger2) => trigger2.ariaExpanded === "true").length <= 1) {
       return;
     }
     const name = trigger.getAttribute("data-accordion-name");
-    if (name && isOpen) {
-      const open = this.#triggerElements.find(
+    if (name && isExpand) {
+      const expanded = this.#triggerElements.find(
         (t) => t !== trigger && t.getAttribute("data-accordion-name") === name && t.ariaExpanded === "true"
       );
-      open && this.#toggle(open, false, isMatch);
+      expanded && this.#toggle(expanded, false, isMatch, true);
     }
     trigger.setAttribute(
       "aria-label",
       trigger.getAttribute(
-        `data-accordion-${isOpen ? "expanded" : "collapsed"}-label`
+        `data-accordion-${isExpand ? "expanded" : "collapsed"}-label`
       ) ?? trigger.ariaLabel ?? ""
     );
     const binding = this.#bindings.get(trigger);
@@ -211,7 +215,7 @@ var Accordion = class _Accordion {
     if (content.hidden) {
       content.hidden = false;
     }
-    const endSize = isOpen ? content.scrollHeight : 0;
+    const endSize = isExpand ? content.scrollHeight : 0;
     binding.animation?.cancel();
     content.style.setProperty("overflow", "clip");
     const { duration, easing } = this.#settings.animation;
@@ -220,7 +224,7 @@ var Accordion = class _Accordion {
       { duration: isMatch ? 0 : duration, easing }
     );
     binding.animation = animation;
-    trigger.setAttribute("aria-expanded", String(isOpen));
+    trigger.setAttribute("aria-expanded", String(isExpand));
     function cleanup() {
       if (binding?.animation === animation) {
         binding.animation = null;
@@ -248,6 +252,8 @@ var Accordion = class _Accordion {
   }
   #mergeOptions(target, source) {
     return {
+      ...target,
+      ...source,
       animation: { ...target.animation, ...source.animation ?? {} },
       selector: { ...target.selector, ...source.selector ?? {} }
     };
@@ -270,7 +276,7 @@ function waitAnimationFinish(animation) {
  * Accordion
  * WAI-ARIA compliant accordion pattern implementation in TypeScript.
  *
- * @version 1.4.18
+ * @version 2.0.2
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@y14e/accordion",
-  "version": "1.4.18",
+  "version": "2.0.2",
   "description": "WAI-ARIA compliant accordion pattern implementation in TypeScript",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -52,8 +52,8 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@y14e/attributes-utils": "^1.1.2",
+    "@y14e/attributes-utils": "^1.1.3",
     "@y14e/button": "^1.0.6",
-    "@y14e/roving-tabindex": "^3.1.2"
+    "@y14e/roving-tabindex": "^3.1.6"
   }
 }