Skip to content
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.

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

fix(Portal): fix event handling for mouseEnter/mouseLeave #4445

Merged
merged 2 commits into from Dec 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/addons/Portal/Portal.js
Expand Up @@ -215,7 +215,7 @@ function Portal(props) {
}

const handleTriggerMouseLeave = (e, ...rest) => {
clearTimeout(mouseEnterTimer)
clearTimeout(mouseEnterTimer.current)

// Call original event handler
_.invoke(trigger, 'props.onMouseLeave', e, ...rest)
Expand All @@ -229,7 +229,7 @@ function Portal(props) {
}

const handleTriggerMouseEnter = (e, ...rest) => {
clearTimeout(mouseLeaveTimer)
clearTimeout(mouseLeaveTimer.current)

// Call original event handler
_.invoke(trigger, 'props.onMouseEnter', e, ...rest)
Expand Down
77 changes: 77 additions & 0 deletions test/specs/addons/Portal/Portal-test.js
Expand Up @@ -7,6 +7,7 @@ import * as common from 'test/specs/commonTests'
import { domEvent, sandbox } from 'test/utils'
import Portal from 'src/addons/Portal/Portal'
import PortalInner from 'src/addons/Portal/PortalInner'
import wait from 'test/utils/wait'

let wrapper

Expand Down Expand Up @@ -371,6 +372,38 @@ describe('Portal', () => {
done()
}, 1)
})

/**
* e--l--d--v
* ^: mouseenter
* ^: BEFORE_DELAY: mouseleave
* ^: expected DELAY
* ^: final validation
*/
it('does not open the portal when leave before delay', async () => {
const DELAY = 20
const BEFORE_DELAY = 10

wrapperMount(
<Portal trigger={<button />} openOnTriggerMouseEnter mouseEnterDelay={DELAY}>
<p />
</Portal>,
)

wrapper.should.not.have.descendants(PortalInner)
wrapper.find('button').simulate('mouseenter')

await wait(BEFORE_DELAY)

wrapper.update()
wrapper.should.not.have.descendants(PortalInner)
wrapper.find('button').simulate('mouseleave')

await wait(DELAY)

wrapper.update()
wrapper.should.not.have.descendants(PortalInner)
})
})

describe('closeOnTriggerMouseLeave', () => {
Expand Down Expand Up @@ -407,6 +440,50 @@ describe('Portal', () => {
done()
}, 1)
})

/**
* e--l--e--d--v
* ^: mouseenter
* ^: mouseleave
* ^: BEFORE_DELAY: reenter
* ^: expected DELAY
* ^: final validation
*/
it('does not close the portal when reenter before delay', async () => {
const DELAY = 20
const BEFORE_DELAY = 10

wrapperMount(
<Portal
trigger={<button />}
openOnTriggerMouseEnter
closeOnTriggerMouseLeave
mouseLeaveDelay={DELAY}
>
<p />
</Portal>,
)

wrapper.should.not.have.descendants(PortalInner)
wrapper.find('button').simulate('mouseenter')

await wait(BEFORE_DELAY)

wrapper.update()
wrapper.should.have.descendants(PortalInner)
wrapper.find('button').simulate('mouseleave')

await wait(BEFORE_DELAY)

wrapper.update()
wrapper.should.have.descendants(PortalInner)
wrapper.find('button').simulate('mouseenter')

await wait(DELAY)

wrapper.update()
wrapper.should.have.descendants(PortalInner)
})
})

describe('closeOnPortalMouseLeave', () => {
Expand Down
3 changes: 3 additions & 0 deletions test/utils/wait.js
@@ -0,0 +1,3 @@
export default function wait(timeout) {
return new Promise((resolve) => setTimeout(resolve, timeout))
}