diff --git a/packages/core/src/data-grid/data-grid.tsx b/packages/core/src/data-grid/data-grid.tsx index 11238a23e..b38c00c3a 100644 --- a/packages/core/src/data-grid/data-grid.tsx +++ b/packages/core/src/data-grid/data-grid.tsx @@ -1065,11 +1065,17 @@ const DataGrid: React.ForwardRefRenderFunction = (p, const eventTarget = eventTargetRef?.current; const scrollerContainsTarget = eventTarget?.contains(ev.target as Node) ?? false - if (canvas === null || (ev.target !== canvas && ev.target !== eventTarget && !scrollerContainsTarget)) { + if (canvas === null) { return; } const args = getMouseArgsForPosition(canvas, ev.clientX, ev.clientY, ev); + + // when the cursor is in the grid area, but it's on a overlay element like a popup which is not part of the grid + if ((args.kind !== outOfBoundsKind && ev.target !== canvas && ev.target !== eventTarget && !scrollerContainsTarget)) { + return; + } + if (!isSameItem(args, hoveredRef.current)) { onItemHovered?.(args); setHoveredItemInfo(