Skip to content

fix: Use passive event listeners #1652

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
jsphstls wants to merge 1 commit into
base: master
Choose a base branch
from
+84 −20
Open

fix: Use passive event listeners #1652

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
22 changes: 12 additions & 10 deletions src/downshift.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1133,21 +1133,23 @@ class Downshift extends Component {
}
const {environment} = this.props

environment.addEventListener('mousedown', onMouseDown)
environment.addEventListener('mouseup', onMouseUp)
environment.addEventListener('touchstart', onTouchStart)
environment.addEventListener('touchmove', onTouchMove)
environment.addEventListener('touchend', onTouchEnd)
const options = {passive: true}

environment.addEventListener('mousedown', onMouseDown, options)
environment.addEventListener('mouseup', onMouseUp, options)
environment.addEventListener('touchstart', onTouchStart, options)
environment.addEventListener('touchmove', onTouchMove, options)
environment.addEventListener('touchend', onTouchEnd, options)

this.cleanup = () => {
this.internalClearTimeouts()
this.updateStatus.cancel()

environment.removeEventListener('mousedown', onMouseDown)
environment.removeEventListener('mouseup', onMouseUp)
environment.removeEventListener('touchstart', onTouchStart)
environment.removeEventListener('touchmove', onTouchMove)
environment.removeEventListener('touchend', onTouchEnd)
environment.removeEventListener('mousedown', onMouseDown, options)
environment.removeEventListener('mouseup', onMouseUp, options)
environment.removeEventListener('touchstart', onTouchStart, options)
environment.removeEventListener('touchmove', onTouchMove, options)
environment.removeEventListener('touchend', onTouchEnd, options)
}
}
}
Expand Down
60 changes: 60 additions & 0 deletions src/hooks/__tests__/__snapshots__/utils.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,37 @@ exports[`utils useMouseAndTouchTracker adds and removes listeners to environment
[
mousedown,
[Function],
{
passive: true,
},
],
[
mouseup,
[Function],
{
passive: true,
},
],
[
touchstart,
[Function],
{
passive: true,
},
],
[
touchmove,
[Function],
{
passive: true,
},
],
[
touchend,
[Function],
{
passive: true,
},
],
]
`;
Expand All @@ -30,22 +45,37 @@ exports[`utils useMouseAndTouchTracker adds and removes listeners to environment
[
mousedown,
[Function],
{
passive: true,
},
],
[
mouseup,
[Function],
{
passive: true,
},
],
[
touchstart,
[Function],
{
passive: true,
},
],
[
touchmove,
[Function],
{
passive: true,
},
],
[
touchend,
[Function],
{
passive: true,
},
],
]
`;
Expand All @@ -55,22 +85,37 @@ exports[`utils useMouseAndTouchTracker adds and removes listeners to environment
[
mousedown,
[Function],
{
passive: true,
},
],
[
mouseup,
[Function],
{
passive: true,
},
],
[
touchstart,
[Function],
{
passive: true,
},
],
[
touchmove,
[Function],
{
passive: true,
},
],
[
touchend,
[Function],
{
passive: true,
},
],
]
`;
Expand All @@ -80,22 +125,37 @@ exports[`utils useMouseAndTouchTracker adds and removes listeners to environment
[
mousedown,
[Function],
{
passive: true,
},
],
[
mouseup,
[Function],
{
passive: true,
},
],
[
touchstart,
[Function],
{
passive: true,
},
],
[
touchmove,
[Function],
{
passive: true,
},
],
[
touchend,
[Function],
{
passive: true,
},
],
]
`;
22 changes: 12 additions & 10 deletions src/hooks/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,18 +418,20 @@ function useMouseAndTouchTracker(
}
}

environment.addEventListener('mousedown', onMouseDown)
environment.addEventListener('mouseup', onMouseUp)
environment.addEventListener('touchstart', onTouchStart)
environment.addEventListener('touchmove', onTouchMove)
environment.addEventListener('touchend', onTouchEnd)
const options = {passive: true}

environment.addEventListener('mousedown', onMouseDown, options)
environment.addEventListener('mouseup', onMouseUp, options)
environment.addEventListener('touchstart', onTouchStart, options)
environment.addEventListener('touchmove', onTouchMove, options)
environment.addEventListener('touchend', onTouchEnd, options)

return function cleanup() {
environment.removeEventListener('mousedown', onMouseDown)
environment.removeEventListener('mouseup', onMouseUp)
environment.removeEventListener('touchstart', onTouchStart)
environment.removeEventListener('touchmove', onTouchMove)
environment.removeEventListener('touchend', onTouchEnd)
environment.removeEventListener('mousedown', onMouseDown, options)
environment.removeEventListener('mouseup', onMouseUp, options)
environment.removeEventListener('touchstart', onTouchStart, options)
environment.removeEventListener('touchmove', onTouchMove, options)
environment.removeEventListener('touchend', onTouchEnd, options)
}
}, [downshiftElementsRefs, environment, handleBlur])

Expand Down