Skip to content

fix(Popup): nested content can not closed #4023

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

Merged
uyarn merged 1 commit into from
Dec 21, 2025
Merged

fix(Popup): nested content can not closed #4023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions packages/components/popup/Popup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ const Popup = forwardRef<PopupInstanceFunctions, PopupProps>((originalProps, ref
[placement],
);

const { triggerElementIsString, handleMouseLeave, getTriggerElement, getTriggerNode } = useTrigger({
const { triggerElementIsString, getTriggerElement, getTriggerNode, getPopupProps } = useTrigger({
triggerElement,
content,
disabled,
Expand Down Expand Up @@ -232,7 +232,7 @@ const Popup = forwardRef<PopupInstanceFunctions, PopupProps>((originalProps, ref
className={classNames(`${classPrefix}-popup`, overlayClassName)}
{...attributes.popper}
onClick={(e) => props.onOverlayClick?.({ e })}
onMouseLeave={handleMouseLeave}
{...getPopupProps()}
>
<div
ref={contentRef}
Expand Down
30 changes: 24 additions & 6 deletions packages/components/popup/hooks/useTrigger.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export default function useTrigger({ triggerElement, content, disabled, trigger,
const triggerElementIsString = typeof triggerElement === 'string';

const triggerRef = useRef<HTMLElement>(null);
const hasPopupMouseDown = useRef(false);
const visibleTimer = useRef(null);

// 禁用和无内容时不展示
Expand Down Expand Up @@ -56,6 +57,13 @@ export default function useTrigger({ triggerElement, content, disabled, trigger,
}
};

const handlePopupMouseDown = () => {
hasPopupMouseDown.current = true;
requestAnimationFrame(() => {
hasPopupMouseDown.current = false;
});
};

useEffect(() => clearTimeout(visibleTimer.current), []);

useEffect(() => {
Expand Down Expand Up @@ -164,16 +172,18 @@ export default function useTrigger({ triggerElement, content, disabled, trigger,
if (!shouldToggle) return;

const handleDocumentClick = (e: any) => {
const element = getTriggerElement();
if (element?.contains?.(e.target) || e.target?.closest?.(`.${classPrefix}-popup`)) return;
visible && onVisibleChange(false, { e, trigger: 'document' });
if (!visible || getTriggerElement()?.contains?.(e.target) || hasPopupMouseDown.current) return;
onVisibleChange(false, { e, trigger: 'document' });
};

on(document, 'mousedown', handleDocumentClick);
on(document, 'touchend', handleDocumentClick, { passive: true });

return () => {
off(document, 'mousedown', handleDocumentClick);
off(document, 'touchend', handleDocumentClick, { passive: true });
requestAnimationFrame(() => {
off(document, 'mousedown', handleDocumentClick);
off(document, 'touchend', handleDocumentClick, { passive: true });
});
};
}, [classPrefix, shouldToggle, visible, onVisibleChange, getTriggerElement]);

Expand Down Expand Up @@ -205,10 +215,18 @@ export default function useTrigger({ triggerElement, content, disabled, trigger,
);
}

function getPopupProps() {
return {
onMouseLeave: handleMouseLeave,
onMouseDown: handlePopupMouseDown,
onTouchEnd: handlePopupMouseDown,
};
}

return {
triggerElementIsString,
handleMouseLeave,
getTriggerElement,
getTriggerNode,
getPopupProps,
};
}
Loading