npm - @y14e/accordion - Versions diffs - 1.3.1 → 1.3.3 - Mend

@y14e/accordion 1.3.1 → 1.3.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/index.cjs CHANGED Viewed

@@ -105,7 +105,12 @@ function getFocusables(container = document.body, options = {}) {
     console.warn("Invalid container element. Fallback: <body> element.");
     container = document.body;
   }
-  let { composed = false, filter, include } = options;
+  let {
+    composed = false,
+    filter,
+    include,
+    skipVisibilityCheck = false
+  } = options;
   if (typeof composed !== "boolean") {
     console.warn("Invalid composed option. Fallback: false.");
     composed = false;
@@ -126,7 +131,7 @@ function getFocusables(container = document.body, options = {}) {
   if (composed || include) {
     let traverse2 = function(node) {
       if (node instanceof Element) {
-        if (isFocusable(node) || include?.(node)) {
+        if (isFocusable(node, { skipVisibilityCheck }) || include?.(node)) {
           elements[elements.length] = node;
         }
       }
@@ -147,7 +152,7 @@ function getFocusables(container = document.body, options = {}) {
       if (!(candidate instanceof Element)) {
         continue;
       }
-      if (isFocusable(candidate)) {
+      if (isFocusable(candidate, { skipVisibilityCheck })) {
         elements[elements.length] = candidate;
       }
     }
@@ -155,11 +160,16 @@ function getFocusables(container = document.body, options = {}) {
   const unfiltered = normalizeRadioGroup(sortByTabIndex(elements));
   return filter ? unfiltered.filter(filter) : unfiltered;
 }
-function isFocusable(element) {
+function isFocusable(element, options = {}) {
   if (!(element instanceof Element)) {
     console.warn("Invalid element");
     return false;
   }
+  let { skipVisibilityCheck = false } = options;
+  if (typeof skipVisibilityCheck !== "boolean") {
+    console.warn("Invalid skipVisibilityCheck option. Fallback: false.");
+    skipVisibilityCheck = false;
+  }
   if (element.hasAttribute("hidden") || isInert(element)) {
     return false;
   }
@@ -172,7 +182,7 @@ function isFocusable(element) {
   if (isDisabledDeep(element)) {
     return false;
   }
-  if (!element.checkVisibility({
+  if (!skipVisibilityCheck && !element.checkVisibility({
     contentVisibilityAuto: true,
     opacityProperty: true,
     visibilityProperty: true
@@ -457,7 +467,8 @@ var RovingTabIndex = class {
       ...this.#getFocusables(),
       ...getFocusables(this.#container, {
         composed: true,
-        filter: this.#selectorFilter
+        filter: this.#selectorFilter,
+        skipVisibilityCheck: true
       })
     ]);
     for (const focusable of this.#focusables) {
@@ -523,7 +534,8 @@ var RovingTabIndex = class {
     return getFocusables(this.#container, {
       composed: true,
       filter: this.#selectorFilter,
-      include: (element) => this.#focusables.has(element)
+      include: (element) => this.#focusables.has(element),
+      skipVisibilityCheck: true
     });
   }
 };
@@ -598,12 +610,6 @@ var Accordion = class _Accordion {
       this.#bindings.set(trigger2, binding);
       this.#bindings.set(content2, binding);
     });
-    this.#cleanupRovingTabIndex = createRovingTabIndex(this.#rootElement, {
-      direction: "vertical",
-      navigationOnly: true,
-      selector: `${trigger}${NOT_NESTED}`,
-      wrap: true
-    });
     this.#initialize();
   }
   open(trigger) {
@@ -631,10 +637,10 @@ var Accordion = class _Accordion {
       return;
     }
     this.#isDestroyed = true;
-    this.#cleanupRovingTabIndex?.();
-    this.#cleanupRovingTabIndex = null;
     this.#eventController?.abort();
     this.#eventController = null;
+    this.#cleanupRovingTabIndex?.();
+    this.#cleanupRovingTabIndex = null;
     !force && await this.#waitAnimationsFinish();
     this.#contentElements.forEach((content) => {
       force && this.#bindings.get(content)?.animation?.finish();
@@ -657,33 +663,40 @@ var Accordion = class _Accordion {
       "style",
       "tabindex"
     ]);
-    this.#triggerElements.forEach((trigger, i) => {
+    this.#triggerElements.forEach((trigger2, i) => {
       const id = Math.random().toString(36).slice(-8);
-      const content = this.#contentElements[i];
-      if (!content) {
+      const content2 = this.#contentElements[i];
+      if (!content2) {
         return;
       }
-      saveAttributes([content], ["aria-labelledby", "id", "role"]);
-      content.id ||= `accordion-content-${id}`;
-      addTokenToAttribute(trigger, "aria-controls", content.id);
-      trigger.setAttribute(
+      saveAttributes([content2], ["aria-labelledby", "id", "role"]);
+      content2.id ||= `accordion-content-${id}`;
+      addTokenToAttribute(trigger2, "aria-controls", content2.id);
+      trigger2.setAttribute(
         "aria-expanded",
-        trigger.ariaExpanded === "true" ? "true" : "false"
+        trigger2.ariaExpanded === "true" ? "true" : "false"
       );
-      trigger.id ||= `accordion-trigger-${id}`;
-      if (!isFocusable2(trigger)) {
-        trigger.setAttribute("aria-disabled", "true");
-        trigger.setAttribute("tabindex", "-1");
-        trigger.style.setProperty("pointer-events", "none");
+      trigger2.id ||= `accordion-trigger-${id}`;
+      if (!isFocusable2(trigger2)) {
+        trigger2.setAttribute("aria-disabled", "true");
+        trigger2.setAttribute("tabindex", "-1");
+        trigger2.style.setProperty("pointer-events", "none");
       }
-      trigger.addEventListener("click", this.#onTriggerClick, { signal });
-      trigger.addEventListener("keydown", this.#onTriggerKeyDown, { signal });
-      addTokenToAttribute(content, "aria-labelledby", trigger.id);
-      content.setAttribute("role", "region");
-      content.addEventListener("beforematch", this.#onContentBeforeMatch, {
+      trigger2.addEventListener("click", this.#onTriggerClick, { signal });
+      trigger2.addEventListener("keydown", this.#onTriggerKeyDown, { signal });
+      addTokenToAttribute(content2, "aria-labelledby", trigger2.id);
+      content2.setAttribute("role", "region");
+      content2.addEventListener("beforematch", this.#onContentBeforeMatch, {
         signal
       });
     });
+    const { trigger, content } = this.#settings.selector;
+    this.#cleanupRovingTabIndex = createRovingTabIndex(this.#rootElement, {
+      direction: "vertical",
+      navigationOnly: true,
+      selector: `${trigger}:not(:scope ${content} *)`,
+      wrap: true
+    });
     this.#rootElement.setAttribute("data-accordion-initialized", "");
   }
   #onTriggerClick = (event) => {
@@ -707,12 +720,7 @@ var Accordion = class _Accordion {
       return;
     }
     event.preventDefault();
-    switch (key) {
-      case "Enter":
-      case " ":
-        active.click();
-        return;
-    }
+    active.click();
   };
   #onContentBeforeMatch = (event) => {
     const content = event.currentTarget;
@@ -833,7 +841,7 @@ function waitAnimationFinish(animation) {
  * Accordion
  * WAI-ARIA compliant accordion pattern implementation in TypeScript.
  *
- * @version 1.3.1
+ * @version 1.3.3
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -858,7 +866,7 @@ function waitAnimationFinish(animation) {
    * Lightweight roving tabindex utility with fully focus management.
    * Designed for accessible menus, tabs, toolbars, and composite widgets.
    *
-   * @version 1.3.0
+   * @version 1.3.1
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane
@@ -883,7 +891,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.1.8
+     * @version 4.2.0
      * @author Yusuke Kamiyamane
      * @license MIT
      * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.d.cts CHANGED Viewed

@@ -2,7 +2,7 @@
  * Accordion
  * WAI-ARIA compliant accordion pattern implementation in TypeScript.
  *
- * @version 1.3.1
+ * @version 1.3.3
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.d.ts CHANGED Viewed

@@ -2,7 +2,7 @@
  * Accordion
  * WAI-ARIA compliant accordion pattern implementation in TypeScript.
  *
- * @version 1.3.1
+ * @version 1.3.3
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.js CHANGED Viewed

@@ -103,7 +103,12 @@ function getFocusables(container = document.body, options = {}) {
     console.warn("Invalid container element. Fallback: <body> element.");
     container = document.body;
   }
-  let { composed = false, filter, include } = options;
+  let {
+    composed = false,
+    filter,
+    include,
+    skipVisibilityCheck = false
+  } = options;
   if (typeof composed !== "boolean") {
     console.warn("Invalid composed option. Fallback: false.");
     composed = false;
@@ -124,7 +129,7 @@ function getFocusables(container = document.body, options = {}) {
   if (composed || include) {
     let traverse2 = function(node) {
       if (node instanceof Element) {
-        if (isFocusable(node) || include?.(node)) {
+        if (isFocusable(node, { skipVisibilityCheck }) || include?.(node)) {
           elements[elements.length] = node;
         }
       }
@@ -145,7 +150,7 @@ function getFocusables(container = document.body, options = {}) {
       if (!(candidate instanceof Element)) {
         continue;
       }
-      if (isFocusable(candidate)) {
+      if (isFocusable(candidate, { skipVisibilityCheck })) {
         elements[elements.length] = candidate;
       }
     }
@@ -153,11 +158,16 @@ function getFocusables(container = document.body, options = {}) {
   const unfiltered = normalizeRadioGroup(sortByTabIndex(elements));
   return filter ? unfiltered.filter(filter) : unfiltered;
 }
-function isFocusable(element) {
+function isFocusable(element, options = {}) {
   if (!(element instanceof Element)) {
     console.warn("Invalid element");
     return false;
   }
+  let { skipVisibilityCheck = false } = options;
+  if (typeof skipVisibilityCheck !== "boolean") {
+    console.warn("Invalid skipVisibilityCheck option. Fallback: false.");
+    skipVisibilityCheck = false;
+  }
   if (element.hasAttribute("hidden") || isInert(element)) {
     return false;
   }
@@ -170,7 +180,7 @@ function isFocusable(element) {
   if (isDisabledDeep(element)) {
     return false;
   }
-  if (!element.checkVisibility({
+  if (!skipVisibilityCheck && !element.checkVisibility({
     contentVisibilityAuto: true,
     opacityProperty: true,
     visibilityProperty: true
@@ -455,7 +465,8 @@ var RovingTabIndex = class {
       ...this.#getFocusables(),
       ...getFocusables(this.#container, {
         composed: true,
-        filter: this.#selectorFilter
+        filter: this.#selectorFilter,
+        skipVisibilityCheck: true
       })
     ]);
     for (const focusable of this.#focusables) {
@@ -521,7 +532,8 @@ var RovingTabIndex = class {
     return getFocusables(this.#container, {
       composed: true,
       filter: this.#selectorFilter,
-      include: (element) => this.#focusables.has(element)
+      include: (element) => this.#focusables.has(element),
+      skipVisibilityCheck: true
     });
   }
 };
@@ -596,12 +608,6 @@ var Accordion = class _Accordion {
       this.#bindings.set(trigger2, binding);
       this.#bindings.set(content2, binding);
     });
-    this.#cleanupRovingTabIndex = createRovingTabIndex(this.#rootElement, {
-      direction: "vertical",
-      navigationOnly: true,
-      selector: `${trigger}${NOT_NESTED}`,
-      wrap: true
-    });
     this.#initialize();
   }
   open(trigger) {
@@ -629,10 +635,10 @@ var Accordion = class _Accordion {
       return;
     }
     this.#isDestroyed = true;
-    this.#cleanupRovingTabIndex?.();
-    this.#cleanupRovingTabIndex = null;
     this.#eventController?.abort();
     this.#eventController = null;
+    this.#cleanupRovingTabIndex?.();
+    this.#cleanupRovingTabIndex = null;
     !force && await this.#waitAnimationsFinish();
     this.#contentElements.forEach((content) => {
       force && this.#bindings.get(content)?.animation?.finish();
@@ -655,33 +661,40 @@ var Accordion = class _Accordion {
       "style",
       "tabindex"
     ]);
-    this.#triggerElements.forEach((trigger, i) => {
+    this.#triggerElements.forEach((trigger2, i) => {
       const id = Math.random().toString(36).slice(-8);
-      const content = this.#contentElements[i];
-      if (!content) {
+      const content2 = this.#contentElements[i];
+      if (!content2) {
         return;
       }
-      saveAttributes([content], ["aria-labelledby", "id", "role"]);
-      content.id ||= `accordion-content-${id}`;
-      addTokenToAttribute(trigger, "aria-controls", content.id);
-      trigger.setAttribute(
+      saveAttributes([content2], ["aria-labelledby", "id", "role"]);
+      content2.id ||= `accordion-content-${id}`;
+      addTokenToAttribute(trigger2, "aria-controls", content2.id);
+      trigger2.setAttribute(
         "aria-expanded",
-        trigger.ariaExpanded === "true" ? "true" : "false"
+        trigger2.ariaExpanded === "true" ? "true" : "false"
       );
-      trigger.id ||= `accordion-trigger-${id}`;
-      if (!isFocusable2(trigger)) {
-        trigger.setAttribute("aria-disabled", "true");
-        trigger.setAttribute("tabindex", "-1");
-        trigger.style.setProperty("pointer-events", "none");
+      trigger2.id ||= `accordion-trigger-${id}`;
+      if (!isFocusable2(trigger2)) {
+        trigger2.setAttribute("aria-disabled", "true");
+        trigger2.setAttribute("tabindex", "-1");
+        trigger2.style.setProperty("pointer-events", "none");
       }
-      trigger.addEventListener("click", this.#onTriggerClick, { signal });
-      trigger.addEventListener("keydown", this.#onTriggerKeyDown, { signal });
-      addTokenToAttribute(content, "aria-labelledby", trigger.id);
-      content.setAttribute("role", "region");
-      content.addEventListener("beforematch", this.#onContentBeforeMatch, {
+      trigger2.addEventListener("click", this.#onTriggerClick, { signal });
+      trigger2.addEventListener("keydown", this.#onTriggerKeyDown, { signal });
+      addTokenToAttribute(content2, "aria-labelledby", trigger2.id);
+      content2.setAttribute("role", "region");
+      content2.addEventListener("beforematch", this.#onContentBeforeMatch, {
         signal
       });
     });
+    const { trigger, content } = this.#settings.selector;
+    this.#cleanupRovingTabIndex = createRovingTabIndex(this.#rootElement, {
+      direction: "vertical",
+      navigationOnly: true,
+      selector: `${trigger}:not(:scope ${content} *)`,
+      wrap: true
+    });
     this.#rootElement.setAttribute("data-accordion-initialized", "");
   }
   #onTriggerClick = (event) => {
@@ -705,12 +718,7 @@ var Accordion = class _Accordion {
       return;
     }
     event.preventDefault();
-    switch (key) {
-      case "Enter":
-      case " ":
-        active.click();
-        return;
-    }
+    active.click();
   };
   #onContentBeforeMatch = (event) => {
     const content = event.currentTarget;
@@ -831,7 +839,7 @@ function waitAnimationFinish(animation) {
  * Accordion
  * WAI-ARIA compliant accordion pattern implementation in TypeScript.
  *
- * @version 1.3.1
+ * @version 1.3.3
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -856,7 +864,7 @@ function waitAnimationFinish(animation) {
    * Lightweight roving tabindex utility with fully focus management.
    * Designed for accessible menus, tabs, toolbars, and composite widgets.
    *
-   * @version 1.3.0
+   * @version 1.3.1
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane
@@ -881,7 +889,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.1.8
+     * @version 4.2.0
      * @author Yusuke Kamiyamane
      * @license MIT
      * @copyright Copyright (c) Yusuke Kamiyamane

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@y14e/accordion",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "WAI-ARIA compliant accordion pattern implementation in TypeScript",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -44,7 +44,7 @@
   "homepage": "https://github.com/y14e/accordion#readme",
   "devDependencies": {
     "@y14e/attributes-utils": "^1.0.5",
-    "@y14e/roving-tabindex": "^1.3.0",
+    "@y14e/roving-tabindex": "^1.3.1",
     "bun-types": "latest",
     "tsup": "^8.0.0",
     "typescript": "^5.6.0",