diff --git a/src/hooks/useWinClick.ts b/src/hooks/useWinClick.ts index 58a10d79..58fe5c36 100644 --- a/src/hooks/useWinClick.ts +++ b/src/hooks/useWinClick.ts @@ -65,16 +65,16 @@ export default function useWinClick( const win = getWin(popupEle); - win.addEventListener('mousedown', onWinMouseDown); - win.addEventListener('click', onWinClick); - win.addEventListener('contextmenu', onWinClick); + win.addEventListener('mousedown', onWinMouseDown, true); + win.addEventListener('click', onWinClick, true); + win.addEventListener('contextmenu', onWinClick, true); // shadow root const targetShadowRoot = getShadowRoot(targetEle); if (targetShadowRoot) { - targetShadowRoot.addEventListener('mousedown', onShadowMouseDown); - targetShadowRoot.addEventListener('click', onShadowClick); - targetShadowRoot.addEventListener('contextmenu', onShadowClick); + targetShadowRoot.addEventListener('mousedown', onShadowMouseDown, true); + targetShadowRoot.addEventListener('click', onShadowClick, true); + targetShadowRoot.addEventListener('contextmenu', onShadowClick, true); } // Warning if target and popup not in same root @@ -89,14 +89,22 @@ export default function useWinClick( } return () => { - win.removeEventListener('mousedown', onWinMouseDown); - win.removeEventListener('click', onWinClick); - win.removeEventListener('contextmenu', onWinClick); + win.removeEventListener('mousedown', onWinMouseDown, true); + win.removeEventListener('click', onWinClick, true); + win.removeEventListener('contextmenu', onWinClick, true); if (targetShadowRoot) { - targetShadowRoot.removeEventListener('mousedown', onShadowMouseDown); - targetShadowRoot.removeEventListener('click', onShadowClick); - targetShadowRoot.removeEventListener('contextmenu', onShadowClick); + targetShadowRoot.removeEventListener( + 'mousedown', + onShadowMouseDown, + true, + ); + targetShadowRoot.removeEventListener('click', onShadowClick, true); + targetShadowRoot.removeEventListener( + 'contextmenu', + onShadowClick, + true, + ); } }; } diff --git a/tests/basic.test.jsx b/tests/basic.test.jsx index 19b59850..936a1407 100644 --- a/tests/basic.test.jsx +++ b/tests/basic.test.jsx @@ -1065,6 +1065,27 @@ describe('Trigger.Basic', () => { expect(document.querySelector('.rc-trigger-popup')).toBeTruthy(); expect(document.querySelector('.rc-trigger-popup-hidden')).toBeFalsy(); }); + + it('should hide when click outside stopPropagation button', async () => { + const Demo = () => { + return ( + <> +