Skip to content

Commit b6a7359

Browse files
committed
Fix type of return value of useAuthState
1 parent 1e893b1 commit b6a7359

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

auth/useAuthState.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@ import firebase from 'firebase/app';
22
import { useEffect, useMemo } from 'react';
33
import { LoadingHook, useLoadingValue } from '../util';
44

5-
export type AuthStateHook = LoadingHook<firebase.User, firebase.auth.Error>;
5+
export type AuthStateHook = LoadingHook<
6+
firebase.User | null,
7+
firebase.auth.Error
8+
>;
69

710
export default (auth: firebase.auth.Auth): AuthStateHook => {
811
const { error, loading, setError, setValue, value } = useLoadingValue<
9-
firebase.User,
12+
firebase.User | null,
1013
firebase.auth.Error
1114
>(() => auth.currentUser);
1215

util/useLoadingValue.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export type LoadingValue<T, E> = {
55
loading: boolean;
66
reset: () => void;
77
setError: (error: E) => void;
8-
setValue: (value?: T | null) => void;
8+
setValue: (value?: T) => void;
99
value?: T;
1010
};
1111

@@ -53,7 +53,7 @@ const reducer = <E>() => (
5353
}
5454
};
5555

56-
export default <T, E>(getDefaultValue?: () => T | null): LoadingValue<T, E> => {
56+
export default <T, E>(getDefaultValue?: () => T): LoadingValue<T, E> => {
5757
const defaultValue = getDefaultValue ? getDefaultValue() : undefined;
5858
const [state, dispatch] = useReducer(
5959
reducer<E>(),
@@ -69,7 +69,7 @@ export default <T, E>(getDefaultValue?: () => T | null): LoadingValue<T, E> => {
6969
dispatch({ type: 'error', error });
7070
};
7171

72-
const setValue = (value?: T | null) => {
72+
const setValue = (value?: T) => {
7373
dispatch({ type: 'value', value });
7474
};
7575

0 commit comments

Comments
 (0)