Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions packages/core/src/components/overlay2/overlay2.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,23 @@ export const Overlay2 = forwardRef<OverlayInstance, Overlay2Props>((props, forwa
[getThisOverlayAndDescendants, id, onClose],
);

// N.B. this listener allows Escape key to close overlays that don't have focus (e.g., hover-triggered tooltips)
// It's only attached when `autoFocus={false}` (indicating a hover interaction) and `canEscapeKeyClose={true}`
const handleDocumentKeyDown = useCallback(
(e: KeyboardEvent) => {
if (e.key === "Escape" && canEscapeKeyClose) {
// Only close if this is the topmost overlay to avoid closing multiple overlays at once
const lastOpened = getLastOpened();
if (lastOpened?.id === id) {
onClose?.(e as any);
e.stopPropagation();
e.preventDefault();
}
}
},
[canEscapeKeyClose, getLastOpened, id, onClose],
);

// send this instance's imperative handle to the the forwarded ref as well as our local ref
const ref = useMemo(() => mergeRefs(forwardedRef, instance), [forwardedRef]);
useImperativeHandle(
Expand Down Expand Up @@ -345,6 +362,21 @@ export const Overlay2 = forwardRef<OverlayInstance, Overlay2Props>((props, forwa
document.removeEventListener("mousedown", handleDocumentMousedown);
};
}, [handleDocumentMousedown, isOpen, canOutsideClickClose, hasBackdrop]);

useEffect(() => {
// Attach document-level keydown listener for overlays that don't receive focus (like hover tooltips)
// This enables Escape key dismissal without stealing focus on hover
if (!isOpen || autoFocus !== false || !canEscapeKeyClose) {
return;
}

document.addEventListener("keydown", handleDocumentKeyDown);

return () => {
document.removeEventListener("keydown", handleDocumentKeyDown);
};
}, [handleDocumentKeyDown, isOpen, autoFocus, canEscapeKeyClose]);

useEffect(() => {
if (!isOpen || !enforceFocus) {
return;
Expand Down
1 change: 0 additions & 1 deletion packages/core/src/components/tooltip/tooltip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@ export class Tooltip<
}}
{...restProps}
autoFocus={false}
canEscapeKeyClose={false}
disabled={ctxState.forceDisabled ?? disabled}
enforceFocus={false}
lazy={true}
Expand Down
Loading