@y14e/disclosure-css 2.1.0 → 2.1.1

package/README.md

@@ -13,11 +13,11 @@ npm i @y14e/disclosure-css
 import { Disclosure } from '@y14e/disclosure-css';
 
 // CDNs
-import { Disclosure } from 'https://esm.sh/@y14e/disclosure-css@2.1.0';
+import { Disclosure } from 'https://esm.sh/@y14e/disclosure-css@2.1.1';
 // or
-import { Disclosure } from 'https://cdn.jsdelivr.net/npm/@y14e/disclosure-css@2.1.0/+esm';
+import { Disclosure } from 'https://cdn.jsdelivr.net/npm/@y14e/disclosure-css@2.1.1/+esm';
 // or
-import { Disclosure } from 'https://esm.unpkg.com/@y14e/disclosure-css@2.1.0';
+import { Disclosure } from 'https://esm.unpkg.com/@y14e/disclosure-css@2.1.1';
 ```
 
 ## Usage

package/dist/index.bundle.cjs

@@ -207,31 +207,25 @@ function normalizeRadioGroup(elements) {
       map = /* @__PURE__ */ new Map();
     }
     const root = element.getRootNode();
-    let groups = map.get(root);
+    const groups = map.get(root) ?? map.set(root, /* @__PURE__ */ new Map()).get(root);
     if (!groups) {
-      groups = /* @__PURE__ */ new Map();
-      map.set(root, groups);
-    }
-    let group = groups.get(element.form);
-    if (!group) {
-      group = /* @__PURE__ */ new Map();
-      groups.set(element.form, group);
+      continue;
     }
-    let radios = group.get(element.name);
+    const { form, name } = element;
+    const radios = groups.get(form) ?? groups.set(form, /* @__PURE__ */ new Map()).get(form);
     if (!radios) {
-      radios = [];
-      group.set(element.name, radios);
+      continue;
     }
-    radios.push(element);
+    (radios.get(name) ?? radios.set(name, []).get(name))?.push(element);
   }
   if (!map) {
     return elements;
   }
   const placeholder = /* @__PURE__ */ new Set();
-  for (const groups of map.values()) {
-    for (const group of groups.values()) {
-      for (const radios of group.values()) {
-        const radio = radios.find((r) => r.checked) ?? radios[0];
+  for (const v of map.values()) {
+    for (const w of v.values()) {
+      for (const x of w.values()) {
+        const radio = x.find((r) => r.checked) ?? x[0];
         radio && placeholder.add(radio);
       }
     }
@@ -352,14 +346,15 @@ function resolveOptions2(options) {
 }
 
 // node_modules/@y14e/roving-tabindex/dist/index.js
+var DIRECTIONS = ["both", "grid", "horizontal", "vertical"];
 function createRovingTabIndex(container, options = {}) {
   if (!(container instanceof Element)) {
     console.warn("Invalid container element");
     return () => {
     };
   }
-  const roving = new RovingTabIndex(container, options);
-  return () => roving.destroy();
+  const rovingTabIndex = new RovingTabIndex(container, options);
+  return () => rovingTabIndex.destroy();
 }
 var RovingTabIndex = class _RovingTabIndex {
   static #initialized = /* @__PURE__ */ new Set();
@@ -418,18 +413,19 @@ var RovingTabIndex = class _RovingTabIndex {
     if (!(event instanceof KeyboardEvent)) {
       return;
     }
+    const { direction, typeahead, wrap = false } = this.#settings;
+    const isGrid = direction === "grid";
     const { key, altKey, ctrlKey, metaKey, shiftKey } = event;
-    if (altKey || ctrlKey || metaKey || shiftKey) {
+    if (!(isGrid && ["End", "Home"].includes(key)) && ctrlKey || altKey || metaKey || shiftKey) {
       return;
     }
-    const { direction, typeahead, wrap } = this.#settings;
     const isBoth = direction === "both";
     const isHorizontal = direction === "horizontal";
     if (![
       "End",
       "Home",
-      ...isBoth ? ["ArrowLeft", "ArrowUp"] : [`Arrow${isHorizontal ? "Left" : "Up"}`],
-      ...isBoth ? ["ArrowRight", "ArrowDown"] : [`Arrow${isHorizontal ? "Right" : "Down"}`]
+      ...isGrid || isBoth ? ["ArrowLeft", "ArrowUp"] : [`Arrow${isHorizontal ? "Left" : "Up"}`],
+      ...isGrid || isBoth ? ["ArrowRight", "ArrowDown"] : [`Arrow${isHorizontal ? "Right" : "Down"}`]
     ].includes(key)) {
       if (!typeahead || !/^\S$/i.test(key) || !this.#focusablesByFirstChar.has(key.toUpperCase())) {
         return;
@@ -448,39 +444,48 @@ var RovingTabIndex = class _RovingTabIndex {
     event.preventDefault();
     let newIndex;
     const activeIndex = candidates.indexOf(active);
-    let focusables = candidates;
+    let target = candidates;
     switch (key) {
       case "End":
-        newIndex = -1;
-        break;
-      case "Home":
-        newIndex = 0;
-        break;
-      case "ArrowLeft":
-      case "ArrowUp": {
-        const rawIndex = activeIndex - 1;
-        newIndex = wrap ? rawIndex : Math.max(rawIndex, 0);
+      case "Home": {
+        const rawIndex = key === "End" ? -1 : 0;
+        if (isGrid && !ctrlKey) {
+          const cell = this.#getCellsOfActiveRow().at(rawIndex);
+          newIndex = cell ? candidates.indexOf(cell) : activeIndex;
+        } else {
+          newIndex = rawIndex;
+        }
         break;
       }
+      case "ArrowLeft":
+      case "ArrowUp":
       case "ArrowRight":
       case "ArrowDown": {
-        const rawIndex = activeIndex + 1;
-        const length = focusables.length;
-        newIndex = wrap ? rawIndex % length : Math.min(rawIndex, length - 1);
+        if (["ArrowUp", "ArrowDown"].includes(key) && isGrid) {
+          const cell = this.#getNextCell(key, wrap);
+          newIndex = cell ? candidates.indexOf(cell) : activeIndex;
+        } else {
+          if (isGrid) {
+            target = this.#getCellsOfActiveRow();
+          }
+          const isPrevious = ["ArrowLeft", "ArrowUp"].includes(key);
+          const rawIndex = (isGrid ? target.indexOf(active) : activeIndex) + (isPrevious ? -1 : 1);
+          newIndex = isPrevious ? wrap ? rawIndex : Math.max(rawIndex, 0) : wrap ? rawIndex % target.length : Math.min(rawIndex, target.length - 1);
+        }
         break;
       }
       default: {
         const focusablesByFirstChar = new Set(
           this.#focusablesByFirstChar.get(key.toUpperCase()) ?? []
         );
-        focusables = candidates.filter((c) => focusablesByFirstChar.has(c));
-        const afterIndex = focusables.findIndex(
+        target = candidates.filter((c) => focusablesByFirstChar.has(c));
+        const afterIndex = target.findIndex(
           (f) => candidates.indexOf(f) > activeIndex
         );
         newIndex = afterIndex >= 0 ? afterIndex : 0;
       }
     }
-    const focusable = focusables.at(newIndex);
+    const focusable = target.at(newIndex);
     focusable && focusElement(focusable);
   };
   #update(active) {
@@ -550,6 +555,24 @@ var RovingTabIndex = class _RovingTabIndex {
     const { selector } = this.#settings;
     return (element) => !selector || [...this.#container.querySelectorAll(selector)].includes(element);
   }
+  #getCellCoords(cell) {
+    const { height, left, top, width } = cell.getBoundingClientRect();
+    return {
+      x: left + width / 2,
+      y: top + height / 2
+    };
+  }
+  #getCellsOfActiveRow() {
+    const active = getActiveElement();
+    if (!(active instanceof Element)) {
+      return [];
+    }
+    const activeRect = active.getBoundingClientRect();
+    return this.#getFocusables().filter((cell) => {
+      const cellRect = cell.getBoundingClientRect();
+      return cellRect.top < activeRect.bottom && cellRect.bottom > activeRect.top;
+    });
+  }
   #getFocusables() {
     return getFocusables(this.#container, {
       composed: true,
@@ -558,6 +581,50 @@ var RovingTabIndex = class _RovingTabIndex {
       skipVisibilityCheck: true
     });
   }
+  #getNextCell(key, wrap) {
+    const cells = this.#getFocusables();
+    const active = getActiveElement();
+    if (!(active instanceof Element)) {
+      return null;
+    }
+    const activeCoords = this.#getCellCoords(active);
+    let min = Infinity;
+    let result = null;
+    for (const cell of cells) {
+      if (cell === active) {
+        continue;
+      }
+      const cellCoords = this.#getCellCoords(cell);
+      const distances = {
+        x: Math.abs(cellCoords.x - activeCoords.x),
+        y: Math.abs(cellCoords.y - activeCoords.y)
+      };
+      if (key === "ArrowUp" && cellCoords.y < activeCoords.y && distances.x < distances.y || key === "ArrowDown" && cellCoords.y > activeCoords.y && distances.x < distances.y) {
+        const distance = distances.x ** 2 + distances.y ** 2;
+        if (distance < min) {
+          min = distance;
+          result = cell;
+        }
+      }
+    }
+    if (!result && wrap) {
+      let max = -Infinity;
+      for (const cell of cells) {
+        if (cell === active) {
+          continue;
+        }
+        const cellCoords = this.#getCellCoords(cell);
+        if (Math.abs(cellCoords.x - activeCoords.x) < cell.getBoundingClientRect().width / 2) {
+          const distance = key === "ArrowUp" ? cellCoords.y - activeCoords.y : activeCoords.y - cellCoords.y;
+          if (distance > max) {
+            max = distance;
+            result = cell;
+          }
+        }
+      }
+    }
+    return result;
+  }
   #resolveOptions(options) {
     let {
       direction = "both",
@@ -569,7 +636,7 @@ var RovingTabIndex = class _RovingTabIndex {
       wrap = false
     } = options;
     direction = direction.toLowerCase();
-    if (!["both", "horizontal", "vertical"].includes(direction)) {
+    if (!DIRECTIONS.includes(direction)) {
       console.warn("Invalid direction option. Fallback: 'both'.");
       direction = "both";
     }
@@ -780,7 +847,7 @@ var Disclosure = class _Disclosure {
  * WAI-ARIA compliant disclosure pattern implementation in TypeScript.
  * Using the <details> and <summary> element.
  *
- * @version 2.1.0
+ * @version 2.1.1
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -805,7 +872,7 @@ power-focusable/dist/index.js:
    * High-precision focus management utility with full composed tree support.
    * Handles complex focus rules including tabindex ordering, radio groups, inert.
    *
-   * @version 4.3.33
+   * @version 4.4.3
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane
@@ -818,7 +885,7 @@ power-focusable/dist/index.js:
    * Lightweight roving tabindex utility with fully focus management.
    * Designed for accessible menus, tabs, toolbars, and composite widgets.
    *
-   * @version 3.1.31
+   * @version 3.3.2
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.bundle.js

@@ -205,31 +205,25 @@ function normalizeRadioGroup(elements) {
       map = /* @__PURE__ */ new Map();
     }
     const root = element.getRootNode();
-    let groups = map.get(root);
+    const groups = map.get(root) ?? map.set(root, /* @__PURE__ */ new Map()).get(root);
     if (!groups) {
-      groups = /* @__PURE__ */ new Map();
-      map.set(root, groups);
-    }
-    let group = groups.get(element.form);
-    if (!group) {
-      group = /* @__PURE__ */ new Map();
-      groups.set(element.form, group);
+      continue;
     }
-    let radios = group.get(element.name);
+    const { form, name } = element;
+    const radios = groups.get(form) ?? groups.set(form, /* @__PURE__ */ new Map()).get(form);
     if (!radios) {
-      radios = [];
-      group.set(element.name, radios);
+      continue;
     }
-    radios.push(element);
+    (radios.get(name) ?? radios.set(name, []).get(name))?.push(element);
   }
   if (!map) {
     return elements;
   }
   const placeholder = /* @__PURE__ */ new Set();
-  for (const groups of map.values()) {
-    for (const group of groups.values()) {
-      for (const radios of group.values()) {
-        const radio = radios.find((r) => r.checked) ?? radios[0];
+  for (const v of map.values()) {
+    for (const w of v.values()) {
+      for (const x of w.values()) {
+        const radio = x.find((r) => r.checked) ?? x[0];
         radio && placeholder.add(radio);
       }
     }
@@ -350,14 +344,15 @@ function resolveOptions2(options) {
 }
 
 // node_modules/@y14e/roving-tabindex/dist/index.js
+var DIRECTIONS = ["both", "grid", "horizontal", "vertical"];
 function createRovingTabIndex(container, options = {}) {
   if (!(container instanceof Element)) {
     console.warn("Invalid container element");
     return () => {
     };
   }
-  const roving = new RovingTabIndex(container, options);
-  return () => roving.destroy();
+  const rovingTabIndex = new RovingTabIndex(container, options);
+  return () => rovingTabIndex.destroy();
 }
 var RovingTabIndex = class _RovingTabIndex {
   static #initialized = /* @__PURE__ */ new Set();
@@ -416,18 +411,19 @@ var RovingTabIndex = class _RovingTabIndex {
     if (!(event instanceof KeyboardEvent)) {
       return;
     }
+    const { direction, typeahead, wrap = false } = this.#settings;
+    const isGrid = direction === "grid";
     const { key, altKey, ctrlKey, metaKey, shiftKey } = event;
-    if (altKey || ctrlKey || metaKey || shiftKey) {
+    if (!(isGrid && ["End", "Home"].includes(key)) && ctrlKey || altKey || metaKey || shiftKey) {
       return;
     }
-    const { direction, typeahead, wrap } = this.#settings;
     const isBoth = direction === "both";
     const isHorizontal = direction === "horizontal";
     if (![
       "End",
       "Home",
-      ...isBoth ? ["ArrowLeft", "ArrowUp"] : [`Arrow${isHorizontal ? "Left" : "Up"}`],
-      ...isBoth ? ["ArrowRight", "ArrowDown"] : [`Arrow${isHorizontal ? "Right" : "Down"}`]
+      ...isGrid || isBoth ? ["ArrowLeft", "ArrowUp"] : [`Arrow${isHorizontal ? "Left" : "Up"}`],
+      ...isGrid || isBoth ? ["ArrowRight", "ArrowDown"] : [`Arrow${isHorizontal ? "Right" : "Down"}`]
     ].includes(key)) {
       if (!typeahead || !/^\S$/i.test(key) || !this.#focusablesByFirstChar.has(key.toUpperCase())) {
         return;
@@ -446,39 +442,48 @@ var RovingTabIndex = class _RovingTabIndex {
     event.preventDefault();
     let newIndex;
     const activeIndex = candidates.indexOf(active);
-    let focusables = candidates;
+    let target = candidates;
     switch (key) {
       case "End":
-        newIndex = -1;
-        break;
-      case "Home":
-        newIndex = 0;
-        break;
-      case "ArrowLeft":
-      case "ArrowUp": {
-        const rawIndex = activeIndex - 1;
-        newIndex = wrap ? rawIndex : Math.max(rawIndex, 0);
+      case "Home": {
+        const rawIndex = key === "End" ? -1 : 0;
+        if (isGrid && !ctrlKey) {
+          const cell = this.#getCellsOfActiveRow().at(rawIndex);
+          newIndex = cell ? candidates.indexOf(cell) : activeIndex;
+        } else {
+          newIndex = rawIndex;
+        }
         break;
       }
+      case "ArrowLeft":
+      case "ArrowUp":
       case "ArrowRight":
       case "ArrowDown": {
-        const rawIndex = activeIndex + 1;
-        const length = focusables.length;
-        newIndex = wrap ? rawIndex % length : Math.min(rawIndex, length - 1);
+        if (["ArrowUp", "ArrowDown"].includes(key) && isGrid) {
+          const cell = this.#getNextCell(key, wrap);
+          newIndex = cell ? candidates.indexOf(cell) : activeIndex;
+        } else {
+          if (isGrid) {
+            target = this.#getCellsOfActiveRow();
+          }
+          const isPrevious = ["ArrowLeft", "ArrowUp"].includes(key);
+          const rawIndex = (isGrid ? target.indexOf(active) : activeIndex) + (isPrevious ? -1 : 1);
+          newIndex = isPrevious ? wrap ? rawIndex : Math.max(rawIndex, 0) : wrap ? rawIndex % target.length : Math.min(rawIndex, target.length - 1);
+        }
         break;
       }
       default: {
         const focusablesByFirstChar = new Set(
           this.#focusablesByFirstChar.get(key.toUpperCase()) ?? []
         );
-        focusables = candidates.filter((c) => focusablesByFirstChar.has(c));
-        const afterIndex = focusables.findIndex(
+        target = candidates.filter((c) => focusablesByFirstChar.has(c));
+        const afterIndex = target.findIndex(
           (f) => candidates.indexOf(f) > activeIndex
         );
         newIndex = afterIndex >= 0 ? afterIndex : 0;
       }
     }
-    const focusable = focusables.at(newIndex);
+    const focusable = target.at(newIndex);
     focusable && focusElement(focusable);
   };
   #update(active) {
@@ -548,6 +553,24 @@ var RovingTabIndex = class _RovingTabIndex {
     const { selector } = this.#settings;
     return (element) => !selector || [...this.#container.querySelectorAll(selector)].includes(element);
   }
+  #getCellCoords(cell) {
+    const { height, left, top, width } = cell.getBoundingClientRect();
+    return {
+      x: left + width / 2,
+      y: top + height / 2
+    };
+  }
+  #getCellsOfActiveRow() {
+    const active = getActiveElement();
+    if (!(active instanceof Element)) {
+      return [];
+    }
+    const activeRect = active.getBoundingClientRect();
+    return this.#getFocusables().filter((cell) => {
+      const cellRect = cell.getBoundingClientRect();
+      return cellRect.top < activeRect.bottom && cellRect.bottom > activeRect.top;
+    });
+  }
   #getFocusables() {
     return getFocusables(this.#container, {
       composed: true,
@@ -556,6 +579,50 @@ var RovingTabIndex = class _RovingTabIndex {
       skipVisibilityCheck: true
     });
   }
+  #getNextCell(key, wrap) {
+    const cells = this.#getFocusables();
+    const active = getActiveElement();
+    if (!(active instanceof Element)) {
+      return null;
+    }
+    const activeCoords = this.#getCellCoords(active);
+    let min = Infinity;
+    let result = null;
+    for (const cell of cells) {
+      if (cell === active) {
+        continue;
+      }
+      const cellCoords = this.#getCellCoords(cell);
+      const distances = {
+        x: Math.abs(cellCoords.x - activeCoords.x),
+        y: Math.abs(cellCoords.y - activeCoords.y)
+      };
+      if (key === "ArrowUp" && cellCoords.y < activeCoords.y && distances.x < distances.y || key === "ArrowDown" && cellCoords.y > activeCoords.y && distances.x < distances.y) {
+        const distance = distances.x ** 2 + distances.y ** 2;
+        if (distance < min) {
+          min = distance;
+          result = cell;
+        }
+      }
+    }
+    if (!result && wrap) {
+      let max = -Infinity;
+      for (const cell of cells) {
+        if (cell === active) {
+          continue;
+        }
+        const cellCoords = this.#getCellCoords(cell);
+        if (Math.abs(cellCoords.x - activeCoords.x) < cell.getBoundingClientRect().width / 2) {
+          const distance = key === "ArrowUp" ? cellCoords.y - activeCoords.y : activeCoords.y - cellCoords.y;
+          if (distance > max) {
+            max = distance;
+            result = cell;
+          }
+        }
+      }
+    }
+    return result;
+  }
   #resolveOptions(options) {
     let {
       direction = "both",
@@ -567,7 +634,7 @@ var RovingTabIndex = class _RovingTabIndex {
       wrap = false
     } = options;
     direction = direction.toLowerCase();
-    if (!["both", "horizontal", "vertical"].includes(direction)) {
+    if (!DIRECTIONS.includes(direction)) {
       console.warn("Invalid direction option. Fallback: 'both'.");
       direction = "both";
     }
@@ -778,7 +845,7 @@ var Disclosure = class _Disclosure {
  * WAI-ARIA compliant disclosure pattern implementation in TypeScript.
  * Using the <details> and <summary> element.
  *
- * @version 2.1.0
+ * @version 2.1.1
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -803,7 +870,7 @@ power-focusable/dist/index.js:
    * High-precision focus management utility with full composed tree support.
    * Handles complex focus rules including tabindex ordering, radio groups, inert.
    *
-   * @version 4.3.33
+   * @version 4.4.3
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane
@@ -816,7 +883,7 @@ power-focusable/dist/index.js:
    * Lightweight roving tabindex utility with fully focus management.
    * Designed for accessible menus, tabs, toolbars, and composite widgets.
    *
-   * @version 3.1.31
+   * @version 3.3.2
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.cjs

@@ -170,7 +170,7 @@ var Disclosure = class _Disclosure {
  * WAI-ARIA compliant disclosure pattern implementation in TypeScript.
  * Using the <details> and <summary> element.
  *
- * @version 2.1.0
+ * @version 2.1.1
  * @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 2.1.0
+ * @version 2.1.1
  * @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 2.1.0
+ * @version 2.1.1
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.js

@@ -168,7 +168,7 @@ var Disclosure = class _Disclosure {
  * WAI-ARIA compliant disclosure pattern implementation in TypeScript.
  * Using the <details> and <summary> element.
  *
- * @version 2.1.0
+ * @version 2.1.1
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@y14e/disclosure-css",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "WAI-ARIA compliant disclosure pattern implementation in TypeScript",
   "keywords": [
     "a11y",
@@ -55,6 +55,6 @@
   },
   "dependencies": {
     "@y14e/attribute-utils": "^2.0.12",
-    "@y14e/roving-tabindex": "^3.1.31"
+    "@y14e/roving-tabindex": "^3.3.2"
   }
 }