Skip to content

fix: the repeated calling of multi-level Trigger triggerOpen method #564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

fix: the repeated calling of multi-level Trigger triggerOpen method #564

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8a47d0d
fix: fix popup mouse leave event handler type and logic
QdabuliuQ Aug 7, 2025
2b7290c
fix: Fixed onPopupMouseLeave triggering error
QdabuliuQ Aug 8, 2025
5884b91
fix: Fixed onPopupMouseLeave triggering error
QdabuliuQ Aug 8, 2025
6f0f2b9
fix: refactor popup mouse event handling logic
QdabuliuQ Aug 14, 2025
d3468e3
fix: update type of onPopupMouseLeave handler
QdabuliuQ Aug 14, 2025
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
12 changes: 8 additions & 4 deletions src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ export function generateTrigger(
const hoverToHide = hideActions.has('hover');

let onPopupMouseEnter: React.MouseEventHandler<HTMLDivElement>;
let onPopupMouseLeave: VoidFunction;
let onPopupMouseLeave: React.MouseEventHandler<HTMLDivElement>;

const ignoreMouseTrigger = () => {
return touchedRef.current;
Expand Down Expand Up @@ -596,7 +596,8 @@ export function generateTrigger(
);

onPopupMouseEnter = (event) => {
// Only trigger re-open when popup is visible
// Only trigger re-open when popup is visible or in motion
// and ensure the mouse is entering the popup area
if (
(mergedOpen || inMotion) &&
popupEle?.contains(event.target as HTMLElement)
Expand Down Expand Up @@ -629,8 +630,11 @@ export function generateTrigger(
ignoreMouseTrigger,
);

onPopupMouseLeave = () => {
triggerOpen(false, mouseLeaveDelay);
onPopupMouseLeave = (event: React.MouseEvent) => {
// fix issue: https://github.com/ant-design/ant-design/issues/54496
if (popupEle?.contains(event.target as HTMLElement)) {
triggerOpen(false, mouseLeaveDelay);
}
};
}

Expand Down
Loading