@y14e/accordion 1.4.0 → 1.4.2

package/README.md

@@ -10,14 +10,14 @@ npm i @y14e/accordion
 
 ```ts
 // npm
-import Accordion from '@y14e/accordion';
+import Accordion from '@y14e/accordion@1.4.2';
 
 // CDNs
-import Accordion from 'https://esm.sh/@y14e/accordion'
+import Accordion from 'https://esm.sh/@y14e/accordion@1.4.2';
 // or
-import Accordion from 'https://cdn.jsdelivr.net/npm/@y14e/accordion/+esm';
+import Accordion from 'https://cdn.jsdelivr.net/npm/@y14e/accordion@1.4.2/+esm';
 // or
-import Accordion from 'https://unpkg.com/@y14e/accordion/dist/index.js';
+import Accordion from 'https://esm.unpkg.com/@y14e/accordion@1.4.2';
 ```
 
 ## Usage

package/dist/index.cjs

@@ -165,6 +165,7 @@ function getFocusables(container = document.body, options = {}) {
     composed = false,
     filter,
     include,
+    skipNegativeTabIndexCheck = false,
     skipVisibilityCheck = false
   } = options;
   if (typeof composed !== "boolean") {
@@ -183,11 +184,22 @@ function getFocusables(container = document.body, options = {}) {
     );
     include = void 0;
   }
