npm - @y14e/disclosure-css - Versions diffs - 1.3.0 → 1.3.2 - Mend

@y14e/disclosure-css 1.3.0 → 1.3.2

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 (6) hide show

package/README.md CHANGED Viewed

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

package/dist/index.cjs CHANGED Viewed

@@ -82,7 +82,13 @@ 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,
+    skipNegativeTabIndexCheck = false,
+    skipVisibilityCheck = false
+  } = options;
   if (typeof composed !== "boolean") {
     console.warn("Invalid composed option. Fallback: false.");
     composed = false;
@@ -99,11 +105,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) || include?.(node)) {
+        if (isFocusable(node, {
+          skipNegativeTabIndexCheck,
+          skipVisibilityCheck
+        }) || include?.(node)) {
           elements[elements.length] = node;
         }
       }
@@ -124,7 +141,10 @@ function getFocusables(container = document.body, options = {}) {
       if (!(candidate instanceof Element)) {
         continue;
       }
-      if (isFocusable(candidate)) {
+      if (isFocusable(candidate, {
+        skipNegativeTabIndexCheck,
+        skipVisibilityCheck
+      })) {
         elements[elements.length] = candidate;
       }
     }
@@ -132,24 +152,35 @@ 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 { 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;
+  }
   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)) {
     return false;
   }
-  if (!element.checkVisibility({
+  if (!skipVisibilityCheck && !element.checkVisibility({
     contentVisibilityAuto: true,
     opacityProperty: true,
     visibilityProperty: true
@@ -318,13 +349,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 !== void 0) {
+    Object.assign(settings, { direction });
+  }
+  if (selector !== void 0) {
+    Object.assign(settings, { selector });
+  }
+  const roving = new RovingTabIndex(container, settings);
   return () => roving.destroy();
 }
 var RovingTabIndex = class {
@@ -366,8 +398,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;
@@ -430,13 +462,7 @@ var RovingTabIndex = class {
     focusElement(focusable);
   };
   #update(active) {
-    const current = /* @__PURE__ */ new Set([
-      ...this.#getFocusables(),
-      ...getFocusables(this.#container, {
-        composed: true,
-        filter: this.#selectorFilter
-      })
-    ]);
+    const current = new Set(this.#getFocusables());
     for (const focusable of this.#focusables) {
       if (current.has(focusable)) {
         continue;
@@ -500,7 +526,7 @@ var RovingTabIndex = class {
     return getFocusables(this.#container, {
       composed: true,
       filter: this.#selectorFilter,
-      include: (element) => this.#focusables.has(element)
+      skipNegativeTabIndexCheck: !this.#options.navigationOnly
     });
   }
 };
@@ -572,12 +598,6 @@ var Disclosure = class {
       this.#bindings.set(summary, binding);
       this.#bindings.set(content, binding);
     });
-    this.#cleanupRovingTabIndex = createRovingTabIndex(this.#rootElement, {
-      direction: "vertical",
-      navigationOnly: true,
-      selector: `summary${NOT_NESTED}`,
-      wrap: true
-    });
     this.#initialize();
   }
   open(details) {
@@ -625,6 +645,12 @@ var Disclosure = class {
         summary.style.setProperty("pointer-events", "none");
       }
     });
+    this.#cleanupRovingTabIndex = createRovingTabIndex(this.#rootElement, {
+      direction: "vertical",
+      navigationOnly: true,
+      selector: "summary:not(:scope summary + * *)",
+      wrap: true
+    });
     this.#rootElement.setAttribute("data-disclosure-initialized", "");
   }
   #toggle(details, isOpen) {
