@y14e/disclosure 1.3.9 → 1.3.11

package/README.md

@@ -10,14 +10,14 @@ npm i @y14e/disclosure
 
 ```ts
 // npm
-import Disclosure from '@y14e/disclosure@1.3.9';
+import Disclosure from '@y14e/disclosure@1.3.11';
 
 // CDNs
-import Disclosure from 'https://esm.sh/@y14e/disclosure@1.3.9';
+import Disclosure from 'https://esm.sh/@y14e/disclosure@1.3.11';
 // or
-import Disclosure from 'https://cdn.jsdelivr.net/npm/@y14e/disclosure@1.3.9/+esm';
+import Disclosure from 'https://cdn.jsdelivr.net/npm/@y14e/disclosure@1.3.11/+esm';
 // or
-import Disclosure from 'https://esm.unpkg.com/@y14e/disclosure@1.3.9';
+import Disclosure from 'https://esm.unpkg.com/@y14e/disclosure@1.3.11';
 ```
 
 ## Usage

package/dist/index.cjs

@@ -28,13 +28,13 @@ function saveAttributes(elements, attributes) {
 }
 
 // node_modules/@y14e/roving-tabindex/dist/index.js
-var defaultParser = (value) => value.split(/\s+/);
-var defaultSerializer = (tokens) => tokens.join(" ");
+var DEFAULT_PARSER = (value) => value.split(/\s+/);
+var DEFAULT_SERIALIZER = (tokens) => tokens.join(" ");
 function addTokenToAttribute(element, attribute, token, options = {}) {
   const {
     caseInsensitive = false,
-    parse = defaultParser,
-    serialize = defaultSerializer
+    parse = DEFAULT_PARSER,
+    serialize = DEFAULT_SERIALIZER
   } = options;
   const value = element.getAttribute(attribute)?.trim();
   const tokens = value ? parse(value).filter(Boolean) : [];
@@ -44,11 +44,11 @@ function addTokenToAttribute(element, attribute, token, options = {}) {
       tokens.push(token);
       element.setAttribute(attribute, serialize(tokens));
     }
-    return;
+  } else {
+    const set = new Set(tokens);
+    set.add(token);
+    element.setAttribute(attribute, serialize([...set]));
   }
