@y14e/accordion 1.4.15 → 1.4.17

package/dist/index.cjs

@@ -65,7 +65,7 @@ var Accordion = class _Accordion {
       if (!content2) {
         return;
       }
-      const binding = createBinding(trigger2, content2);
+      const binding = this.#createBinding(trigger2, content2);
       this.#bindings.set(trigger2, binding);
       this.#bindings.set(content2, binding);
     });
@@ -97,7 +97,7 @@ var Accordion = class _Accordion {
     !force && await this.#waitAnimationsFinish();
     this.#contentElements.forEach((content) => {
       force && this.#bindings.get(content)?.animation?.finish();
-      this.#onAnimationFinish(content);
+      this.#onContentAnimationFinish(content);
     });
     this.#animationController?.abort();
     this.#animationController = null;
@@ -140,7 +140,7 @@ var Accordion = class _Accordion {
         String(trigger2.ariaExpanded === "true")
       );
       trigger2.id ||= `accordion-trigger-${id}`;
-      if (!isFocusable(trigger2)) {
+      if (!this.#isFocusable(trigger2)) {
         trigger2.setAttribute("aria-disabled", "true");
         trigger2.setAttribute("tabindex", "-1");
         trigger2.style.setProperty("pointer-events", "none");
@@ -170,6 +170,16 @@ var Accordion = class _Accordion {
     }
     this.#toggle(trigger, trigger.ariaExpanded === "false");
   };
+  #onContentAnimationFinish(content) {
+    const trigger = this.#bindings.get(content)?.trigger;
+    if (!trigger) {
+      return;
+    }
+    trigger.ariaExpanded === "false" && content.setAttribute("hidden", "until-found");
+    ["block-size", "overflow"].forEach((name) => {
+      content.style.removeProperty(name);
+    });
+  }
   #onContentBeforeMatch = (event) => {
     const content = event.currentTarget;
     if (!(content instanceof HTMLElement)) {
@@ -187,10 +197,10 @@ var Accordion = class _Accordion {
     }
     const name = trigger.getAttribute("data-accordion-name");
     if (name && isOpen) {
-      const opened = this.#triggerElements.find(
+      const open = this.#triggerElements.find(
         (t) => t !== trigger && t.getAttribute("data-accordion-name") === name && t.ariaExpanded === "true"
       );
-      opened && this.#toggle(opened, false, isMatch);
+      open && this.#toggle(open, false, isMatch);
     }
     trigger.setAttribute(
       "aria-label",
@@ -229,31 +239,25 @@ var Accordion = class _Accordion {
       "finish",
       () => {
         if (binding?.animation === animation) {
-          this.#onAnimationFinish(content);
+          this.#onContentAnimationFinish(content);
           cleanup();
         }
       },
       { once: true, signal }
     );
   }
+  #createBinding(trigger, content) {
+    return { trigger, content, animation: null };
+  }
+  #isFocusable(element) {
+    return !element.hasAttribute("disabled") && element.tabIndex >= 0;
+  }
   #mergeOptions(target, source) {
     return {
       animation: { ...target.animation, ...source.animation ?? {} },
       selector: { ...target.selector, ...source.selector ?? {} }
     };
   }
-  #onAnimationFinish(content) {
-    const trigger = this.#bindings.get(content)?.trigger;
-    if (!trigger) {
-      return;
-    }
-    if (trigger.ariaExpanded === "false") {
-      content.setAttribute("hidden", "until-found");
-    }
-    ["block-size", "overflow"].forEach((name) => {
-      content.style.removeProperty(name);
-    });
-  }
   async #waitAnimationsFinish() {
     const promises = [];
     this.#contentElements.forEach((content) => {
@@ -263,26 +267,16 @@ var Accordion = class _Accordion {
     await Promise.allSettled(promises);
   }
 };
