@y14e/accordion 1.4.9 → 1.4.10

package/README.md

@@ -10,14 +10,14 @@ npm i @y14e/accordion
 
 ```ts
 // npm
-import Accordion from '@y14e/accordion@1.4.9';
+import Accordion from '@y14e/accordion@1.4.10';
 
 // CDNs
-import Accordion from 'https://esm.sh/@y14e/accordion@1.4.9';
+import Accordion from 'https://esm.sh/@y14e/accordion@1.4.10';
 // or
-import Accordion from 'https://cdn.jsdelivr.net/npm/@y14e/accordion@1.4.9/+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.9';
+import Accordion from 'https://esm.unpkg.com/@y14e/accordion@1.4.10';
 ```
 
 ## Usage

package/dist/index.cjs

@@ -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() {
@@ -478,11 +477,10 @@ var RovingTabIndex = class {
   }
   #onFocusIn = (event) => {
     const { target } = event;
-    if (!(target instanceof Element)) {
-      return;
+    if (target instanceof Element) {
+      const isFocusable22 = this.#focusables.has(target);
+      this.#options.noMemory && !isFocusable22 ? this.#update(null) : isFocusable22 && this.#update(target);
     }
-    const isFocusable22 = this.#focusables.has(target);
-    this.#options.noMemory && !isFocusable22 ? this.#update(null) : isFocusable22 && this.#update(target);
   };
   #onKeyDown = (event) => {
     if (!event.composedPath().includes(this.#container)) {
@@ -572,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"]);
@@ -680,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();
   }
@@ -693,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) {
@@ -728,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, [
@@ -783,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)) {
@@ -862,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) => {
@@ -890,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.9
+ * @version 1.4.10
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -922,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
@@ -935,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.2
+   * @version 3.0.4
    * @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.9
+ * @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.9
+ * @version 1.4.10
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.js

@@ -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() {
@@ -476,11 +475,10 @@ var RovingTabIndex = class {
   }
   #onFocusIn = (event) => {
     const { target } = event;
-    if (!(target instanceof Element)) {
-      return;
+    if (target instanceof Element) {
+      const isFocusable22 = this.#focusables.has(target);
+      this.#options.noMemory && !isFocusable22 ? this.#update(null) : isFocusable22 && this.#update(target);
     }
-    const isFocusable22 = this.#focusables.has(target);
-    this.#options.noMemory && !isFocusable22 ? this.#update(null) : isFocusable22 && this.#update(target);
   };
   #onKeyDown = (event) => {
     if (!event.composedPath().includes(this.#container)) {
@@ -570,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"]);
@@ -678,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();
   }
@@ -691,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) {
@@ -726,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, [
@@ -781,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)) {
@@ -860,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) => {
@@ -888,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.9
+ * @version 1.4.10
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -920,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
@@ -933,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.2
+   * @version 3.0.4
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane

package/package.json

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