fix: beautiful-react-hooks's useObservable have type bug

This commit is contained in:
tiddlygit-test 2021-10-07 01:05:24 +08:00
parent 7c63b80aa7
commit be2bc5bfa9
7 changed files with 8 additions and 8 deletions

View file

@ -6,7 +6,7 @@ import { IGitUserInfos } from '@services/git/interface';
export function useUserInfoObservable(): IUserInfos | undefined {
const [userInfo, userInfoSetter] = useState<IUserInfos | undefined>();
useObservable<IUserInfos | undefined>(window.observables.auth.userInfo$, userInfoSetter);
useObservable(window.observables.auth.userInfo$, userInfoSetter as any);
return userInfo;
}

View file

@ -4,6 +4,6 @@ import { IPauseNotificationsInfo } from './interface';
export function useNotificationInfoObservable(): IPauseNotificationsInfo | undefined {
const [notificationInfo, notificationInfoSetter] = useState<IPauseNotificationsInfo | undefined>();
useObservable<IPauseNotificationsInfo | undefined>(window.observables.notification.pauseNotificationsInfo$, notificationInfoSetter);
useObservable(window.observables.notification.pauseNotificationsInfo$, notificationInfoSetter as any);
return notificationInfo;
}

View file

@ -4,6 +4,6 @@ import { IPreferences } from './interface';
export function usePreferenceObservable(): IPreferences | undefined {
const [preference, preferenceSetter] = useState<IPreferences | undefined>();
useObservable<IPreferences | undefined>(window.observables.preference.preference$, preferenceSetter);
useObservable(window.observables.preference.preference$, preferenceSetter as any);
return preference;
}

View file

@ -6,7 +6,7 @@ import { IUsedElectionSettings } from './interface';
export function useSystemPreferenceObservable(): IUsedElectionSettings | undefined {
const [systemPreference, systemPreferenceSetter] = useState<IUsedElectionSettings | undefined>();
useObservable<IUsedElectionSettings | undefined>(window.observables.systemPreference.systemPreference$, systemPreferenceSetter);
useObservable(window.observables.systemPreference.systemPreference$, systemPreferenceSetter as any);
return systemPreference;
}

View file

@ -4,6 +4,6 @@ import { ITheme } from './interface';
export function useThemeObservable(): ITheme | undefined {
const [theme, themeSetter] = useState<ITheme | undefined>();
useObservable<ITheme | undefined>(window.observables.theme.theme$, themeSetter);
useObservable(window.observables.theme.theme$, themeSetter as any);
return theme;
}

View file

@ -6,7 +6,7 @@ import { IUpdaterMetaData } from './interface';
export function useUpdaterObservable(): IUpdaterMetaData | undefined {
const [updaterMetaData, updaterMetaDataSetter] = useState<IUpdaterMetaData | undefined>();
useObservable<IUpdaterMetaData | undefined>(window.observables.updater.updaterMetaData$, updaterMetaDataSetter);
useObservable(window.observables.updater.updaterMetaData$, updaterMetaDataSetter as any);
return updaterMetaData;
}

View file

@ -11,13 +11,13 @@ export function useWorkspacesListObservable(): IWorkspace[] | undefined {
() => window.observables.workspace.workspaces$.pipe(map<Record<string, IWorkspace>, IWorkspace[]>((workspaces) => Object.values(workspaces))),
[],
);
useObservable<IWorkspace[] | undefined>(workspacesList$, workspacesSetter);
useObservable(workspacesList$, workspacesSetter as any);
return workspaces;
}
export function useWorkspaceObservable(id: string): IWorkspace | undefined {
const [workspace, workspaceSetter] = useState<IWorkspace | undefined>();
const workspace$ = useMemo(() => window.observables.workspace.get$(id), [id]);
useObservable<IWorkspace | undefined>(workspace$, workspaceSetter);
useObservable(workspace$, workspaceSetter as any);
return workspace;
}