-  const set = new Set(tokens);
-  set.add(token);
-  element.setAttribute(attribute, serialize([...set]));
 }
 var snapshots2 = /* @__PURE__ */ new WeakMap();
 function restoreAttributes2(elements) {
@@ -115,21 +115,16 @@ function getFocusables(container = document.body, options = {}) {
   const elements = [];
   if (composed || include) {
     let traverse2 = function(node) {
-      if (node instanceof Element) {
-        if (isFocusable(node, {
-          skipNegativeTabIndexCheck,
-          skipVisibilityCheck
-        }) || include?.(node)) {
-          elements[elements.length] = node;
-        }
+      if (!(node instanceof Element)) {
+        return;
+      }
+      if (isFocusable(node, { skipNegativeTabIndexCheck, skipVisibilityCheck }) || include?.(node)) {
+        elements[elements.length] = node;
       }
       const children = getComposedChildren(node);
       for (let i = 0, l = children.length; i < l; i++) {
         const child = children[i];
-        if (!child) {
-          continue;
-        }
-        traverse2(child);
+        child && traverse2(child);
       }
     };
     traverse2(container);
@@ -137,10 +132,7 @@ function getFocusables(container = document.body, options = {}) {
     const candidates = container.querySelectorAll(FOCUSABLE_SELECTOR);
     for (let i = 0, l = candidates.length; i < l; i++) {
       const candidate = candidates[i];
-      if (!(candidate instanceof Element)) {
-        continue;
-      }
-      if (isFocusable(candidate, {
+      if (candidate && isFocusable(candidate, {
         skipNegativeTabIndexCheck,
         skipVisibilityCheck
       })) {
@@ -243,23 +235,19 @@ function normalizeRadioGroup(elements) {
   for (const group of map.values()) {
     placeholder.add(group.find((radio) => radio.checked) ?? group[0]);
   }
-  return elements.filter((element) => {
-    if (isUngroupedRadio(element)) {
-      return placeholder.has(element);
-    }
-    return true;
-  });
+  return elements.filter(
+    (element) => isUngroupedRadio(element) ? placeholder.has(element) : true
+  );
 }
 function sortByTabIndex(elements) {
   const ordered = [];
   const natural = [];
   for (let i = 0, l = elements.length; i < l; i++) {
     const element = elements[i];
-    if (!element) {
-      continue;
+    if (element) {
+      const target = getTabIndex(element) > 0 ? ordered : natural;
+      target[target.length] = element;
     }
-    const target = getTabIndex(element) > 0 ? ordered : natural;
-    target[target.length] = element;
   }
   ordered.sort((a, b) => getTabIndex(a) - getTabIndex(b));
   let count = 0;
@@ -416,11 +404,7 @@ var RovingTabIndex = class {
       return;
     }
     const isFocusable22 = this.#focusables.has(target);
-    if (this.#options.noMemory && !isFocusable22) {
-      this.#update(null);
-      return;
-    }
-    isFocusable22 && this.#update(target);
+    this.#options.noMemory && !isFocusable22 ? this.#update(null) : isFocusable22 && this.#update(target);
   };
   #onKeyDown = (event) => {
     if (!event.composedPath().includes(this.#container)) {
@@ -453,8 +437,7 @@ var RovingTabIndex = class {
     }
     event.preventDefault();
     const currentIndex = current.indexOf(active);
-    let rawIndex;
-    let newIndex = currentIndex;
+    let newIndex;
     let target = current;
     switch (key) {
       case "End":
@@ -464,15 +447,17 @@ var RovingTabIndex = class {
         newIndex = 0;
         break;
       case "ArrowLeft":
-      case "ArrowUp":
-        rawIndex = currentIndex - 1;
+      case "ArrowUp": {
+        const rawIndex = currentIndex - 1;
         newIndex = wrap ? rawIndex : Math.max(rawIndex, 0);
         break;
+      }
       case "ArrowRight":
-      case "ArrowDown":
-        rawIndex = currentIndex + 1;
+      case "ArrowDown": {
+        const rawIndex = currentIndex + 1;
         newIndex = wrap ? rawIndex % current.length : Math.min(rawIndex, current.length - 1);
         break;
+      }
       default: {
         target = this.#focusablesByFirstChar.get(key.toUpperCase()) ?? [];
         const foundIndex = target.findIndex(
@@ -487,15 +472,14 @@ var RovingTabIndex = class {
   #update(active) {
     const current = new Set(this.#getFocusables());
     for (const focusable of this.#focusables) {
-      if (current.has(focusable)) {
-        continue;
+      if (!current.has(focusable)) {
+        focusable.isConnected && restoreAttributes2([focusable]);
+        this.#focusables.delete(focusable);
+        this.#focusablesByFirstChar.forEach((focusables) => {
+          const index = focusables.indexOf(focusable);
+          index >= 0 && focusables.splice(index, 1);
+        });
       }
-      focusable.isConnected && restoreAttributes2([focusable]);
-      this.#focusables.delete(focusable);
-      this.#focusablesByFirstChar.forEach((focusables) => {
-        const index = focusables.indexOf(focusable);
-        index >= 0 && focusables.splice(index, 1);
-      });
     }
     const { navigationOnly, noStart, typeahead } = this.#options;
     for (const focusable of current) {
@@ -528,18 +512,17 @@ var RovingTabIndex = class {
         this.#focusablesByFirstChar.set(key, focusables);
       });
     }
-    if (navigationOnly) {
-      return;
-    }
-    if (active && this.#focusables.has(active)) {
-      this.#focusables.forEach((focusable) => {
-        focusable.setAttribute("tabindex", focusable === active ? "0" : "-1");
-      });
-      return;
+    if (!navigationOnly) {
+      if (active && this.#focusables.has(active)) {
+        this.#focusables.forEach((focusable) => {
+          focusable.setAttribute("tabindex", focusable === active ? "0" : "-1");
+        });
+      } else {
+        [...this.#focusables].forEach((focusable, i) => {
+          focusable.setAttribute("tabindex", i || noStart ? "-1" : "0");
+        });
+      }
     }
-    [...this.#focusables].forEach((focusable, i) => {
-      focusable.setAttribute("tabindex", i || noStart ? "-1" : "0");
-    });
   }
   #createSelectorFilter() {
     const { selector } = this.#options;
@@ -785,11 +768,10 @@ var Disclosure = class _Disclosure {
     animation.addEventListener(
       "finish",
       () => {
-        if (binding?.animation !== animation) {
-          return;
+        if (binding?.animation === animation) {
+          this.#onAnimationFinish(content);
+          cleanup();
         }
-        this.#onAnimationFinish(content);
-        cleanup();
       },
       { once: true, signal }
     );
@@ -833,8 +815,7 @@ function isFocusable2(element) {
   return element.tabIndex >= 0;
 }
 function waitAnimationFinish(animation) {
-  const { playState } = animation;
-  if (playState === "idle" || playState === "finished") {
+  if (["idle", "finished"].includes(animation.playState)) {
     return Promise.resolve();
   }
   return new Promise(
@@ -846,7 +827,7 @@ function waitAnimationFinish(animation) {
  * WAI-ARIA compliant disclosure pattern implementation in TypeScript.
  * Using the <details> and <summary> element.
  *
- * @version 1.3.9
+ * @version 1.3.11
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -858,7 +839,7 @@ function waitAnimationFinish(animation) {
   (**
    * Attributes Utils
    *
-   * @version 1.1.1
+   * @version 1.1.2
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane
@@ -871,7 +852,7 @@ function waitAnimationFinish(animation) {
    * Lightweight roving tabindex utility with fully focus management.
    * Designed for accessible menus, tabs, toolbars, and composite widgets.
    *
-   * @version 3.0.0
+   * @version 3.0.2
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane
@@ -883,7 +864,7 @@ function waitAnimationFinish(animation) {
     (**
      * Attributes Utils
      *
-     * @version 1.1.1
+     * @version 1.1.2
      * @author Yusuke Kamiyamane
      * @license MIT
      * @copyright Copyright (c) Yusuke Kamiyamane
@@ -896,7 +877,7 @@ function waitAnimationFinish(animation) {
      * High-precision focus management utility with full composed tree support.
      * Handles complex focus rules including tabindex ordering, radio groups, inert.
      *
-     * @version 4.3.2
+     * @version 4.3.3
      * @author Yusuke Kamiyamane
      * @license MIT
      * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.d.cts

@@ -3,7 +3,7 @@
  * WAI-ARIA compliant disclosure pattern implementation in TypeScript.
  * Using the <details> and <summary> element.
  *
- * @version 1.3.9
+ * @version 1.3.11
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.d.ts

@@ -3,7 +3,7 @@
  * WAI-ARIA compliant disclosure pattern implementation in TypeScript.
  * Using the <details> and <summary> element.
  *
- * @version 1.3.9
+ * @version 1.3.11
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.js

@@ -26,13 +26,13 @@ function saveAttributes(elements, attributes) {
 }
 
 // node_modules/@y14e/roving-tabindex/dist/index.js
-var defaultParser = (value) => value.split(/\s+/);
-var defaultSerializer = (tokens) => tokens.join(" ");
+var DEFAULT_PARSER = (value) => value.split(/\s+/);
+var DEFAULT_SERIALIZER = (tokens) => tokens.join(" ");
 function addTokenToAttribute(element, attribute, token, options = {}) {
   const {
     caseInsensitive = false,
-    parse = defaultParser,
-    serialize = defaultSerializer
+    parse = DEFAULT_PARSER,
+    serialize = DEFAULT_SERIALIZER
   } = options;
   const value = element.getAttribute(attribute)?.trim();
   const tokens = value ? parse(value).filter(Boolean) : [];
@@ -42,11 +42,11 @@ function addTokenToAttribute(element, attribute, token, options = {}) {
       tokens.push(token);
       element.setAttribute(attribute, serialize(tokens));
     }
-    return;
+  } else {
+    const set = new Set(tokens);
+    set.add(token);
+    element.setAttribute(attribute, serialize([...set]));
   }
-  const set = new Set(tokens);
-  set.add(token);
-  element.setAttribute(attribute, serialize([...set]));
 }
 var snapshots2 = /* @__PURE__ */ new WeakMap();
 function restoreAttributes2(elements) {
@@ -113,21 +113,16 @@ function getFocusables(container = document.body, options = {}) {
   const elements = [];
   if (composed || include) {
     let traverse2 = function(node) {
-      if (node instanceof Element) {
-        if (isFocusable(node, {
-          skipNegativeTabIndexCheck,
-          skipVisibilityCheck
-        }) || include?.(node)) {
-          elements[elements.length] = node;
-        }
+      if (!(node instanceof Element)) {
+        return;
+      }
+      if (isFocusable(node, { skipNegativeTabIndexCheck, skipVisibilityCheck }) || include?.(node)) {
+        elements[elements.length] = node;
       }
       const children = getComposedChildren(node);
       for (let i = 0, l = children.length; i < l; i++) {
         const child = children[i];
-        if (!child) {
-          continue;
-        }
-        traverse2(child);
+        child && traverse2(child);
       }
     };
     traverse2(container);
@@ -135,10 +130,7 @@ function getFocusables(container = document.body, options = {}) {
     const candidates = container.querySelectorAll(FOCUSABLE_SELECTOR);
     for (let i = 0, l = candidates.length; i < l; i++) {
       const candidate = candidates[i];
-      if (!(candidate instanceof Element)) {
-        continue;
-      }
-      if (isFocusable(candidate, {
+      if (candidate && isFocusable(candidate, {
         skipNegativeTabIndexCheck,
         skipVisibilityCheck
       })) {
@@ -241,23 +233,19 @@ function normalizeRadioGroup(elements) {
   for (const group of map.values()) {
     placeholder.add(group.find((radio) => radio.checked) ?? group[0]);
   }
-  return elements.filter((element) => {
-    if (isUngroupedRadio(element)) {
-      return placeholder.has(element);
-    }
-    return true;
-  });
+  return elements.filter(
+    (element) => isUngroupedRadio(element) ? placeholder.has(element) : true
+  );
 }
 function sortByTabIndex(elements) {
   const ordered = [];
   const natural = [];
   for (let i = 0, l = elements.length; i < l; i++) {
     const element = elements[i];
-    if (!element) {
-      continue;
+    if (element) {
+      const target = getTabIndex(element) > 0 ? ordered : natural;
+      target[target.length] = element;
     }
-    const target = getTabIndex(element) > 0 ? ordered : natural;
-    target[target.length] = element;
   }
   ordered.sort((a, b) => getTabIndex(a) - getTabIndex(b));
   let count = 0;
@@ -414,11 +402,7 @@ var RovingTabIndex = class {
       return;
     }
     const isFocusable22 = this.#focusables.has(target);
-    if (this.#options.noMemory && !isFocusable22) {
-      this.#update(null);
-      return;
-    }
-    isFocusable22 && this.#update(target);
+    this.#options.noMemory && !isFocusable22 ? this.#update(null) : isFocusable22 && this.#update(target);
   };
   #onKeyDown = (event) => {
     if (!event.composedPath().includes(this.#container)) {
@@ -451,8 +435,7 @@ var RovingTabIndex = class {
     }
     event.preventDefault();
     const currentIndex = current.indexOf(active);
-    let rawIndex;
-    let newIndex = currentIndex;
+    let newIndex;
     let target = current;
     switch (key) {
       case "End":
@@ -462,15 +445,17 @@ var RovingTabIndex = class {
         newIndex = 0;
         break;
       case "ArrowLeft":
-      case "ArrowUp":
-        rawIndex = currentIndex - 1;
+      case "ArrowUp": {
+        const rawIndex = currentIndex - 1;
         newIndex = wrap ? rawIndex : Math.max(rawIndex, 0);
         break;
+      }
       case "ArrowRight":
-      case "ArrowDown":
-        rawIndex = currentIndex + 1;
+      case "ArrowDown": {
+        const rawIndex = currentIndex + 1;
         newIndex = wrap ? rawIndex % current.length : Math.min(rawIndex, current.length - 1);
         break;
+      }
       default: {
         target = this.#focusablesByFirstChar.get(key.toUpperCase()) ?? [];
         const foundIndex = target.findIndex(
@@ -485,15 +470,14 @@ var RovingTabIndex = class {
   #update(active) {
     const current = new Set(this.#getFocusables());
     for (const focusable of this.#focusables) {
-      if (current.has(focusable)) {
-        continue;
+      if (!current.has(focusable)) {
+        focusable.isConnected && restoreAttributes2([focusable]);
+        this.#focusables.delete(focusable);
+        this.#focusablesByFirstChar.forEach((focusables) => {
+          const index = focusables.indexOf(focusable);
+          index >= 0 && focusables.splice(index, 1);
+        });
       }
-      focusable.isConnected && restoreAttributes2([focusable]);
-      this.#focusables.delete(focusable);
-      this.#focusablesByFirstChar.forEach((focusables) => {
-        const index = focusables.indexOf(focusable);
-        index >= 0 && focusables.splice(index, 1);
-      });
     }
     const { navigationOnly, noStart, typeahead } = this.#options;
     for (const focusable of current) {
@@ -526,18 +510,17 @@ var RovingTabIndex = class {
         this.#focusablesByFirstChar.set(key, focusables);
       });
     }
-    if (navigationOnly) {
-      return;
-    }
-    if (active && this.#focusables.has(active)) {
-      this.#focusables.forEach((focusable) => {
-        focusable.setAttribute("tabindex", focusable === active ? "0" : "-1");
-      });
-      return;
+    if (!navigationOnly) {
+      if (active && this.#focusables.has(active)) {
+        this.#focusables.forEach((focusable) => {
+          focusable.setAttribute("tabindex", focusable === active ? "0" : "-1");
+        });
+      } else {
+        [...this.#focusables].forEach((focusable, i) => {
+          focusable.setAttribute("tabindex", i || noStart ? "-1" : "0");
+        });
+      }
     }
-    [...this.#focusables].forEach((focusable, i) => {
-      focusable.setAttribute("tabindex", i || noStart ? "-1" : "0");
-    });
   }
   #createSelectorFilter() {
     const { selector } = this.#options;
@@ -783,11 +766,10 @@ var Disclosure = class _Disclosure {
     animation.addEventListener(
       "finish",
       () => {
-        if (binding?.animation !== animation) {
-          return;
+        if (binding?.animation === animation) {
+          this.#onAnimationFinish(content);
+          cleanup();
         }
-        this.#onAnimationFinish(content);
-        cleanup();
       },
       { once: true, signal }
     );
@@ -831,8 +813,7 @@ function isFocusable2(element) {
   return element.tabIndex >= 0;
 }
 function waitAnimationFinish(animation) {
-  const { playState } = animation;
-  if (playState === "idle" || playState === "finished") {
+  if (["idle", "finished"].includes(animation.playState)) {
     return Promise.resolve();
   }
   return new Promise(
@@ -844,7 +825,7 @@ function waitAnimationFinish(animation) {
  * WAI-ARIA compliant disclosure pattern implementation in TypeScript.
  * Using the <details> and <summary> element.
  *
- * @version 1.3.9
+ * @version 1.3.11
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -856,7 +837,7 @@ function waitAnimationFinish(animation) {
   (**
    * Attributes Utils
    *
-   * @version 1.1.1
+   * @version 1.1.2
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane
@@ -869,7 +850,7 @@ function waitAnimationFinish(animation) {
    * Lightweight roving tabindex utility with fully focus management.
    * Designed for accessible menus, tabs, toolbars, and composite widgets.
    *
-   * @version 3.0.0
+   * @version 3.0.2
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane
@@ -881,7 +862,7 @@ function waitAnimationFinish(animation) {
     (**
      * Attributes Utils
      *
-     * @version 1.1.1
+     * @version 1.1.2
      * @author Yusuke Kamiyamane
      * @license MIT
      * @copyright Copyright (c) Yusuke Kamiyamane
@@ -894,7 +875,7 @@ function waitAnimationFinish(animation) {
      * High-precision focus management utility with full composed tree support.
      * Handles complex focus rules including tabindex ordering, radio groups, inert.
      *
-     * @version 4.3.2
+     * @version 4.3.3
      * @author Yusuke Kamiyamane
      * @license MIT
      * @copyright Copyright (c) Yusuke Kamiyamane

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@y14e/disclosure",
-  "version": "1.3.9",
+  "version": "1.3.11",
   "description": "WAI-ARIA compliant disclosure pattern implementation in TypeScript",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -43,8 +43,8 @@
   },
   "homepage": "https://github.com/y14e/disclosure#readme",
   "devDependencies": {
-    "@y14e/attributes-utils": "^1.1.1",
-    "@y14e/roving-tabindex": "^3.0.0",
+    "@y14e/attributes-utils": "^1.1.2",
+    "@y14e/roving-tabindex": "^3.0.2",
     "bun-types": "latest",
     "tsup": "^8.0.0",
     "typescript": "^5.6.0",