+  if (typeof skipNegativeTabIndexCheck !== "boolean") {
+    console.warn("Invalid skipNegativeTabIndexCheck option. Fallback: false.");
+    skipNegativeTabIndexCheck = false;
+  }
+  if (typeof skipVisibilityCheck !== "boolean") {
+    console.warn("Invalid skipVisibilityCheck option. Fallback: false.");
+    skipVisibilityCheck = false;
+  }
   const elements = [];
   if (composed || include) {
     let traverse2 = function(node) {
       if (node instanceof Element) {
-        if (isFocusable(node, { skipVisibilityCheck }) || include?.(node)) {
+        if (isFocusable(node, {
+          skipNegativeTabIndexCheck,
+          skipVisibilityCheck
+        }) || include?.(node)) {
           elements[elements.length] = node;
         }
       }
@@ -208,7 +220,10 @@ function getFocusables(container = document.body, options = {}) {
       if (!(candidate instanceof Element)) {
         continue;
       }
-      if (isFocusable(candidate, { skipVisibilityCheck })) {
+      if (isFocusable(candidate, {
+        skipNegativeTabIndexCheck,
+        skipVisibilityCheck
+      })) {
         elements[elements.length] = candidate;
       }
     }
@@ -221,7 +236,11 @@ function isFocusable(element, options = {}) {
     console.warn("Invalid element");
     return false;
   }
-  let { skipVisibilityCheck = false } = options;
+  let { skipNegativeTabIndexCheck = false, skipVisibilityCheck = false } = options;
+  if (typeof skipNegativeTabIndexCheck !== "boolean") {
+    console.warn("Invalid skipNegativeTabIndexCheck option. Fallback: false.");
+    skipNegativeTabIndexCheck = false;
+  }
   if (typeof skipVisibilityCheck !== "boolean") {
     console.warn("Invalid skipVisibilityCheck option. Fallback: false.");
     skipVisibilityCheck = false;
@@ -229,10 +248,12 @@ function isFocusable(element, options = {}) {
   if (element.hasAttribute("hidden") || isInert(element)) {
     return false;
   }
-  if (getTabIndex(element) < 0) {
+  if (!skipNegativeTabIndexCheck && getTabIndex(element) < 0) {
     return false;
   }
-  if (!element.matches(FOCUSABLE_SELECTOR)) {
+  if (!element.matches(
+    skipNegativeTabIndexCheck ? FOCUSABLE_SELECTOR.replace(/(,\s*)?\[tabindex="-1"\]/g, "") : FOCUSABLE_SELECTOR
+  )) {
     return false;
   }
   if (isDisabledDeep(element)) {
@@ -393,7 +414,7 @@ function createRovingTabIndex(container, options = {}) {
     console.warn("Invalid navigationOnly option. Fallback: false.");
     navigationOnly = false;
   }
-  if (typeof selector !== "undefined" && typeof selector !== "string") {
+  if (typeof selector !== "undefined" && (typeof selector !== "string" || !selector.trim())) {
     console.warn(
       "Invalid selector. Fallback: all focusable elements (undefined)."
     );
@@ -407,13 +428,14 @@ function createRovingTabIndex(container, options = {}) {
     console.warn("Invalid wrap option. Fallback: false.");
     wrap = false;
   }
-  const roving = new RovingTabIndex(container, {
-    direction,
-    navigationOnly,
-    selector,
-    typeahead,
-    wrap
-  });
+  const settings = { navigationOnly, typeahead, wrap };
+  if (direction) {
+    Object.assign(settings, { direction });
+  }
+  if (selector) {
+    Object.assign(settings, { selector });
+  }
+  const roving = new RovingTabIndex(container, settings);
   return () => roving.destroy();
 }
 var RovingTabIndex = class {
@@ -455,8 +477,8 @@ var RovingTabIndex = class {
     if (!event.composedPath().includes(this.#container)) {
       return;
     }
-    const { key, altKey, ctrlKey, metaKey } = event;
-    if (altKey || ctrlKey || metaKey) {
+    const { key, altKey, ctrlKey, metaKey, shiftKey } = event;
+    if (altKey || ctrlKey || metaKey || shiftKey) {
       return;
     }
     const { direction, typeahead, wrap } = this.#options;
@@ -519,14 +541,7 @@ var RovingTabIndex = class {
     focusElement(focusable);
   };
   #update(active) {
-    const current = /* @__PURE__ */ new Set([
-      ...this.#getFocusables(),
-      ...getFocusables(this.#container, {
-        composed: true,
-        filter: this.#selectorFilter,
-        skipVisibilityCheck: true
-      })
-    ]);
+    const current = new Set(this.#getFocusables());
     for (const focusable of this.#focusables) {
       if (current.has(focusable)) {
         continue;
@@ -590,8 +605,7 @@ var RovingTabIndex = class {
     return getFocusables(this.#container, {
       composed: true,
       filter: this.#selectorFilter,
-      include: (element) => this.#focusables.has(element),
-      skipVisibilityCheck: true
+      skipNegativeTabIndexCheck: !this.#options.navigationOnly
     });
   }
 };
@@ -715,8 +729,6 @@ var Accordion = class _Accordion {
     this.#rootElement.removeAttribute("data-accordion-initialized");
   }
   #initialize() {
-    this.#eventController = new AbortController();
-    const { signal } = this.#eventController;
     saveAttributes(this.#triggerElements, [
       "aria-controls",
       "aria-disabled",
@@ -724,13 +736,15 @@ var Accordion = class _Accordion {
       "style",
       "tabindex"
     ]);
+    saveAttributes(this.#contentElements, ["aria-labelledby", "id", "role"]);
+    this.#eventController = new AbortController();
+    const { signal } = this.#eventController;
     this.#triggerElements.forEach((trigger2, i) => {
       const id = Math.random().toString(36).slice(-8);
       const content2 = this.#contentElements[i];
       if (!content2) {
         return;
       }
-      saveAttributes([content2], ["aria-labelledby", "id", "role"]);
       content2.id ||= `accordion-content-${id}`;
       addTokenToAttribute(trigger2, "aria-controls", content2.id);
       trigger2.setAttribute(
@@ -880,7 +894,7 @@ function waitAnimationFinish(animation) {
  * Accordion
  * WAI-ARIA compliant accordion pattern implementation in TypeScript.
  *
- * @version 1.4.0
+ * @version 1.4.2
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -892,7 +906,7 @@ function waitAnimationFinish(animation) {
   (**
    * Attributes Utils
    *
-   * @version 1.0.5
+   * @version 1.1.0
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane
@@ -916,7 +930,7 @@ function waitAnimationFinish(animation) {
    * Lightweight roving tabindex utility with fully focus management.
    * Designed for accessible menus, tabs, toolbars, and composite widgets.
    *
-   * @version 1.3.1
+   * @version 2.0.4
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane
@@ -928,7 +942,7 @@ function waitAnimationFinish(animation) {
     (**
      * Attributes Utils
      *
-     * @version 1.0.5
+     * @version 1.1.0
      * @author Yusuke Kamiyamane
      * @license MIT
      * @copyright Copyright (c) Yusuke Kamiyamane
@@ -941,7 +955,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.2.0
+     * @version 4.3.1
      * @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.0
+ * @version 1.4.2
  * @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.0
+ * @version 1.4.2
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.js

@@ -163,6 +163,7 @@ function getFocusables(container = document.body, options = {}) {
     composed = false,
     filter,
     include,
+    skipNegativeTabIndexCheck = false,
     skipVisibilityCheck = false
   } = options;
   if (typeof composed !== "boolean") {
@@ -181,11 +182,22 @@ function getFocusables(container = document.body, options = {}) {
     );
     include = void 0;
   }
+  if (typeof skipNegativeTabIndexCheck !== "boolean") {
+    console.warn("Invalid skipNegativeTabIndexCheck option. Fallback: false.");
+    skipNegativeTabIndexCheck = false;
+  }
+  if (typeof skipVisibilityCheck !== "boolean") {
+    console.warn("Invalid skipVisibilityCheck option. Fallback: false.");
+    skipVisibilityCheck = false;
+  }
   const elements = [];
   if (composed || include) {
     let traverse2 = function(node) {
       if (node instanceof Element) {
-        if (isFocusable(node, { skipVisibilityCheck }) || include?.(node)) {
+        if (isFocusable(node, {
+          skipNegativeTabIndexCheck,
+          skipVisibilityCheck
+        }) || include?.(node)) {
           elements[elements.length] = node;
         }
       }
@@ -206,7 +218,10 @@ function getFocusables(container = document.body, options = {}) {
       if (!(candidate instanceof Element)) {
         continue;
       }
-      if (isFocusable(candidate, { skipVisibilityCheck })) {
+      if (isFocusable(candidate, {
+        skipNegativeTabIndexCheck,
+        skipVisibilityCheck
+      })) {
         elements[elements.length] = candidate;
       }
     }
@@ -219,7 +234,11 @@ function isFocusable(element, options = {}) {
     console.warn("Invalid element");
     return false;
   }
-  let { skipVisibilityCheck = false } = options;
+  let { skipNegativeTabIndexCheck = false, skipVisibilityCheck = false } = options;
+  if (typeof skipNegativeTabIndexCheck !== "boolean") {
+    console.warn("Invalid skipNegativeTabIndexCheck option. Fallback: false.");
+    skipNegativeTabIndexCheck = false;
+  }
   if (typeof skipVisibilityCheck !== "boolean") {
     console.warn("Invalid skipVisibilityCheck option. Fallback: false.");
     skipVisibilityCheck = false;
@@ -227,10 +246,12 @@ function isFocusable(element, options = {}) {
   if (element.hasAttribute("hidden") || isInert(element)) {
     return false;
   }
-  if (getTabIndex(element) < 0) {
+  if (!skipNegativeTabIndexCheck && getTabIndex(element) < 0) {
     return false;
   }
-  if (!element.matches(FOCUSABLE_SELECTOR)) {
+  if (!element.matches(
+    skipNegativeTabIndexCheck ? FOCUSABLE_SELECTOR.replace(/(,\s*)?\[tabindex="-1"\]/g, "") : FOCUSABLE_SELECTOR
+  )) {
     return false;
   }
   if (isDisabledDeep(element)) {
@@ -391,7 +412,7 @@ function createRovingTabIndex(container, options = {}) {
     console.warn("Invalid navigationOnly option. Fallback: false.");
     navigationOnly = false;
   }
-  if (typeof selector !== "undefined" && typeof selector !== "string") {
+  if (typeof selector !== "undefined" && (typeof selector !== "string" || !selector.trim())) {
     console.warn(
       "Invalid selector. Fallback: all focusable elements (undefined)."
     );
@@ -405,13 +426,14 @@ function createRovingTabIndex(container, options = {}) {
     console.warn("Invalid wrap option. Fallback: false.");
     wrap = false;
   }
-  const roving = new RovingTabIndex(container, {
-    direction,
-    navigationOnly,
-    selector,
-    typeahead,
-    wrap
-  });
+  const settings = { navigationOnly, typeahead, wrap };
+  if (direction) {
+    Object.assign(settings, { direction });
+  }
+  if (selector) {
+    Object.assign(settings, { selector });
+  }
+  const roving = new RovingTabIndex(container, settings);
   return () => roving.destroy();
 }
 var RovingTabIndex = class {
@@ -453,8 +475,8 @@ var RovingTabIndex = class {
     if (!event.composedPath().includes(this.#container)) {
       return;
     }
-    const { key, altKey, ctrlKey, metaKey } = event;
-    if (altKey || ctrlKey || metaKey) {
+    const { key, altKey, ctrlKey, metaKey, shiftKey } = event;
+    if (altKey || ctrlKey || metaKey || shiftKey) {
       return;
     }
     const { direction, typeahead, wrap } = this.#options;
@@ -517,14 +539,7 @@ var RovingTabIndex = class {
     focusElement(focusable);
   };
   #update(active) {
-    const current = /* @__PURE__ */ new Set([
-      ...this.#getFocusables(),
-      ...getFocusables(this.#container, {
-        composed: true,
-        filter: this.#selectorFilter,
-        skipVisibilityCheck: true
-      })
-    ]);
+    const current = new Set(this.#getFocusables());
     for (const focusable of this.#focusables) {
       if (current.has(focusable)) {
         continue;
@@ -588,8 +603,7 @@ var RovingTabIndex = class {
     return getFocusables(this.#container, {
       composed: true,
       filter: this.#selectorFilter,
-      include: (element) => this.#focusables.has(element),
-      skipVisibilityCheck: true
+      skipNegativeTabIndexCheck: !this.#options.navigationOnly
     });
   }
 };
@@ -713,8 +727,6 @@ var Accordion = class _Accordion {
     this.#rootElement.removeAttribute("data-accordion-initialized");
   }
   #initialize() {
-    this.#eventController = new AbortController();
-    const { signal } = this.#eventController;
     saveAttributes(this.#triggerElements, [
       "aria-controls",
       "aria-disabled",
@@ -722,13 +734,15 @@ var Accordion = class _Accordion {
       "style",
       "tabindex"
     ]);
+    saveAttributes(this.#contentElements, ["aria-labelledby", "id", "role"]);
+    this.#eventController = new AbortController();
+    const { signal } = this.#eventController;
     this.#triggerElements.forEach((trigger2, i) => {
       const id = Math.random().toString(36).slice(-8);
       const content2 = this.#contentElements[i];
       if (!content2) {
         return;
       }
-      saveAttributes([content2], ["aria-labelledby", "id", "role"]);
       content2.id ||= `accordion-content-${id}`;
       addTokenToAttribute(trigger2, "aria-controls", content2.id);
       trigger2.setAttribute(
@@ -878,7 +892,7 @@ function waitAnimationFinish(animation) {
  * Accordion
  * WAI-ARIA compliant accordion pattern implementation in TypeScript.
  *
- * @version 1.4.0
+ * @version 1.4.2
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -890,7 +904,7 @@ function waitAnimationFinish(animation) {
   (**
    * Attributes Utils
    *
-   * @version 1.0.5
+   * @version 1.1.0
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane
@@ -914,7 +928,7 @@ function waitAnimationFinish(animation) {
    * Lightweight roving tabindex utility with fully focus management.
    * Designed for accessible menus, tabs, toolbars, and composite widgets.
    *
-   * @version 1.3.1
+   * @version 2.0.4
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane
@@ -926,7 +940,7 @@ function waitAnimationFinish(animation) {
     (**
      * Attributes Utils
      *
-     * @version 1.0.5
+     * @version 1.1.0
      * @author Yusuke Kamiyamane
      * @license MIT
      * @copyright Copyright (c) Yusuke Kamiyamane
@@ -939,7 +953,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.2.0
+     * @version 4.3.1
      * @author Yusuke Kamiyamane
      * @license MIT
      * @copyright Copyright (c) Yusuke Kamiyamane

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@y14e/accordion",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "WAI-ARIA compliant accordion pattern implementation in TypeScript",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -43,9 +43,9 @@
   },
   "homepage": "https://github.com/y14e/accordion#readme",
   "devDependencies": {
-    "@y14e/attributes-utils": "^1.0.5",
+    "@y14e/attributes-utils": "^1.1.0",
     "@y14e/button": "^1.0.0",
-    "@y14e/roving-tabindex": "^1.3.1",
+    "@y14e/roving-tabindex": "^2.0.4",
     "bun-types": "latest",
     "tsup": "^8.0.0",
     "typescript": "^5.6.0",