@y14e/accordion 1.2.5 → 1.2.7

package/dist/index.cjs

@@ -1,5 +1,43 @@
 'use strict';
 
+// node_modules/@y14e/attributes-utils/dist/index.js
+function addTokenToAttribute(element, attribute, token) {
+  const tokens = new Set(
+    element.getAttribute(attribute)?.trim().split(/\s+/) ?? []
+  );
+  tokens.add(token);
+  element.setAttribute(attribute, [...tokens].join(" "));
+}
+var snapshots = /* @__PURE__ */ new WeakMap();
+function restoreAttributes(elements) {
+  elements.forEach((element) => {
+    const snapshot = snapshots.get(element);
+    if (!snapshot) {
+      return;
+    }
+    for (const [attribute, value] of snapshot.entries()) {
+      if (value === null) {
+        element.removeAttribute(attribute);
+      } else {
+        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));
+    });
+  });
+}
+
 // src/index.ts
 var Accordion = class _Accordion {
   static defaults = {};
@@ -95,6 +133,7 @@ var Accordion = class _Accordion {
     });
     this.#animationController?.abort();
     this.#animationController = null;
+    restoreAttributes([...this.#triggerElements, ...this.#contentElements]);
     this.#triggerElements.length = 0;
     this.#contentElements.length = 0;
     this.#rootElement.removeAttribute("data-accordion-initialized");
@@ -102,12 +141,14 @@ var Accordion = class _Accordion {
   #initialize() {
     this.#eventController = new AbortController();
     const { signal } = this.#eventController;
+    saveAttributes(this.#triggerElements, ["aria-controls", "id", "tabindex"]);
     this.#triggerElements.forEach((trigger, i) => {
       const id = Math.random().toString(36).slice(-8);
       const content = this.#contentElements[i];
       if (!content) {
         return;
       }
+      saveAttributes([content], ["aria-labelledby", "id", "role"]);
       content.id ||= `accordion-content-${id}`;
       addTokenToAttribute(trigger, "aria-controls", content.id);
       trigger.setAttribute(
@@ -132,25 +173,26 @@ var Accordion = class _Accordion {
   }
   #onTriggerClick = (event) => {
     event.preventDefault();
-    event.stopPropagation();
     const trigger = event.currentTarget;
     if (!(trigger instanceof HTMLElement)) {
       return;
     }
-    this.#toggle(trigger, trigger.ariaExpanded !== "true");
+    this.#toggle(trigger, trigger.ariaExpanded === "false");
   };
   #onTriggerKeyDown = (event) => {
-    const { key } = event;
+    const { key, altKey, ctrlKey, metaKey, shiftKey } = event;
+    if (altKey || ctrlKey || metaKey || shiftKey) {
+      return;
+    }
     if (!["Enter", " ", "End", "Home", "ArrowUp", "ArrowDown"].includes(key)) {
       return;
     }
-    event.preventDefault();
-    event.stopPropagation();
     const focusables = this.#triggerElements.filter(isFocusable);
     const active = getActiveElement();
     if (!(active instanceof HTMLElement)) {
       return;
     }
+    event.preventDefault();
     const currentIndex = focusables.indexOf(active);
     let newIndex = currentIndex;
     switch (key) {
@@ -266,13 +308,6 @@ var Accordion = class _Accordion {
     await Promise.allSettled(promises);
   }
 };
-function addTokenToAttribute(element, attribute, token) {
-  const tokens = new Set(
-    element.getAttribute(attribute)?.trim().split(/\s+/) ?? []
-  );
-  tokens.add(token);
-  element.setAttribute(attribute, [...tokens].join(" "));
-}
 function createBinding(trigger, content) {
   return { trigger, content, animation: null };
 }
@@ -299,11 +334,24 @@ function waitAnimationFinish(animation) {
  * Accordion
  * WAI-ARIA compliant accordion pattern implementation in TypeScript.
  *
- * @version 1.2.5
+ * @version 1.2.7
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
  * @see {@link https://github.com/y14e/accordion}
  */
+/*! Bundled license information:
+
+@y14e/attributes-utils/dist/index.js:
+  (**
+   * Attributes Utils
+   *
+   * @version 1.0.0
+   * @author Yusuke Kamiyamane
+   * @license MIT
+   * @copyright Copyright (c) Yusuke Kamiyamane
+   * @see {@link https://github.com/y14e/attributes-utils}
+   *)
+*/
 
 module.exports = Accordion;

package/dist/index.d.cts

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

package/dist/index.js

@@ -1,3 +1,41 @@
+// node_modules/@y14e/attributes-utils/dist/index.js
+function addTokenToAttribute(element, attribute, token) {
+  const tokens = new Set(
+    element.getAttribute(attribute)?.trim().split(/\s+/) ?? []
+  );
+  tokens.add(token);
+  element.setAttribute(attribute, [...tokens].join(" "));
+}
+var snapshots = /* @__PURE__ */ new WeakMap();
+function restoreAttributes(elements) {
+  elements.forEach((element) => {
+    const snapshot = snapshots.get(element);
+    if (!snapshot) {
+      return;
+    }
+    for (const [attribute, value] of snapshot.entries()) {
+      if (value === null) {
+        element.removeAttribute(attribute);
+      } else {
+        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));
+    });
+  });
+}
+
 // src/index.ts
 var Accordion = class _Accordion {
   static defaults = {};
@@ -93,6 +131,7 @@ var Accordion = class _Accordion {
     });
     this.#animationController?.abort();
     this.#animationController = null;
+    restoreAttributes([...this.#triggerElements, ...this.#contentElements]);
     this.#triggerElements.length = 0;
     this.#contentElements.length = 0;
     this.#rootElement.removeAttribute("data-accordion-initialized");
@@ -100,12 +139,14 @@ var Accordion = class _Accordion {
   #initialize() {
     this.#eventController = new AbortController();
     const { signal } = this.#eventController;
+    saveAttributes(this.#triggerElements, ["aria-controls", "id", "tabindex"]);
     this.#triggerElements.forEach((trigger, i) => {
       const id = Math.random().toString(36).slice(-8);
       const content = this.#contentElements[i];
       if (!content) {
         return;
       }
+      saveAttributes([content], ["aria-labelledby", "id", "role"]);
       content.id ||= `accordion-content-${id}`;
       addTokenToAttribute(trigger, "aria-controls", content.id);
       trigger.setAttribute(
@@ -130,25 +171,26 @@ var Accordion = class _Accordion {
   }
   #onTriggerClick = (event) => {
     event.preventDefault();
-    event.stopPropagation();
     const trigger = event.currentTarget;
     if (!(trigger instanceof HTMLElement)) {
       return;
     }
-    this.#toggle(trigger, trigger.ariaExpanded !== "true");
+    this.#toggle(trigger, trigger.ariaExpanded === "false");
   };
   #onTriggerKeyDown = (event) => {
-    const { key } = event;
+    const { key, altKey, ctrlKey, metaKey, shiftKey } = event;
+    if (altKey || ctrlKey || metaKey || shiftKey) {
+      return;
+    }
     if (!["Enter", " ", "End", "Home", "ArrowUp", "ArrowDown"].includes(key)) {
       return;
     }
-    event.preventDefault();
-    event.stopPropagation();
     const focusables = this.#triggerElements.filter(isFocusable);
     const active = getActiveElement();
     if (!(active instanceof HTMLElement)) {
       return;
     }
+    event.preventDefault();
     const currentIndex = focusables.indexOf(active);
     let newIndex = currentIndex;
     switch (key) {
@@ -264,13 +306,6 @@ var Accordion = class _Accordion {
     await Promise.allSettled(promises);
   }
 };
-function addTokenToAttribute(element, attribute, token) {
-  const tokens = new Set(
-    element.getAttribute(attribute)?.trim().split(/\s+/) ?? []
-  );
-  tokens.add(token);
-  element.setAttribute(attribute, [...tokens].join(" "));
-}
 function createBinding(trigger, content) {
   return { trigger, content, animation: null };
 }
@@ -297,11 +332,24 @@ function waitAnimationFinish(animation) {
  * Accordion
  * WAI-ARIA compliant accordion pattern implementation in TypeScript.
  *
- * @version 1.2.5
+ * @version 1.2.7
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
  * @see {@link https://github.com/y14e/accordion}
  */
+/*! Bundled license information:
+
+@y14e/attributes-utils/dist/index.js:
+  (**
+   * Attributes Utils
+   *
+   * @version 1.0.0
+   * @author Yusuke Kamiyamane
+   * @license MIT
+   * @copyright Copyright (c) Yusuke Kamiyamane
+   * @see {@link https://github.com/y14e/attributes-utils}
+   *)
+*/
 
 export { Accordion as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@y14e/accordion",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "description": "WAI-ARIA compliant accordion pattern implementation in TypeScript",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -43,9 +43,11 @@
   },
   "homepage": "https://github.com/y14e/accordion#readme",
   "devDependencies": {
+    "@y14e/attributes-utils": "^1.0.0",
     "bun-types": "latest",
     "tsup": "^8.0.0",
-    "typescript": "^5.6.0"
+    "typescript": "^5.6.0",
+    "utility-types": "^3.11.0"
   },
   "engines": {
     "node": ">=18"