aria-ease 6.5.0 → 6.5.1

package/dist/index.cjs

@@ -1734,38 +1734,11 @@ function moveFocus(elementItems, currentIndex, direction) {
 function isClickableButNotSemantic(el) {
   return el.getAttribute("data-custom-click") !== null && el.getAttribute("data-custom-click") !== void 0;
 }
-function handleMenuClose(menuElement, menuTriggerButton) {
-  menuElement.style.display = "none";
-  const menuTriggerButtonId = menuTriggerButton.getAttribute("id");
-  if (!menuTriggerButtonId) {
-    console.error("[aria-ease] Menu trigger button must have an id attribute to properly set aria attributes.");
-    return;
-  }
-  menuTriggerButton.setAttribute("aria-expanded", "false");
-}
-function hasSubmenu(menuItem) {
-  return menuItem.getAttribute("aria-haspopup") === "true" || menuItem.getAttribute("aria-haspopup") === "menu";
-}
-function getSubmenuId(menuItem) {
-  return menuItem.getAttribute("aria-controls");
-}
-function handleKeyPress(event, elementItems, elementItemIndex, menuElementDiv, triggerButton, openSubmenu, closeSubmenu, onOpenChange) {
+function handleKeyPress(event, elementItems, elementItemIndex) {
   const currentEl = elementItems.item(elementItemIndex);
   switch (event.key) {
     case "ArrowUp":
     case "ArrowLeft": {
-      if (event.key === "ArrowLeft" && menuElementDiv && closeSubmenu) {
-        const labelledBy = menuElementDiv.getAttribute("aria-labelledby");
-        if (labelledBy) {
-          const parentTrigger = document.getElementById(labelledBy);
-          if (parentTrigger && parentTrigger.getAttribute("role") === "menuitem") {
-            event.preventDefault();
-            closeSubmenu();
-            parentTrigger.focus();
-            return;
-          }
-        }
-      }
       if (!isTextInput(currentEl) && !isTextArea(currentEl)) {
         event.preventDefault();
         moveFocus(elementItems, elementItemIndex, -1);
@@ -1780,14 +1753,6 @@ function handleKeyPress(event, elementItems, elementItemIndex, menuElementDiv, t
     }
     case "ArrowDown":
     case "ArrowRight": {
-      if (event.key === "ArrowRight" && hasSubmenu(currentEl) && openSubmenu) {
-        event.preventDefault();
-        const submenuId = getSubmenuId(currentEl);
-        if (submenuId) {
-          openSubmenu(submenuId);
-          return;
-        }
-      }
       if (!isTextInput(currentEl) && !isTextArea(currentEl)) {
         event.preventDefault();
         moveFocus(elementItems, elementItemIndex, 1);
@@ -1803,15 +1768,6 @@ function handleKeyPress(event, elementItems, elementItemIndex, menuElementDiv, t
     }
     case "Escape": {
       event.preventDefault();
-      if (menuElementDiv && triggerButton) {
-        if (getComputedStyle(menuElementDiv).display === "block") {
-          handleMenuClose(menuElementDiv, triggerButton);
-          if (onOpenChange) {
-            onOpenChange(false);
-          }
-        }
-        triggerButton.focus();
-      }
       break;
     }
     case "Enter":
@@ -1826,12 +1782,6 @@ function handleKeyPress(event, elementItems, elementItemIndex, menuElementDiv, t
       break;
     }
     case "Tab": {
-      if (menuElementDiv && triggerButton && (!event.shiftKey || event.shiftKey)) {
-        handleMenuClose(menuElementDiv, triggerButton);
-        if (onOpenChange) {
-          onOpenChange(false);
-        }
-      }
       break;
     }
     default:
@@ -2069,15 +2019,88 @@ function makeMenuAccessible({ menuId, menuItemsClass, triggerId, callback }) {
     const items = getItems();
     items.forEach((item) => {
       item.setAttribute("role", "menuitem");
+      if (item.hasAttribute("data-submenu-id")) {
+        item.setAttribute("aria-haspopup", "menu");
+        item.setAttribute("aria-controls", item.getAttribute("data-submenu-id"));
+      }
     });
   }
+  function moveFocus2(elementItems, currentIndex, direction) {
+    const len = elementItems.length;
+    const nextIndex = (currentIndex + direction + len) % len;
+    elementItems.item(nextIndex).focus();
+  }
+  function hasSubmenu(menuItem) {
+    return menuItem.hasAttribute("aria-controls") && menuItem.hasAttribute("aria-haspopup") && menuItem.getAttribute("role") === "menuitem";
+  }
   intializeMenuItems();
+  function handleItemsKeydown(event, menuItem, menuItemIndex) {
+    switch (event.key) {
+      case "ArrowUp":
+      case "ArrowLeft": {
+        if (event.key === "ArrowLeft" && triggerButton.getAttribute("role") === "menuitem") {
+          event.preventDefault();
+          closeMenu();
+          return;
+        }
+        event.preventDefault();
+        moveFocus2(toNodeListLike(getFilteredItems()), menuItemIndex, -1);
+        break;
+      }
+      case "ArrowDown":
+      case "ArrowRight": {
+        if (event.key === "ArrowRight" && hasSubmenu(menuItem)) {
+          event.preventDefault();
+          const submenuId = menuItem.getAttribute("aria-controls");
+          if (submenuId) {
+            openSubmenu(submenuId);
+            return;
+          }
+        }
+        event.preventDefault();
+        moveFocus2(toNodeListLike(getFilteredItems()), menuItemIndex, 1);
+        break;
+      }
+      case "Escape": {
+        event.preventDefault();
+        closeMenu();
+        triggerButton.focus();
+        if (onOpenChange) {
+          onOpenChange(false);
+        }
+        break;
+      }
+      case "Enter":
+      case " ": {
+        event.preventDefault();
+        menuItem.click();
+        break;
+      }
+      case "Tab": {
+        if (!event.shiftKey || event.shiftKey) {
+          closeMenu();
+          if (onOpenChange) {
+            onOpenChange(false);
+          }
+        }
+        break;
+      }
+      default:
+        break;
+    }
+  }
   function isItemInNestedSubmenu(item) {
     let parent = item.parentElement;
     while (parent && parent !== menuDiv) {
       if (parent.getAttribute("role") === "menu") {
         return true;
       }
+      if (parent.id) {
+        const parentMenuTrigger = menuDiv.querySelector(`[aria-controls="${parent.id}"]`);
+        if (parentMenuTrigger) {
+          return true;
+        }
+      }
       parent = parent.parentElement;
     }
     return false;
@@ -2113,9 +2136,6 @@ function makeMenuAccessible({ menuId, menuItemsClass, triggerId, callback }) {
     }
     submenuInstance.openMenu();
   }
-  function closeSubmenu() {
-    closeMenu();
-  }
   function onOpenChange(isOpen) {
     if (callback?.onOpenChange) {
       try {
@@ -2127,19 +2147,9 @@ function makeMenuAccessible({ menuId, menuItemsClass, triggerId, callback }) {
   }
   function addListeners() {
     const items = getFilteredItems();
-    const nodeListLike = toNodeListLike(items);
     items.forEach((menuItem, index) => {
       if (!handlerMap.has(menuItem)) {
-        const handler = (event) => handleKeyPress(
-          event,
-          nodeListLike,
-          index,
-          menuDiv,
-          triggerButton,
-          openSubmenu,
-          closeSubmenu,
-          onOpenChange
-        );
+        const handler = (event) => handleItemsKeydown(event, menuItem, index);
         menuItem.addEventListener("keydown", handler);
         handlerMap.set(menuItem, handler);
       }

package/dist/index.js

@@ -208,38 +208,11 @@ function moveFocus(elementItems, currentIndex, direction) {
 function isClickableButNotSemantic(el) {
   return el.getAttribute("data-custom-click") !== null && el.getAttribute("data-custom-click") !== void 0;
 }
-function handleMenuClose(menuElement, menuTriggerButton) {
-  menuElement.style.display = "none";
-  const menuTriggerButtonId = menuTriggerButton.getAttribute("id");
-  if (!menuTriggerButtonId) {
-    console.error("[aria-ease] Menu trigger button must have an id attribute to properly set aria attributes.");
-    return;
-  }
-  menuTriggerButton.setAttribute("aria-expanded", "false");
-}
-function hasSubmenu(menuItem) {
-  return menuItem.getAttribute("aria-haspopup") === "true" || menuItem.getAttribute("aria-haspopup") === "menu";
-}
-function getSubmenuId(menuItem) {
-  return menuItem.getAttribute("aria-controls");
-}
-function handleKeyPress(event, elementItems, elementItemIndex, menuElementDiv, triggerButton, openSubmenu, closeSubmenu, onOpenChange) {
+function handleKeyPress(event, elementItems, elementItemIndex) {
   const currentEl = elementItems.item(elementItemIndex);
   switch (event.key) {
     case "ArrowUp":
     case "ArrowLeft": {
-      if (event.key === "ArrowLeft" && menuElementDiv && closeSubmenu) {
-        const labelledBy = menuElementDiv.getAttribute("aria-labelledby");
-        if (labelledBy) {
-          const parentTrigger = document.getElementById(labelledBy);
-          if (parentTrigger && parentTrigger.getAttribute("role") === "menuitem") {
-            event.preventDefault();
-            closeSubmenu();
-            parentTrigger.focus();
-            return;
-          }
-        }
-      }
       if (!isTextInput(currentEl) && !isTextArea(currentEl)) {
         event.preventDefault();
         moveFocus(elementItems, elementItemIndex, -1);
@@ -254,14 +227,6 @@ function handleKeyPress(event, elementItems, elementItemIndex, menuElementDiv, t
     }
     case "ArrowDown":
     case "ArrowRight": {
-      if (event.key === "ArrowRight" && hasSubmenu(currentEl) && openSubmenu) {
-        event.preventDefault();
-        const submenuId = getSubmenuId(currentEl);
-        if (submenuId) {
-          openSubmenu(submenuId);
-          return;
-        }
-      }
       if (!isTextInput(currentEl) && !isTextArea(currentEl)) {
         event.preventDefault();
         moveFocus(elementItems, elementItemIndex, 1);
@@ -277,15 +242,6 @@ function handleKeyPress(event, elementItems, elementItemIndex, menuElementDiv, t
     }
     case "Escape": {
       event.preventDefault();
-      if (menuElementDiv && triggerButton) {
-        if (getComputedStyle(menuElementDiv).display === "block") {
-          handleMenuClose(menuElementDiv, triggerButton);
-          if (onOpenChange) {
-            onOpenChange(false);
-          }
-        }
-        triggerButton.focus();
-      }
       break;
     }
     case "Enter":
@@ -300,12 +256,6 @@ function handleKeyPress(event, elementItems, elementItemIndex, menuElementDiv, t
       break;
     }
     case "Tab": {
-      if (menuElementDiv && triggerButton && (!event.shiftKey || event.shiftKey)) {
-        handleMenuClose(menuElementDiv, triggerButton);
-        if (onOpenChange) {
-          onOpenChange(false);
-        }
-      }
       break;
     }
     default:
@@ -543,15 +493,88 @@ function makeMenuAccessible({ menuId, menuItemsClass, triggerId, callback }) {
     const items = getItems();
     items.forEach((item) => {
       item.setAttribute("role", "menuitem");
+      if (item.hasAttribute("data-submenu-id")) {
+        item.setAttribute("aria-haspopup", "menu");
+        item.setAttribute("aria-controls", item.getAttribute("data-submenu-id"));
+      }
     });
   }
+  function moveFocus2(elementItems, currentIndex, direction) {
+    const len = elementItems.length;
+    const nextIndex = (currentIndex + direction + len) % len;
+    elementItems.item(nextIndex).focus();
+  }
+  function hasSubmenu(menuItem) {
+    return menuItem.hasAttribute("aria-controls") && menuItem.hasAttribute("aria-haspopup") && menuItem.getAttribute("role") === "menuitem";
+  }
   intializeMenuItems();
+  function handleItemsKeydown(event, menuItem, menuItemIndex) {
+    switch (event.key) {
+      case "ArrowUp":
+      case "ArrowLeft": {
+        if (event.key === "ArrowLeft" && triggerButton.getAttribute("role") === "menuitem") {
+          event.preventDefault();
+          closeMenu();
+          return;
+        }
+        event.preventDefault();
+        moveFocus2(toNodeListLike(getFilteredItems()), menuItemIndex, -1);
+        break;
+      }
+      case "ArrowDown":
+      case "ArrowRight": {
+        if (event.key === "ArrowRight" && hasSubmenu(menuItem)) {
+          event.preventDefault();
+          const submenuId = menuItem.getAttribute("aria-controls");
+          if (submenuId) {
+            openSubmenu(submenuId);
+            return;
+          }
+        }
+        event.preventDefault();
+        moveFocus2(toNodeListLike(getFilteredItems()), menuItemIndex, 1);
+        break;
+      }
+      case "Escape": {
+        event.preventDefault();
+        closeMenu();
+        triggerButton.focus();
+        if (onOpenChange) {
+          onOpenChange(false);
+        }
+        break;
+      }
+      case "Enter":
+      case " ": {
+        event.preventDefault();
+        menuItem.click();
+        break;
+      }
+      case "Tab": {
+        if (!event.shiftKey || event.shiftKey) {
+          closeMenu();
+          if (onOpenChange) {
+            onOpenChange(false);
+          }
+        }
+        break;
+      }
+      default:
+        break;
+    }
+  }
   function isItemInNestedSubmenu(item) {
     let parent = item.parentElement;
     while (parent && parent !== menuDiv) {
       if (parent.getAttribute("role") === "menu") {
         return true;
       }
+      if (parent.id) {
+        const parentMenuTrigger = menuDiv.querySelector(`[aria-controls="${parent.id}"]`);
+        if (parentMenuTrigger) {
+          return true;
+        }
+      }
       parent = parent.parentElement;
     }
     return false;
@@ -587,9 +610,6 @@ function makeMenuAccessible({ menuId, menuItemsClass, triggerId, callback }) {
     }
     submenuInstance.openMenu();
   }
-  function closeSubmenu() {
-    closeMenu();
-  }
   function onOpenChange(isOpen) {
     if (callback?.onOpenChange) {
       try {
@@ -601,19 +621,9 @@ function makeMenuAccessible({ menuId, menuItemsClass, triggerId, callback }) {
   }
   function addListeners() {
     const items = getFilteredItems();
-    const nodeListLike = toNodeListLike(items);
     items.forEach((menuItem, index) => {
       if (!handlerMap.has(menuItem)) {
-        const handler = (event) => handleKeyPress(
-          event,
-          nodeListLike,
-          index,
-          menuDiv,
-          triggerButton,
-          openSubmenu,
-          closeSubmenu,
-          onOpenChange
-        );
+        const handler = (event) => handleItemsKeydown(event, menuItem, index);
         menuItem.addEventListener("keydown", handler);
         handlerMap.set(menuItem, handler);
       }

package/dist/src/{Types.d-yGC2bBaB.d.cts → Types.d-DYfYR3Vc.d.cts}

@@ -88,4 +88,4 @@ interface MenuCallback {
     onOpenChange?: (isOpen: boolean) => void;
 }
 
-export type { AccessibilityInstance as A, ComboboxConfig as C, MenuConfig as M, TabsConfig as T, AccordionConfig as a };
+export type { AccordionConfig as A, ComboboxConfig as C, MenuConfig as M, TabsConfig as T, AccessibilityInstance as a };

package/dist/src/{Types.d-yGC2bBaB.d.ts → Types.d-DYfYR3Vc.d.ts}

@@ -88,4 +88,4 @@ interface MenuCallback {
     onOpenChange?: (isOpen: boolean) => void;
 }
 
-export type { AccessibilityInstance as A, ComboboxConfig as C, MenuConfig as M, TabsConfig as T, AccordionConfig as a };
+export type { AccordionConfig as A, ComboboxConfig as C, MenuConfig as M, TabsConfig as T, AccessibilityInstance as a };

package/dist/src/accordion/index.d.cts

@@ -1,4 +1,4 @@
-import { a as AccordionConfig, A as AccessibilityInstance } from '../Types.d-yGC2bBaB.cjs';
+import { A as AccordionConfig, a as AccessibilityInstance } from '../Types.d-DYfYR3Vc.cjs';
 
 /**
  * Makes an accordion accessible by managing ARIA attributes, keyboard interaction, and state.

package/dist/src/accordion/index.d.ts

@@ -1,4 +1,4 @@
-import { a as AccordionConfig, A as AccessibilityInstance } from '../Types.d-yGC2bBaB.js';
+import { A as AccordionConfig, a as AccessibilityInstance } from '../Types.d-DYfYR3Vc.js';
 
 /**
  * Makes an accordion accessible by managing ARIA attributes, keyboard interaction, and state.

package/dist/src/block/index.cjs

@@ -23,15 +23,11 @@ function moveFocus(elementItems, currentIndex, direction) {
 function isClickableButNotSemantic(el) {
   return el.getAttribute("data-custom-click") !== null && el.getAttribute("data-custom-click") !== void 0;
 }
-function hasSubmenu(menuItem) {
-  return menuItem.getAttribute("aria-haspopup") === "true" || menuItem.getAttribute("aria-haspopup") === "menu";
-}
-function handleKeyPress(event, elementItems, elementItemIndex, menuElementDiv, triggerButton, openSubmenu, closeSubmenu, onOpenChange) {
+function handleKeyPress(event, elementItems, elementItemIndex) {
   const currentEl = elementItems.item(elementItemIndex);
   switch (event.key) {
     case "ArrowUp":
     case "ArrowLeft": {
-      if (event.key === "ArrowLeft" && menuElementDiv) ;
       if (!isTextInput(currentEl) && !isTextArea(currentEl)) {
         event.preventDefault();
         moveFocus(elementItems, elementItemIndex, -1);
@@ -46,7 +42,6 @@ function handleKeyPress(event, elementItems, elementItemIndex, menuElementDiv, t
     }
     case "ArrowDown":
     case "ArrowRight": {
-      if (event.key === "ArrowRight" && hasSubmenu(currentEl) && openSubmenu) ;
       if (!isTextInput(currentEl) && !isTextArea(currentEl)) {
         event.preventDefault();
         moveFocus(elementItems, elementItemIndex, 1);

package/dist/src/block/index.d.cts

@@ -1,4 +1,4 @@
-import { A as AccessibilityInstance } from '../Types.d-yGC2bBaB.cjs';
+import { a as AccessibilityInstance } from '../Types.d-DYfYR3Vc.cjs';
 
 /**
  * Adds keyboard interaction to block. The block traps focus and can be interacted with using the keyboard.

package/dist/src/block/index.d.ts

@@ -1,4 +1,4 @@
-import { A as AccessibilityInstance } from '../Types.d-yGC2bBaB.js';
+import { a as AccessibilityInstance } from '../Types.d-DYfYR3Vc.js';
 
 /**
  * Adds keyboard interaction to block. The block traps focus and can be interacted with using the keyboard.

package/dist/src/block/index.js

@@ -1,4 +1,75 @@
-import { handleKeyPress } from '../chunk-ZJXZZDUR.js';
+// src/utils/handleKeyPress/handleKeyPress.ts
+function isTextInput(el) {
+  if (el.tagName !== "INPUT") return false;
+  const type = el.type;
+  return ["text", "email", "password", "tel", "number"].includes(type);
+}
+function isTextArea(el) {
+  return el.tagName === "TEXTAREA";
+}
+function isNativeButton(el) {
+  return el.tagName === "BUTTON" || el.tagName === "INPUT" && ["button", "submit", "reset"].includes(el.type);
+}
+function isLink(el) {
+  return el.tagName === "A";
+}
+function moveFocus(elementItems, currentIndex, direction) {
+  const len = elementItems.length;
+  const nextIndex = (currentIndex + direction + len) % len;
+  elementItems.item(nextIndex).focus();
+}
+function isClickableButNotSemantic(el) {
+  return el.getAttribute("data-custom-click") !== null && el.getAttribute("data-custom-click") !== void 0;
+}
+function handleKeyPress(event, elementItems, elementItemIndex) {
+  const currentEl = elementItems.item(elementItemIndex);
+  switch (event.key) {
+    case "ArrowUp":
+    case "ArrowLeft": {
+      if (!isTextInput(currentEl) && !isTextArea(currentEl)) {
+        event.preventDefault();
+        moveFocus(elementItems, elementItemIndex, -1);
+      } else if (isTextInput(currentEl) || isTextArea(currentEl)) {
+        const cursorStart = currentEl.selectionStart;
+        if (cursorStart === 0) {
+          event.preventDefault();
+          moveFocus(elementItems, elementItemIndex, -1);
+        }
+      }
+      break;
+    }
+    case "ArrowDown":
+    case "ArrowRight": {
+      if (!isTextInput(currentEl) && !isTextArea(currentEl)) {
+        event.preventDefault();
+        moveFocus(elementItems, elementItemIndex, 1);
+      } else if (isTextInput(currentEl) || isTextArea(currentEl)) {
+        const value = currentEl.value;
+        const cursorEnd = currentEl.selectionStart;
+        if (cursorEnd === value.length) {
+          event.preventDefault();
+          moveFocus(elementItems, elementItemIndex, 1);
+        }
+      }
+      break;
+    }
+    case "Escape": {
+      event.preventDefault();
+      break;
+    }
+    case "Enter":
+    case " ": {
+      if (!isNativeButton(currentEl) && !isLink(currentEl) && isClickableButNotSemantic(currentEl)) {
+        event.preventDefault();
+        currentEl.click();
+      } else if (isNativeButton(currentEl)) {
+        event.preventDefault();
+        currentEl.click();
+      }
+      break;
+    }
+  }
+}
 
 // src/block/src/makeBlockAccessible/makeBlockAccessible.ts
 function makeBlockAccessible({ blockId, blockItemsClass }) {

package/dist/src/checkbox/index.d.cts

@@ -1,4 +1,4 @@
-import { A as AccessibilityInstance } from '../Types.d-yGC2bBaB.cjs';
+import { a as AccessibilityInstance } from '../Types.d-DYfYR3Vc.cjs';
 
 /**
  * Makes a checkbox group accessible by managing ARIA attributes and keyboard interaction.

package/dist/src/checkbox/index.d.ts

@@ -1,4 +1,4 @@
-import { A as AccessibilityInstance } from '../Types.d-yGC2bBaB.js';
+import { a as AccessibilityInstance } from '../Types.d-DYfYR3Vc.js';
 
 /**
  * Makes a checkbox group accessible by managing ARIA attributes and keyboard interaction.

package/dist/src/combobox/index.d.cts

@@ -1,4 +1,4 @@
-import { C as ComboboxConfig, A as AccessibilityInstance } from '../Types.d-yGC2bBaB.cjs';
+import { C as ComboboxConfig, a as AccessibilityInstance } from '../Types.d-DYfYR3Vc.cjs';
 
 /**
  * Makes a Combobox accessible by adding appropriate ARIA attributes, keyboard interactions and focus management.

package/dist/src/combobox/index.d.ts

@@ -1,4 +1,4 @@
-import { C as ComboboxConfig, A as AccessibilityInstance } from '../Types.d-yGC2bBaB.js';
+import { C as ComboboxConfig, a as AccessibilityInstance } from '../Types.d-DYfYR3Vc.js';
 
 /**
  * Makes a Combobox accessible by adding appropriate ARIA attributes, keyboard interactions and focus management.

package/dist/src/menu/index.cjs

@@ -1,131 +1,5 @@
 'use strict';
 
-// src/utils/handleKeyPress/handleKeyPress.ts
-function isTextInput(el) {
-  if (el.tagName !== "INPUT") return false;
-  const type = el.type;
-  return ["text", "email", "password", "tel", "number"].includes(type);
-}
-function isTextArea(el) {
-  return el.tagName === "TEXTAREA";
-}
-function isNativeButton(el) {
-  return el.tagName === "BUTTON" || el.tagName === "INPUT" && ["button", "submit", "reset"].includes(el.type);
-}
-function isLink(el) {
-  return el.tagName === "A";
-}
-function moveFocus(elementItems, currentIndex, direction) {
-  const len = elementItems.length;
-  const nextIndex = (currentIndex + direction + len) % len;
-  elementItems.item(nextIndex).focus();
-}
-function isClickableButNotSemantic(el) {
-  return el.getAttribute("data-custom-click") !== null && el.getAttribute("data-custom-click") !== void 0;
-}
-function handleMenuClose(menuElement, menuTriggerButton) {
-  menuElement.style.display = "none";
-  const menuTriggerButtonId = menuTriggerButton.getAttribute("id");
-  if (!menuTriggerButtonId) {
-    console.error("[aria-ease] Menu trigger button must have an id attribute to properly set aria attributes.");
-    return;
-  }
-  menuTriggerButton.setAttribute("aria-expanded", "false");
-}
-function hasSubmenu(menuItem) {
-  return menuItem.getAttribute("aria-haspopup") === "true" || menuItem.getAttribute("aria-haspopup") === "menu";
-}
-function getSubmenuId(menuItem) {
-  return menuItem.getAttribute("aria-controls");
-}
-function handleKeyPress(event, elementItems, elementItemIndex, menuElementDiv, triggerButton, openSubmenu, closeSubmenu, onOpenChange) {
-  const currentEl = elementItems.item(elementItemIndex);
-  switch (event.key) {
-    case "ArrowUp":
-    case "ArrowLeft": {
-      if (event.key === "ArrowLeft" && menuElementDiv && closeSubmenu) {
-        const labelledBy = menuElementDiv.getAttribute("aria-labelledby");
-        if (labelledBy) {
-          const parentTrigger = document.getElementById(labelledBy);
-          if (parentTrigger && parentTrigger.getAttribute("role") === "menuitem") {
-            event.preventDefault();
-            closeSubmenu();
-            parentTrigger.focus();
-            return;
-          }
-        }
-      }
-      if (!isTextInput(currentEl) && !isTextArea(currentEl)) {
-        event.preventDefault();
-        moveFocus(elementItems, elementItemIndex, -1);
-      } else if (isTextInput(currentEl) || isTextArea(currentEl)) {
-        const cursorStart = currentEl.selectionStart;
-        if (cursorStart === 0) {
-          event.preventDefault();
-          moveFocus(elementItems, elementItemIndex, -1);
-        }
-      }
-      break;
-    }
-    case "ArrowDown":
-    case "ArrowRight": {
-      if (event.key === "ArrowRight" && hasSubmenu(currentEl) && openSubmenu) {
-        event.preventDefault();
-        const submenuId = getSubmenuId(currentEl);
-        if (submenuId) {
-          openSubmenu(submenuId);
-          return;
-        }
-      }
-      if (!isTextInput(currentEl) && !isTextArea(currentEl)) {
-        event.preventDefault();
-        moveFocus(elementItems, elementItemIndex, 1);
-      } else if (isTextInput(currentEl) || isTextArea(currentEl)) {
-        const value = currentEl.value;
-        const cursorEnd = currentEl.selectionStart;
-        if (cursorEnd === value.length) {
-          event.preventDefault();
-          moveFocus(elementItems, elementItemIndex, 1);
-        }
-      }
-      break;
-    }
-    case "Escape": {
-      event.preventDefault();
-      if (menuElementDiv && triggerButton) {
-        if (getComputedStyle(menuElementDiv).display === "block") {
-          handleMenuClose(menuElementDiv, triggerButton);
-          if (onOpenChange) {
-            onOpenChange(false);
-          }
-        }
-        triggerButton.focus();
-      }
-      break;
-    }
-    case "Enter":
-    case " ": {
-      if (!isNativeButton(currentEl) && !isLink(currentEl) && isClickableButNotSemantic(currentEl)) {
-        event.preventDefault();
-        currentEl.click();
-      } else if (isNativeButton(currentEl)) {
-        event.preventDefault();
-        currentEl.click();
-      }
-      break;
-    }
-    case "Tab": {
-      if (menuElementDiv && triggerButton && (!event.shiftKey || event.shiftKey)) {
-        handleMenuClose(menuElementDiv, triggerButton);
-        if (onOpenChange) {
-          onOpenChange(false);
-        }
-      }
-      break;
-    }
-  }
-}
-
 // src/menu/src/makeMenuAccessible/makeMenuAccessible.ts
 function makeMenuAccessible({ menuId, menuItemsClass, triggerId, callback }) {
   const menuDiv = document.querySelector(`#${menuId}`);
@@ -202,15 +76,86 @@ function makeMenuAccessible({ menuId, menuItemsClass, triggerId, callback }) {
     const items = getItems();
     items.forEach((item) => {
       item.setAttribute("role", "menuitem");
+      if (item.hasAttribute("data-submenu-id")) {
+        item.setAttribute("aria-haspopup", "menu");
+        item.setAttribute("aria-controls", item.getAttribute("data-submenu-id"));
+      }
     });
   }
+  function moveFocus(elementItems, currentIndex, direction) {
+    const len = elementItems.length;
+    const nextIndex = (currentIndex + direction + len) % len;
+    elementItems.item(nextIndex).focus();
+  }
+  function hasSubmenu(menuItem) {
+    return menuItem.hasAttribute("aria-controls") && menuItem.hasAttribute("aria-haspopup") && menuItem.getAttribute("role") === "menuitem";
+  }
   intializeMenuItems();
+  function handleItemsKeydown(event, menuItem, menuItemIndex) {
+    switch (event.key) {
+      case "ArrowUp":
+      case "ArrowLeft": {
+        if (event.key === "ArrowLeft" && triggerButton.getAttribute("role") === "menuitem") {
+          event.preventDefault();
+          closeMenu();
+          return;
+        }
+        event.preventDefault();
+        moveFocus(toNodeListLike(getFilteredItems()), menuItemIndex, -1);
+        break;
+      }
+      case "ArrowDown":
+      case "ArrowRight": {
+        if (event.key === "ArrowRight" && hasSubmenu(menuItem)) {
+          event.preventDefault();
+          const submenuId = menuItem.getAttribute("aria-controls");
+          if (submenuId) {
+            openSubmenu(submenuId);
+            return;
+          }
+        }
+        event.preventDefault();
+        moveFocus(toNodeListLike(getFilteredItems()), menuItemIndex, 1);
+        break;
+      }
+      case "Escape": {
+        event.preventDefault();
+        closeMenu();
+        triggerButton.focus();
+        if (onOpenChange) {
+          onOpenChange(false);
+        }
+        break;
+      }
+      case "Enter":
+      case " ": {
+        event.preventDefault();
+        menuItem.click();
+        break;
+      }
+      case "Tab": {
+        if (!event.shiftKey || event.shiftKey) {
+          closeMenu();
+          if (onOpenChange) {
+            onOpenChange(false);
+          }
+        }
+        break;
+      }
+    }
+  }
   function isItemInNestedSubmenu(item) {
     let parent = item.parentElement;
     while (parent && parent !== menuDiv) {
       if (parent.getAttribute("role") === "menu") {
         return true;
       }
+      if (parent.id) {
+        const parentMenuTrigger = menuDiv.querySelector(`[aria-controls="${parent.id}"]`);
+        if (parentMenuTrigger) {
+          return true;
+        }
+      }
       parent = parent.parentElement;
     }
     return false;
@@ -246,9 +191,6 @@ function makeMenuAccessible({ menuId, menuItemsClass, triggerId, callback }) {
     }
     submenuInstance.openMenu();
   }
-  function closeSubmenu() {
-    closeMenu();
-  }
   function onOpenChange(isOpen) {
     if (callback?.onOpenChange) {
       try {
@@ -260,19 +202,9 @@ function makeMenuAccessible({ menuId, menuItemsClass, triggerId, callback }) {
   }
   function addListeners() {
     const items = getFilteredItems();
-    const nodeListLike = toNodeListLike(items);
     items.forEach((menuItem, index) => {
       if (!handlerMap.has(menuItem)) {
-        const handler = (event) => handleKeyPress(
-          event,
-          nodeListLike,
-          index,
-          menuDiv,
-          triggerButton,
-          openSubmenu,
-          closeSubmenu,
-          onOpenChange
-        );
+        const handler = (event) => handleItemsKeydown(event, menuItem, index);
         menuItem.addEventListener("keydown", handler);
         handlerMap.set(menuItem, handler);
       }

package/dist/src/menu/index.d.cts

@@ -1,4 +1,4 @@
-import { M as MenuConfig, A as AccessibilityInstance } from '../Types.d-yGC2bBaB.cjs';
+import { M as MenuConfig, a as AccessibilityInstance } from '../Types.d-DYfYR3Vc.cjs';
 
 /**
   * Adds keyboard interaction to toggle menu. The menu traps focus and can be interacted with using the keyboard. The first interactive item of the menu has focus when menu open.

package/dist/src/menu/index.d.ts

@@ -1,4 +1,4 @@
-import { M as MenuConfig, A as AccessibilityInstance } from '../Types.d-yGC2bBaB.js';
+import { M as MenuConfig, a as AccessibilityInstance } from '../Types.d-DYfYR3Vc.js';
 
 /**
   * Adds keyboard interaction to toggle menu. The menu traps focus and can be interacted with using the keyboard. The first interactive item of the menu has focus when menu open.

package/dist/src/menu/index.js

@@ -1,5 +1,3 @@
-import { handleKeyPress } from '../chunk-ZJXZZDUR.js';
-
 // src/menu/src/makeMenuAccessible/makeMenuAccessible.ts
 function makeMenuAccessible({ menuId, menuItemsClass, triggerId, callback }) {
   const menuDiv = document.querySelector(`#${menuId}`);
@@ -76,15 +74,86 @@ function makeMenuAccessible({ menuId, menuItemsClass, triggerId, callback }) {
     const items = getItems();
     items.forEach((item) => {
       item.setAttribute("role", "menuitem");
+      if (item.hasAttribute("data-submenu-id")) {
+        item.setAttribute("aria-haspopup", "menu");
+        item.setAttribute("aria-controls", item.getAttribute("data-submenu-id"));
+      }
     });
   }
+  function moveFocus(elementItems, currentIndex, direction) {
+    const len = elementItems.length;
+    const nextIndex = (currentIndex + direction + len) % len;
+    elementItems.item(nextIndex).focus();
+  }
+  function hasSubmenu(menuItem) {
+    return menuItem.hasAttribute("aria-controls") && menuItem.hasAttribute("aria-haspopup") && menuItem.getAttribute("role") === "menuitem";
+  }
   intializeMenuItems();
+  function handleItemsKeydown(event, menuItem, menuItemIndex) {
+    switch (event.key) {
+      case "ArrowUp":
+      case "ArrowLeft": {
+        if (event.key === "ArrowLeft" && triggerButton.getAttribute("role") === "menuitem") {
+          event.preventDefault();
+          closeMenu();
+          return;
+        }
+        event.preventDefault();
+        moveFocus(toNodeListLike(getFilteredItems()), menuItemIndex, -1);
+        break;
+      }
+      case "ArrowDown":
+      case "ArrowRight": {
+        if (event.key === "ArrowRight" && hasSubmenu(menuItem)) {
+          event.preventDefault();
+          const submenuId = menuItem.getAttribute("aria-controls");
+          if (submenuId) {
+            openSubmenu(submenuId);
+            return;
+          }
+        }
+        event.preventDefault();
+        moveFocus(toNodeListLike(getFilteredItems()), menuItemIndex, 1);
+        break;
+      }
+      case "Escape": {
+        event.preventDefault();
+        closeMenu();
+        triggerButton.focus();
+        if (onOpenChange) {
+          onOpenChange(false);
+        }
+        break;
+      }
+      case "Enter":
+      case " ": {
+        event.preventDefault();
+        menuItem.click();
+        break;
+      }
+      case "Tab": {
+        if (!event.shiftKey || event.shiftKey) {
+          closeMenu();
+          if (onOpenChange) {
+            onOpenChange(false);
+          }
+        }
+        break;
+      }
+    }
+  }
   function isItemInNestedSubmenu(item) {
     let parent = item.parentElement;
     while (parent && parent !== menuDiv) {
       if (parent.getAttribute("role") === "menu") {
         return true;
       }
+      if (parent.id) {
+        const parentMenuTrigger = menuDiv.querySelector(`[aria-controls="${parent.id}"]`);
+        if (parentMenuTrigger) {
+          return true;
+        }
+      }
       parent = parent.parentElement;
     }
     return false;
@@ -120,9 +189,6 @@ function makeMenuAccessible({ menuId, menuItemsClass, triggerId, callback }) {
     }
     submenuInstance.openMenu();
   }
-  function closeSubmenu() {
-    closeMenu();
-  }
   function onOpenChange(isOpen) {
     if (callback?.onOpenChange) {
       try {
@@ -134,19 +200,9 @@ function makeMenuAccessible({ menuId, menuItemsClass, triggerId, callback }) {
   }
   function addListeners() {
     const items = getFilteredItems();
-    const nodeListLike = toNodeListLike(items);
     items.forEach((menuItem, index) => {
       if (!handlerMap.has(menuItem)) {
-        const handler = (event) => handleKeyPress(
-          event,
-          nodeListLike,
-          index,
-          menuDiv,
-          triggerButton,
-          openSubmenu,
-          closeSubmenu,
-          onOpenChange
-        );
+        const handler = (event) => handleItemsKeydown(event, menuItem, index);
         menuItem.addEventListener("keydown", handler);
         handlerMap.set(menuItem, handler);
       }

package/dist/src/radio/index.d.cts

@@ -1,4 +1,4 @@
-import { A as AccessibilityInstance } from '../Types.d-yGC2bBaB.cjs';
+import { a as AccessibilityInstance } from '../Types.d-DYfYR3Vc.cjs';
 
 /**
  * Makes a radio group accessible by managing ARIA attributes, keyboard interaction, and state.

package/dist/src/radio/index.d.ts

@@ -1,4 +1,4 @@
-import { A as AccessibilityInstance } from '../Types.d-yGC2bBaB.js';
+import { a as AccessibilityInstance } from '../Types.d-DYfYR3Vc.js';
 
 /**
  * Makes a radio group accessible by managing ARIA attributes, keyboard interaction, and state.

package/dist/src/tabs/index.d.cts

@@ -1,4 +1,4 @@
-import { T as TabsConfig, A as AccessibilityInstance } from '../Types.d-yGC2bBaB.cjs';
+import { T as TabsConfig, a as AccessibilityInstance } from '../Types.d-DYfYR3Vc.cjs';
 
 /**
  * Makes tabs accessible by managing ARIA attributes, keyboard interaction, and state.

package/dist/src/tabs/index.d.ts

@@ -1,4 +1,4 @@
-import { T as TabsConfig, A as AccessibilityInstance } from '../Types.d-yGC2bBaB.js';
+import { T as TabsConfig, a as AccessibilityInstance } from '../Types.d-DYfYR3Vc.js';
 
 /**
  * Makes tabs accessible by managing ARIA attributes, keyboard interaction, and state.

package/dist/src/toggle/index.d.cts

@@ -1,4 +1,4 @@
-import { A as AccessibilityInstance } from '../Types.d-yGC2bBaB.cjs';
+import { a as AccessibilityInstance } from '../Types.d-DYfYR3Vc.cjs';
 
 /**
  * Makes a toggle button accessible by managing ARIA attributes and keyboard interactions.

package/dist/src/toggle/index.d.ts

@@ -1,4 +1,4 @@
-import { A as AccessibilityInstance } from '../Types.d-yGC2bBaB.js';
+import { a as AccessibilityInstance } from '../Types.d-DYfYR3Vc.js';
 
 /**
  * Makes a toggle button accessible by managing ARIA attributes and keyboard interactions.

package/dist/src/utils/test/aria-contracts/accordion/accordion.contract.json

@@ -3,7 +3,7 @@
         "id": "aria-ease.accordion",
         "version": "1.0.0",
         "created": "09-02-2026",
-        "lastUpdated": "28-02-2026",
+        "lastUpdated": "15-03-2026",
         "description": "ARIA Accordion interaction contract. Validates the ARIA and interaction contract for a custom accordion component following the ARIA Authoring Practices Guide accordion with show/hide pattern.",
         "source": {
             "apg": "https://www.w3.org/WAI/ARIA/apg/patterns/accordion/",

package/dist/src/utils/test/aria-contracts/combobox/combobox.listbox.contract.json

@@ -3,7 +3,7 @@
         "id": "aria-ease.combobox.listbox",
         "version": "1.0.0",
         "created": "11-02-2026",
-        "lastUpdated": "28-02-2026",
+        "lastUpdated": "15-03-2026",
         "description": "ARIA Combobox with Listbox popup interaction contract. Validates the ARIA and interaction contract for a custom combobox with listbox component following the ARIA Authoring Practices Guide combobox with listbox popup pattern.",
         "source": {
             "apg": "https://www.w3.org/WAI/ARIA/apg/patterns/combobox/",

package/dist/src/utils/test/aria-contracts/menu/menu.contract.json

@@ -3,7 +3,7 @@
         "id": "aria-ease.menu",
         "version": "1.0.0",
         "created": "11-02-2026",
-        "lastUpdated": "28-02-2026",
+        "lastUpdated": "15-03-2026",
         "description": "ARIA Menu interaction contract. Validates the ARIA and interaction contract for a custom menu component following the ARIA Authoring Practices Guide menu with popup pattern.",
         "source": {
             "apg": "https://www.w3.org/WAI/ARIA/apg/patterns/menubar/",
@@ -16,7 +16,7 @@
         "trigger": "[data-test-id=menu-trigger]",
         "container": "[role=menu]",
         "items": "[role=menuitem], [role=menuitemradio], [role=menuitemcheckbox]",
-        "submenuTrigger": "[role=menu] [role=menuitem][aria-haspopup=true], [role=menu] [role=menuitemradio][aria-haspopup=true], [role=menu] [role=menuitemcheckbox][aria-haspopup=true], [role=menu] [role=menuitem][aria-haspopup=menu], [role=menu] [role=menuitemradio][aria-haspopup=menu], [role=menu] [role=menuitemcheckbox][aria-haspopup=menu]",
+        "submenuTrigger": "[role=menu] [role=menuitem][aria-haspopup=menu][aria-controls], [role=menu] [role=menuitemradio][aria-haspopup=menu][aria-controls], [role=menu] [role=menuitemcheckbox][aria-haspopup=menu][aria-controls], [data-submenu-id]",
         "submenu": "[role=menu][aria-labelledby]",
         "focusable": "[role=menuitem], [role=menuitemradio], [role=menuitemcheckbox]",
         "relative": "[role=menuitem], [role=menuitemradio], [role=menuitemcheckbox]",

package/dist/src/utils/test/aria-contracts/tabs/tabs.contract.json

@@ -3,7 +3,7 @@
         "id": "aria-ease.tabs",
         "version": "1.0.0",
         "created": "28-02-2026",
-        "lastUpdated": "28-02-2026",
+        "lastUpdated": "15-03-2026",
         "description": "ARIA tabs interaction contract. Validates the ARIA and interaction contract for a custom tabs component following the ARIA Authoring Practices Guide pattern.",
         "source": {
             "apg": "https://www.w3.org/WAI/ARIA/apg/patterns/tabs/",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aria-ease",
-  "version": "6.5.0",
+  "version": "6.5.1",
   "description": "Accessibility infrastructure for the entire frontend engineering lifecycle. Build accessible patterns, run automated audits, verify component interactions, and gate deployments — all in one system.",
   "main": "dist/index.cjs",
   "type": "module",

package/dist/src/chunk-ZJXZZDUR.js

@@ -1,127 +0,0 @@
-// src/utils/handleKeyPress/handleKeyPress.ts
-function isTextInput(el) {
-  if (el.tagName !== "INPUT") return false;
-  const type = el.type;
-  return ["text", "email", "password", "tel", "number"].includes(type);
-}
-function isTextArea(el) {
-  return el.tagName === "TEXTAREA";
-}
-function isNativeButton(el) {
-  return el.tagName === "BUTTON" || el.tagName === "INPUT" && ["button", "submit", "reset"].includes(el.type);
-}
-function isLink(el) {
-  return el.tagName === "A";
-}
-function moveFocus(elementItems, currentIndex, direction) {
-  const len = elementItems.length;
-  const nextIndex = (currentIndex + direction + len) % len;
-  elementItems.item(nextIndex).focus();
-}
-function isClickableButNotSemantic(el) {
-  return el.getAttribute("data-custom-click") !== null && el.getAttribute("data-custom-click") !== void 0;
-}
-function handleMenuClose(menuElement, menuTriggerButton) {
-  menuElement.style.display = "none";
-  const menuTriggerButtonId = menuTriggerButton.getAttribute("id");
-  if (!menuTriggerButtonId) {
-    console.error("[aria-ease] Menu trigger button must have an id attribute to properly set aria attributes.");
-    return;
-  }
-  menuTriggerButton.setAttribute("aria-expanded", "false");
-}
-function hasSubmenu(menuItem) {
-  return menuItem.getAttribute("aria-haspopup") === "true" || menuItem.getAttribute("aria-haspopup") === "menu";
-}
-function getSubmenuId(menuItem) {
-  return menuItem.getAttribute("aria-controls");
-}
-function handleKeyPress(event, elementItems, elementItemIndex, menuElementDiv, triggerButton, openSubmenu, closeSubmenu, onOpenChange) {
-  const currentEl = elementItems.item(elementItemIndex);
-  switch (event.key) {
-    case "ArrowUp":
-    case "ArrowLeft": {
-      if (event.key === "ArrowLeft" && menuElementDiv && closeSubmenu) {
-        const labelledBy = menuElementDiv.getAttribute("aria-labelledby");
-        if (labelledBy) {
-          const parentTrigger = document.getElementById(labelledBy);
-          if (parentTrigger && parentTrigger.getAttribute("role") === "menuitem") {
-            event.preventDefault();
-            closeSubmenu();
-            parentTrigger.focus();
-            return;
-          }
-        }
-      }
-      if (!isTextInput(currentEl) && !isTextArea(currentEl)) {
-        event.preventDefault();
-        moveFocus(elementItems, elementItemIndex, -1);
-      } else if (isTextInput(currentEl) || isTextArea(currentEl)) {
-        const cursorStart = currentEl.selectionStart;
-        if (cursorStart === 0) {
-          event.preventDefault();
-          moveFocus(elementItems, elementItemIndex, -1);
-        }
-      }
-      break;
-    }
-    case "ArrowDown":
-    case "ArrowRight": {
-      if (event.key === "ArrowRight" && hasSubmenu(currentEl) && openSubmenu) {
-        event.preventDefault();
-        const submenuId = getSubmenuId(currentEl);
-        if (submenuId) {
-          openSubmenu(submenuId);
-          return;
-        }
-      }
-      if (!isTextInput(currentEl) && !isTextArea(currentEl)) {
-        event.preventDefault();
-        moveFocus(elementItems, elementItemIndex, 1);
-      } else if (isTextInput(currentEl) || isTextArea(currentEl)) {
-        const value = currentEl.value;
-        const cursorEnd = currentEl.selectionStart;
-        if (cursorEnd === value.length) {
-          event.preventDefault();
-          moveFocus(elementItems, elementItemIndex, 1);
-        }
-      }
-      break;
-    }
-    case "Escape": {
-      event.preventDefault();
-      if (menuElementDiv && triggerButton) {
-        if (getComputedStyle(menuElementDiv).display === "block") {
-          handleMenuClose(menuElementDiv, triggerButton);
-          if (onOpenChange) {
-            onOpenChange(false);
-          }
-        }
-        triggerButton.focus();
-      }
-      break;
-    }
-    case "Enter":
-    case " ": {
-      if (!isNativeButton(currentEl) && !isLink(currentEl) && isClickableButNotSemantic(currentEl)) {
-        event.preventDefault();
-        currentEl.click();
-      } else if (isNativeButton(currentEl)) {
-        event.preventDefault();
-        currentEl.click();
-      }
-      break;
-    }
-    case "Tab": {
-      if (menuElementDiv && triggerButton && (!event.shiftKey || event.shiftKey)) {
-        handleMenuClose(menuElementDiv, triggerButton);
-        if (onOpenChange) {
-          onOpenChange(false);
-        }
-      }
-      break;
-    }
-  }
-}
-
-export { handleKeyPress };