-function createBinding(trigger, content) {
-  return { trigger, content, animation: null };
-}
-function isFocusable(element) {
-  return !element.hasAttribute("disabled") && element.tabIndex >= 0;
-}
 function waitAnimationFinish(animation) {
-  if (["idle", "finished"].includes(animation.playState)) {
-    return Promise.resolve();
-  } else {
-    return new Promise(
-      (resolve) => animation.addEventListener("finish", () => resolve(), { once: true })
-    );
-  }
+  return ["idle", "finished"].includes(animation.playState) ? Promise.resolve() : new Promise(
+    (resolve) => animation.addEventListener("finish", () => resolve(), { once: true })
+  );
 }
 /**
  * Accordion
  * WAI-ARIA compliant accordion pattern implementation in TypeScript.
  *
- * @version 1.4.15
+ * @version 1.4.17
  * @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.15
+ * @version 1.4.17
  * @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.15
+ * @version 1.4.17
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.js

@@ -59,7 +59,7 @@ var Accordion = class _Accordion {
       if (!content2) {
         return;
       }
-      const binding = createBinding(trigger2, content2);
+      const binding = this.#createBinding(trigger2, content2);
       this.#bindings.set(trigger2, binding);
       this.#bindings.set(content2, binding);
     });
@@ -91,7 +91,7 @@ var Accordion = class _Accordion {
     !force && await this.#waitAnimationsFinish();
     this.#contentElements.forEach((content) => {
       force && this.#bindings.get(content)?.animation?.finish();
-      this.#onAnimationFinish(content);
+      this.#onContentAnimationFinish(content);
     });
     this.#animationController?.abort();
     this.#animationController = null;
@@ -134,7 +134,7 @@ var Accordion = class _Accordion {
         String(trigger2.ariaExpanded === "true")
       );
       trigger2.id ||= `accordion-trigger-${id}`;
-      if (!isFocusable(trigger2)) {
+      if (!this.#isFocusable(trigger2)) {
         trigger2.setAttribute("aria-disabled", "true");
         trigger2.setAttribute("tabindex", "-1");
         trigger2.style.setProperty("pointer-events", "none");
@@ -164,6 +164,16 @@ var Accordion = class _Accordion {
     }
     this.#toggle(trigger, trigger.ariaExpanded === "false");
   };
+  #onContentAnimationFinish(content) {
+    const trigger = this.#bindings.get(content)?.trigger;
+    if (!trigger) {
+      return;
+    }
+    trigger.ariaExpanded === "false" && content.setAttribute("hidden", "until-found");
+    ["block-size", "overflow"].forEach((name) => {
+      content.style.removeProperty(name);
+    });
+  }
   #onContentBeforeMatch = (event) => {
     const content = event.currentTarget;
     if (!(content instanceof HTMLElement)) {
@@ -181,10 +191,10 @@ var Accordion = class _Accordion {
     }
     const name = trigger.getAttribute("data-accordion-name");
     if (name && isOpen) {
-      const opened = this.#triggerElements.find(
+      const open = this.#triggerElements.find(
         (t) => t !== trigger && t.getAttribute("data-accordion-name") === name && t.ariaExpanded === "true"
       );
-      opened && this.#toggle(opened, false, isMatch);
+      open && this.#toggle(open, false, isMatch);
     }
     trigger.setAttribute(
       "aria-label",
@@ -223,31 +233,25 @@ var Accordion = class _Accordion {
       "finish",
       () => {
         if (binding?.animation === animation) {
-          this.#onAnimationFinish(content);
+          this.#onContentAnimationFinish(content);
           cleanup();
         }
       },
       { once: true, signal }
     );
   }
+  #createBinding(trigger, content) {
+    return { trigger, content, animation: null };
+  }
+  #isFocusable(element) {
+    return !element.hasAttribute("disabled") && element.tabIndex >= 0;
+  }
   #mergeOptions(target, source) {
     return {
       animation: { ...target.animation, ...source.animation ?? {} },
       selector: { ...target.selector, ...source.selector ?? {} }
     };
   }
-  #onAnimationFinish(content) {
-    const trigger = this.#bindings.get(content)?.trigger;
-    if (!trigger) {
-      return;
-    }
-    if (trigger.ariaExpanded === "false") {
-      content.setAttribute("hidden", "until-found");
-    }
-    ["block-size", "overflow"].forEach((name) => {
-      content.style.removeProperty(name);
-    });
-  }
   async #waitAnimationsFinish() {
     const promises = [];
     this.#contentElements.forEach((content) => {
@@ -257,26 +261,16 @@ var Accordion = class _Accordion {
     await Promise.allSettled(promises);
   }
 };
-function createBinding(trigger, content) {
-  return { trigger, content, animation: null };
-}
-function isFocusable(element) {
-  return !element.hasAttribute("disabled") && element.tabIndex >= 0;
-}
 function waitAnimationFinish(animation) {
-  if (["idle", "finished"].includes(animation.playState)) {
-    return Promise.resolve();
-  } else {
-    return new Promise(
-      (resolve) => animation.addEventListener("finish", () => resolve(), { once: true })
-    );
-  }
+  return ["idle", "finished"].includes(animation.playState) ? Promise.resolve() : new Promise(
+    (resolve) => animation.addEventListener("finish", () => resolve(), { once: true })
+  );
 }
 /**
  * Accordion
  * WAI-ARIA compliant accordion pattern implementation in TypeScript.
  *
- * @version 1.4.15
+ * @version 1.4.17
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@y14e/accordion",
-  "version": "1.4.15",
+  "version": "1.4.17",
   "description": "WAI-ARIA compliant accordion pattern implementation in TypeScript",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -53,7 +53,7 @@
   },
   "dependencies": {
     "@y14e/attributes-utils": "^1.1.2",
-    "@y14e/button": "^1.0.5",
-    "@y14e/roving-tabindex": "^3.0.11"
+    "@y14e/button": "^1.0.6",
+    "@y14e/roving-tabindex": "^3.1.2"
   }
 }