From b6fda4fe6fdbdeaff0876eeb602014e666c81ec6 Mon Sep 17 00:00:00 2001
From: Anshuman Singh Rathore <anshumandev2002@gmail.com>
Date: Sat, 30 Aug 2025 19:22:32 +0530
Subject: [PATCH] fix(use-aria-overlay): prevent modal/drawer from closing on
 press instead (#5624)

* fix(modal/drawer): prevent modal/drawer from closing on press instead

* refactor(useAriaOverlay): improve getOverlayTypeFromRef with ARIA checks and hoist

* refactor(useAriaOverlay): add alertdialog & fallback to modal when aria-modal is missing

* Merge branch 'canary' into pr/5624

* chore(changeset): add issue number

* refactor(use-aria-overlay): getOverlayInteractionType

---------

Co-authored-by: WK Wong <wingkwong.code@gmail.com>
---
 .changeset/strong-spies-tell.md              |  5 +++
 packages/hooks/use-aria-overlay/src/index.ts | 36 +++++++++++++++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/strong-spies-tell.md

diff --git a/.changeset/strong-spies-tell.md b/.changeset/strong-spies-tell.md
new file mode 100644
index 000000000..a08cce458
--- /dev/null
+++ b/.changeset/strong-spies-tell.md
@@ -0,0 +1,5 @@
+---
+"@heroui/use-aria-overlay": patch
+---
+
+prevent modal/drawer from closing on press instead (#5616)
diff --git a/packages/hooks/use-aria-overlay/src/index.ts b/packages/hooks/use-aria-overlay/src/index.ts
index 09c53333f..1ee1f1e80 100644
--- a/packages/hooks/use-aria-overlay/src/index.ts
+++ b/packages/hooks/use-aria-overlay/src/index.ts
@@ -65,7 +65,9 @@ export function useAriaOverlay(props: UseAriaOverlayProps, ref: RefObject<Elemen
           e.preventDefault();
         }
       }
-      onHide();
+      if (getOverlayInteractionType(ref) !== "pressEnd") {
+        onHide();
+      }
     }
   };
 
@@ -130,6 +132,38 @@ export function useAriaOverlay(props: UseAriaOverlayProps, ref: RefObject<Elemen
     }
   };
 
+  /**
+   * Determines the interaction type for overlay dismissal based on the element's ARIA role.
+   * @param ref - Reference to the overlay element
+   * @returns "pressEnd" for dialogs (close on release), "pressStart" for menus (close on press), or "unknown"
+   */
+  function getOverlayInteractionType(
+    ref: RefObject<Element>,
+  ): "pressEnd" | "pressStart" | "unknown" {
+    const el = ref.current;
+
+    if (!el) return "unknown";
+
+    const role = (el.getAttribute("role") || "").toLowerCase();
+    const ariaModalAttr = el.getAttribute("aria-modal");
+
+    // Dialogs (Modal/Drawer) should close on press release.
+    // Include alertdialog and treat missing aria-modal (unless explicitly "false") as modal.
+    if (
+      (role === "dialog" || role === "alertdialog") &&
+      (ariaModalAttr === null || ariaModalAttr.toLowerCase() === "true")
+    ) {
+      return "pressEnd";
+    }
+
+    // Select-like/menu-like overlays typically close on press start.
+    if (["listbox", "menu", "tree", "grid", "combobox"].includes(role)) {
+      return "pressStart";
+    }
+
+    return "unknown";
+  }
+
   return {
     overlayProps: {
       onKeyDown,