@@ -644,7 +670,7 @@ function isFocusable2(element) {
  * WAI-ARIA compliant disclosure pattern implementation in TypeScript.
  * Using the <details> and <summary> element.
  *
- * @version 1.3.0
+ * @version 1.3.2
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -656,7 +682,7 @@ function isFocusable2(element) {
   (**
    * Attributes Utils
    *
-   * @version 1.0.5
+   * @version 1.1.0
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane
@@ -669,7 +695,7 @@ function isFocusable2(element) {
    * Lightweight roving tabindex utility with fully focus management.
    * Designed for accessible menus, tabs, toolbars, and composite widgets.
    *
-   * @version 1.3.0
+   * @version 2.0.3
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane
@@ -681,7 +707,7 @@ function isFocusable2(element) {
     (**
      * Attributes Utils
      *
-     * @version 1.0.5
+     * @version 1.1.0
      * @author Yusuke Kamiyamane
      * @license MIT
      * @copyright Copyright (c) Yusuke Kamiyamane
@@ -694,7 +720,7 @@ function isFocusable2(element) {
      * 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.3.1
      * @author Yusuke Kamiyamane
      * @license MIT
      * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.d.cts CHANGED Viewed

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

package/dist/index.d.ts CHANGED Viewed

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

package/dist/index.js CHANGED Viewed

@@ -80,7 +80,13 @@ 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,
+    skipNegativeTabIndexCheck = false,
+    skipVisibilityCheck = false
+  } = options;
   if (typeof composed !== "boolean") {
     console.warn("Invalid composed option. Fallback: false.");
     composed = false;
@@ -97,11 +103,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) || include?.(node)) {
+        if (isFocusable(node, {
+          skipNegativeTabIndexCheck,
+          skipVisibilityCheck
+        }) || include?.(node)) {
           elements[elements.length] = node;
         }
       }
@@ -122,7 +139,10 @@ function getFocusables(container = document.body, options = {}) {
       if (!(candidate instanceof Element)) {
         continue;
       }
-      if (isFocusable(candidate)) {
+      if (isFocusable(candidate, {
+        skipNegativeTabIndexCheck,
+        skipVisibilityCheck
+      })) {
         elements[elements.length] = candidate;
       }
     }
@@ -130,24 +150,35 @@ 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 { 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;
+  }
   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)) {
     return false;
   }
-  if (!element.checkVisibility({
+  if (!skipVisibilityCheck && !element.checkVisibility({
     contentVisibilityAuto: true,
     opacityProperty: true,
     visibilityProperty: true
@@ -316,13 +347,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 !== void 0) {
+    Object.assign(settings, { direction });
+  }
+  if (selector !== void 0) {
+    Object.assign(settings, { selector });
+  }
+  const roving = new RovingTabIndex(container, settings);
   return () => roving.destroy();
 }
 var RovingTabIndex = class {
@@ -364,8 +396,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;
@@ -428,13 +460,7 @@ var RovingTabIndex = class {
     focusElement(focusable);
   };
   #update(active) {
-    const current = /* @__PURE__ */ new Set([
-      ...this.#getFocusables(),
-      ...getFocusables(this.#container, {
-        composed: true,
-        filter: this.#selectorFilter
-      })
-    ]);
+    const current = new Set(this.#getFocusables());
     for (const focusable of this.#focusables) {
       if (current.has(focusable)) {
         continue;
@@ -498,7 +524,7 @@ var RovingTabIndex = class {
     return getFocusables(this.#container, {
       composed: true,
       filter: this.#selectorFilter,
-      include: (element) => this.#focusables.has(element)
+      skipNegativeTabIndexCheck: !this.#options.navigationOnly
     });
   }
 };
@@ -570,12 +596,6 @@ var Disclosure = class {
       this.#bindings.set(summary, binding);
       this.#bindings.set(content, binding);
     });
-    this.#cleanupRovingTabIndex = createRovingTabIndex(this.#rootElement, {
-      direction: "vertical",
-      navigationOnly: true,
-      selector: `summary${NOT_NESTED}`,
-      wrap: true
-    });
     this.#initialize();
   }
   open(details) {
@@ -623,6 +643,12 @@ var Disclosure = class {
         summary.style.setProperty("pointer-events", "none");
       }
     });
+    this.#cleanupRovingTabIndex = createRovingTabIndex(this.#rootElement, {
+      direction: "vertical",
+      navigationOnly: true,
+      selector: "summary:not(:scope summary + * *)",
+      wrap: true
+    });
     this.#rootElement.setAttribute("data-disclosure-initialized", "");
   }
   #toggle(details, isOpen) {
@@ -642,7 +668,7 @@ function isFocusable2(element) {
  * WAI-ARIA compliant disclosure pattern implementation in TypeScript.
  * Using the <details> and <summary> element.
  *
- * @version 1.3.0
+ * @version 1.3.2
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -654,7 +680,7 @@ function isFocusable2(element) {
   (**
    * Attributes Utils
    *
-   * @version 1.0.5
+   * @version 1.1.0
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane
@@ -667,7 +693,7 @@ function isFocusable2(element) {
    * Lightweight roving tabindex utility with fully focus management.
    * Designed for accessible menus, tabs, toolbars, and composite widgets.
    *
-   * @version 1.3.0
+   * @version 2.0.3
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane
@@ -679,7 +705,7 @@ function isFocusable2(element) {
     (**
      * Attributes Utils
      *
-     * @version 1.0.5
+     * @version 1.1.0
      * @author Yusuke Kamiyamane
      * @license MIT
      * @copyright Copyright (c) Yusuke Kamiyamane
@@ -692,7 +718,7 @@ function isFocusable2(element) {
      * 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.3.1
      * @author Yusuke Kamiyamane
      * @license MIT
      * @copyright Copyright (c) Yusuke Kamiyamane

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@y14e/disclosure-css",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "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-css#readme",
   "devDependencies": {
-    "@y14e/attributes-utils": "^1.0.5",
-    "@y14e/roving-tabindex": "^1.3.0",
+    "@y14e/attributes-utils": "^1.1.0",
+    "@y14e/roving-tabindex": "^2.0.3",
     "bun-types": "latest",
     "tsup": "^8.0.0",
     "typescript": "^5.6.0"