From 0ab26b052850f4b16c7959d1c6a32088f987f936 Mon Sep 17 00:00:00 2001
From: Eduard Fischer-Szava <50618110+EduardF1@users.noreply.github.com>
Date: Sun, 7 Jun 2026 02:54:15 +0200
Subject: [PATCH] fix(combobox): restore useInteractOutside to handle
 ModalOverlay clicking properly

Fixes #10074
---
 packages/react-aria/src/combobox/useComboBox.ts | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/react-aria/src/combobox/useComboBox.ts b/packages/react-aria/src/combobox/useComboBox.ts
index 4b99b2c6b9a..1c17451a415 100644
--- a/packages/react-aria/src/combobox/useComboBox.ts
+++ b/packages/react-aria/src/combobox/useComboBox.ts
@@ -53,6 +53,7 @@ import {privateValidationStateProp} from 'react-stately/private/form/useFormVali
 import {useEvent} from '../utils/useEvent';
 import {useFormReset} from '../utils/useFormReset';
 import {useId} from '../utils/useId';
+import {useInteractOutside} from '../interactions/useInteractOutside';
 import {useLabels} from '../utils/useLabels';
 import {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';
 import {useMenuTrigger} from '../menu/useMenuTrigger';
@@ -457,6 +458,20 @@ export function useComboBox<T, M extends SelectionMode = 'single'>(
       : undefined
   );
 
+  // usePopover -> useOverlay calls useInteractOutside, but ComboBox is non-modal, so `isDismissable` is false
+  // Because of this, onInteractOutside is not passed to useInteractOutside, so we need to call it here.
+  useInteractOutside({
+    ref: popoverRef,
+    onInteractOutside: (e) => {
+      let target = getEventTarget(e) as Element;
+      if (nodeContains(buttonRef?.current, target) || nodeContains(inputRef.current, target)) {
+        return;
+      }
+      state.close();
+    },
+    isDisabled: !state.isOpen
+  });
+
   return {
     labelProps,
     buttonProps: {