From be2bc5bfa96335be26c4b8855a781992ebb3935a Mon Sep 17 00:00:00 2001 From: tiddlygit-test Date: Thu, 7 Oct 2021 01:05:24 +0800 Subject: [PATCH] fix: beautiful-react-hooks's useObservable have type bug --- src/services/auth/hooks.ts | 2 +- src/services/notifications/hooks.ts | 2 +- src/services/preferences/hooks.ts | 2 +- src/services/systemPreferences/hooks.ts | 2 +- src/services/theme/hooks.ts | 2 +- src/services/updater/hooks.ts | 2 +- src/services/workspaces/hooks.ts | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/services/auth/hooks.ts b/src/services/auth/hooks.ts index 5c82cb15..396ea048 100644 --- a/src/services/auth/hooks.ts +++ b/src/services/auth/hooks.ts @@ -6,7 +6,7 @@ import { IGitUserInfos } from '@services/git/interface'; export function useUserInfoObservable(): IUserInfos | undefined { const [userInfo, userInfoSetter] = useState(); - useObservable(window.observables.auth.userInfo$, userInfoSetter); + useObservable(window.observables.auth.userInfo$, userInfoSetter as any); return userInfo; } diff --git a/src/services/notifications/hooks.ts b/src/services/notifications/hooks.ts index 84de1558..cbe14c61 100644 --- a/src/services/notifications/hooks.ts +++ b/src/services/notifications/hooks.ts @@ -4,6 +4,6 @@ import { IPauseNotificationsInfo } from './interface'; export function useNotificationInfoObservable(): IPauseNotificationsInfo | undefined { const [notificationInfo, notificationInfoSetter] = useState(); - useObservable(window.observables.notification.pauseNotificationsInfo$, notificationInfoSetter); + useObservable(window.observables.notification.pauseNotificationsInfo$, notificationInfoSetter as any); return notificationInfo; } diff --git a/src/services/preferences/hooks.ts b/src/services/preferences/hooks.ts index 89ee465d..7054d6a6 100644 --- a/src/services/preferences/hooks.ts +++ b/src/services/preferences/hooks.ts @@ -4,6 +4,6 @@ import { IPreferences } from './interface'; export function usePreferenceObservable(): IPreferences | undefined { const [preference, preferenceSetter] = useState(); - useObservable(window.observables.preference.preference$, preferenceSetter); + useObservable(window.observables.preference.preference$, preferenceSetter as any); return preference; } diff --git a/src/services/systemPreferences/hooks.ts b/src/services/systemPreferences/hooks.ts index 6c8d58af..70c4cdf3 100644 --- a/src/services/systemPreferences/hooks.ts +++ b/src/services/systemPreferences/hooks.ts @@ -6,7 +6,7 @@ import { IUsedElectionSettings } from './interface'; export function useSystemPreferenceObservable(): IUsedElectionSettings | undefined { const [systemPreference, systemPreferenceSetter] = useState(); - useObservable(window.observables.systemPreference.systemPreference$, systemPreferenceSetter); + useObservable(window.observables.systemPreference.systemPreference$, systemPreferenceSetter as any); return systemPreference; } diff --git a/src/services/theme/hooks.ts b/src/services/theme/hooks.ts index 9d616e22..9a5983a3 100644 --- a/src/services/theme/hooks.ts +++ b/src/services/theme/hooks.ts @@ -4,6 +4,6 @@ import { ITheme } from './interface'; export function useThemeObservable(): ITheme | undefined { const [theme, themeSetter] = useState(); - useObservable(window.observables.theme.theme$, themeSetter); + useObservable(window.observables.theme.theme$, themeSetter as any); return theme; } diff --git a/src/services/updater/hooks.ts b/src/services/updater/hooks.ts index 6316e7c6..cb02dce5 100644 --- a/src/services/updater/hooks.ts +++ b/src/services/updater/hooks.ts @@ -6,7 +6,7 @@ import { IUpdaterMetaData } from './interface'; export function useUpdaterObservable(): IUpdaterMetaData | undefined { const [updaterMetaData, updaterMetaDataSetter] = useState(); - useObservable(window.observables.updater.updaterMetaData$, updaterMetaDataSetter); + useObservable(window.observables.updater.updaterMetaData$, updaterMetaDataSetter as any); return updaterMetaData; } diff --git a/src/services/workspaces/hooks.ts b/src/services/workspaces/hooks.ts index a17eacfd..36c4ae31 100644 --- a/src/services/workspaces/hooks.ts +++ b/src/services/workspaces/hooks.ts @@ -11,13 +11,13 @@ export function useWorkspacesListObservable(): IWorkspace[] | undefined { () => window.observables.workspace.workspaces$.pipe(map, IWorkspace[]>((workspaces) => Object.values(workspaces))), [], ); - useObservable(workspacesList$, workspacesSetter); + useObservable(workspacesList$, workspacesSetter as any); return workspaces; } export function useWorkspaceObservable(id: string): IWorkspace | undefined { const [workspace, workspaceSetter] = useState(); const workspace$ = useMemo(() => window.observables.workspace.get$(id), [id]); - useObservable(workspace$, workspaceSetter); + useObservable(workspace$, workspaceSetter as any); return workspace; }