@y14e/accordion 2.0.3 → 2.0.5

package/dist/index.d.cts

@@ -2,7 +2,7 @@
  * Accordion
  * WAI-ARIA compliant accordion pattern implementation in TypeScript.
  *
- * @version 2.0.3
+ * @version 2.0.5
  * @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 2.0.3
+ * @version 2.0.5
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.js

@@ -1,4 +1,4 @@
-import { restoreAttributes, saveAttributes, addTokenToAttribute } from '@y14e/attributes-utils';
+import * as util from '@y14e/attribute-util';
 import Button from '@y14e/button';
 import { createRovingTabIndex } from '@y14e/roving-tabindex';
 
@@ -96,7 +96,10 @@ var Accordion = class _Accordion {
     });
     this.#animationController?.abort();
     this.#animationController = null;
-    restoreAttributes([...this.#triggerElements, ...this.#contentElements]);
+    util.restoreAttributes([
+      ...this.#triggerElements,
+      ...this.#contentElements
+    ]);
     this.#triggerElements.length = 0;
     this.#contentElements.length = 0;
     this.#rootElement.removeAttribute("data-accordion-initialized");
@@ -112,14 +115,18 @@ var Accordion = class _Accordion {
     this.#toggle(trigger, true);
   }
   #initialize() {
-    saveAttributes(this.#triggerElements, [
+    util.saveAttributes(this.#triggerElements, [
       "aria-controls",
       "aria-disabled",
       "id",
       "style",
       "tabindex"
     ]);
-    saveAttributes(this.#contentElements, ["aria-labelledby", "id", "role"]);
+    util.saveAttributes(this.#contentElements, [
+      "aria-labelledby",
+      "id",
+      "role"
+    ]);
     this.#eventController = new AbortController();
     const { signal } = this.#eventController;
     this.#triggerElements.forEach((trigger2, i) => {
@@ -129,7 +136,7 @@ var Accordion = class _Accordion {
         return;
       }
       content2.id ||= `accordion-content-${id}`;
-      addTokenToAttribute(trigger2, "aria-controls", content2.id);
+      util.addAttributeToken(trigger2, "aria-controls", content2.id);
       trigger2.setAttribute(
         "aria-expanded",
         String(trigger2.ariaExpanded === "true")
@@ -141,7 +148,7 @@ var Accordion = class _Accordion {
         trigger2.style.setProperty("pointer-events", "none");
       }
       trigger2.addEventListener("click", this.#onTriggerClick, { signal });
-      addTokenToAttribute(content2, "aria-labelledby", trigger2.id);
+      util.addAttributeToken(content2, "aria-labelledby", trigger2.id);
       content2.setAttribute("role", "region");
       content2.addEventListener("beforematch", this.#onContentBeforeMatch, {
         signal
@@ -245,7 +252,7 @@ var Accordion = class _Accordion {
     );
   }
   #createBinding(trigger, content) {
-    return { trigger, content, animation: null };
+    return { animation: null, content, trigger };
   }
   #isFocusable(element) {
     return !element.hasAttribute("disabled") && element.tabIndex >= 0;
@@ -276,7 +283,7 @@ function waitAnimationFinish(animation) {
  * Accordion
  * WAI-ARIA compliant accordion pattern implementation in TypeScript.
  *
- * @version 2.0.3
+ * @version 2.0.5
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@y14e/accordion",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "WAI-ARIA compliant accordion pattern implementation in TypeScript",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -51,8 +51,8 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@y14e/attributes-utils": "^1.1.3",
+    "@y14e/attribute-util": "^2.0.0",
     "@y14e/button": "^1.0.6",
-    "@y14e/roving-tabindex": "^3.1.9"
+    "@y14e/roving-tabindex": "^3.1.20"
   }
 }