Skip to content

fix: focus handler typings #2152

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
TkDodo merged 1 commit into from
Apr 24, 2021
Merged

fix: focus handler typings #2152

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
13 changes: 7 additions & 6 deletions src/core/focusManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ class FocusManager extends Subscribable {
}

setEventListener(
setup: (onFocus: () => void) => (focused?: boolean) => void
setup: (setFocused: (focused?: boolean) => void) => () => void
): void {
if (this.removeEventListener) {
this.removeEventListener()
}
this.removeEventListener = setup((focused?: boolean) => {
this.removeEventListener = setup((focused) => {
if (typeof focused === 'boolean') {
this.setFocused(focused)
} else {
Expand Down Expand Up @@ -58,14 +58,15 @@ class FocusManager extends Subscribable {
private setDefaultEventListener() {
if (!isServer && window?.addEventListener) {
this.setEventListener(onFocus => {
const listener = () => onFocus()
// Listen to visibillitychange and focus
window.addEventListener('visibilitychange', onFocus, false)
window.addEventListener('focus', onFocus, false)
window.addEventListener('visibilitychange', listener, false)
window.addEventListener('focus', listener, false)

return () => {
// Be sure to unsubscribe if a new handler is set
window.removeEventListener('visibilitychange', onFocus)
window.removeEventListener('focus', onFocus)
window.removeEventListener('visibilitychange', listener)
window.removeEventListener('focus', listener)
}
})
}
Expand Down