diff --git a/src/components/Hoverable/ActiveHoverable.tsx b/src/components/Hoverable/ActiveHoverable.tsx index 9bc0e846aaf1..eda42a703d65 100644 --- a/src/components/Hoverable/ActiveHoverable.tsx +++ b/src/components/Hoverable/ActiveHoverable.tsx @@ -81,7 +81,7 @@ function ActiveHoverable({onHoverIn, onHoverOut, shouldHandleScroll, shouldFreez setIsHovered(false); }; - document.addEventListener('mouseover', unsetHoveredIfOutside); + document.addEventListener('mouseover', unsetHoveredIfOutside, true); return () => document.removeEventListener('mouseover', unsetHoveredIfOutside); }, [isHovered, elementRef, shouldFreezeCapture]); @@ -126,13 +126,13 @@ function ActiveHoverable({onHoverIn, onHoverOut, shouldHandleScroll, shouldFreez (event: MouseEvent) => { // Check if the blur event occurred due to clicking outside the element // and the wrapperView contains the element that caused the blur and reset isHovered - if (!elementRef.current?.contains(event.target as Node) && !elementRef.current?.contains(event.relatedTarget as Node)) { + if (!elementRef.current?.contains(event.target as Node) && !elementRef.current?.contains(event.relatedTarget as Node) && !shouldFreezeCapture) { setIsHovered(false); } onBlur?.(event); }, - [onBlur], + [onBlur, shouldFreezeCapture], ); const handleAndForwardOnMouseMove = useCallback( diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx index 0af9bd61120d..a0e2f65a89a0 100644 --- a/src/pages/home/report/ReportActionItem.tsx +++ b/src/pages/home/report/ReportActionItem.tsx @@ -961,6 +961,7 @@ function ReportActionItem({ {(hovered) => (