Skip to content

Commit 8694727

Browse files
committed
Fixed a typescript error
1 parent afb28c7 commit 8694727

File tree

3 files changed

+16
-14
lines changed

3 files changed

+16
-14
lines changed

firestore/useCollection.ts

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { firestore, FirebaseError } from 'firebase';
22
import { useEffect } from 'react';
33
import { useIsEqualRef, useLoadingValue } from '../util';
4+
import { transformError } from '../util/transformError';
45

56
export type CollectionHook = {
67
error?: FirebaseError;
@@ -24,13 +25,8 @@ export default (
2425
return;
2526
}
2627
const listener = options
27-
? ref.current.onSnapshot(options, setValue, (error: Error) => setError({
28-
message: error.message,
29-
stack: error.stack,
30-
name: error.name,
31-
code: ''
32-
}))
33-
: ref.current.onSnapshot(setValue, setError);
28+
? ref.current.onSnapshot(options, setValue, (error: Error) => setError(transformError(error)))
29+
: ref.current.onSnapshot({}, setValue, (error: Error) => setError(transformError(error)));
3430

3531
return () => {
3632
listener();

firestore/useDocument.ts

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { firestore, FirebaseError } from 'firebase';
22
import { useEffect } from 'react';
33
import { useIsEqualRef, useLoadingValue } from '../util';
4+
import { transformError } from '../util/transformError';
45

56
export type DocumentHook = {
67
error?: FirebaseError;
@@ -24,13 +25,8 @@ export default (
2425
return;
2526
}
2627
const listener = options
27-
? ref.current.onSnapshot(options, setValue, (error: Error) => setError({
28-
message: error.message,
29-
stack: error.stack,
30-
name: error.name,
31-
code: ''
32-
}))
33-
: ref.current.onSnapshot(setValue, setError);
28+
? ref.current.onSnapshot(options, setValue, (error: Error) => setError(transformError(error)))
29+
: ref.current.onSnapshot({}, setValue, (error: Error) => setError(transformError(error)));
3430

3531
return () => {
3632
listener();

util/transformError.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import { FirebaseError } from 'firebase';
2+
3+
export const transformError = (error: Error): FirebaseError => {
4+
return {
5+
message: error.message,
6+
stack: error.stack,
7+
name: error.name,
8+
code: ''
9+
}
10+
}

0 commit comments

Comments
 (0)