diff --git a/docs/reference/README.md b/docs/reference/README.md index b4bcdf10..61ec7c9d 100644 --- a/docs/reference/README.md +++ b/docs/reference/README.md @@ -131,7 +131,7 @@ ___ #### Defined in -[src/auth.tsx:66](https://github.com/FirebaseExtended/reactfire/blob/main/src/auth.tsx#L66) +[src/auth.tsx:59](https://github.com/FirebaseExtended/reactfire/blob/main/src/auth.tsx#L59) ## Variables @@ -299,7 +299,7 @@ Meant for Concurrent mode only (``). [More #### Defined in -[src/auth.tsx:247](https://github.com/FirebaseExtended/reactfire/blob/main/src/auth.tsx#L247) +[src/auth.tsx:240](https://github.com/FirebaseExtended/reactfire/blob/main/src/auth.tsx#L240) ___ @@ -347,7 +347,7 @@ Meant for Concurrent mode only (``). [More #### Defined in -[src/auth.tsx:210](https://github.com/FirebaseExtended/reactfire/blob/main/src/auth.tsx#L210) +[src/auth.tsx:203](https://github.com/FirebaseExtended/reactfire/blob/main/src/auth.tsx#L203) ___ @@ -1097,7 +1097,7 @@ ___ #### Defined in -[src/auth.tsx:38](https://github.com/FirebaseExtended/reactfire/blob/main/src/auth.tsx#L38) +[src/auth.tsx:31](https://github.com/FirebaseExtended/reactfire/blob/main/src/auth.tsx#L31) ___ @@ -1517,7 +1517,7 @@ const {status, data: signInCheckResult} = useSigninCheck({forceRefresh: true, re #### Defined in -[src/auth.tsx:131](https://github.com/FirebaseExtended/reactfire/blob/main/src/auth.tsx#L131) +[src/auth.tsx:124](https://github.com/FirebaseExtended/reactfire/blob/main/src/auth.tsx#L124) ___ diff --git a/docs/reference/interfaces/AuthCheckProps.md b/docs/reference/interfaces/AuthCheckProps.md index 8538b758..ff5b700f 100644 --- a/docs/reference/interfaces/AuthCheckProps.md +++ b/docs/reference/interfaces/AuthCheckProps.md @@ -18,7 +18,7 @@ #### Defined in -[src/auth.tsx:51](https://github.com/FirebaseExtended/reactfire/blob/main/src/auth.tsx#L51) +[src/auth.tsx:44](https://github.com/FirebaseExtended/reactfire/blob/main/src/auth.tsx#L44) ___ @@ -28,7 +28,7 @@ ___ #### Defined in -[src/auth.tsx:50](https://github.com/FirebaseExtended/reactfire/blob/main/src/auth.tsx#L50) +[src/auth.tsx:43](https://github.com/FirebaseExtended/reactfire/blob/main/src/auth.tsx#L43) ___ @@ -38,4 +38,4 @@ ___ #### Defined in -[src/auth.tsx:52](https://github.com/FirebaseExtended/reactfire/blob/main/src/auth.tsx#L52) +[src/auth.tsx:45](https://github.com/FirebaseExtended/reactfire/blob/main/src/auth.tsx#L45) diff --git a/docs/reference/interfaces/ClaimsCheckProps.md b/docs/reference/interfaces/ClaimsCheckProps.md index f7bf960c..12b32cb4 100644 --- a/docs/reference/interfaces/ClaimsCheckProps.md +++ b/docs/reference/interfaces/ClaimsCheckProps.md @@ -19,7 +19,7 @@ #### Defined in -[src/auth.tsx:58](https://github.com/FirebaseExtended/reactfire/blob/main/src/auth.tsx#L58) +[src/auth.tsx:51](https://github.com/FirebaseExtended/reactfire/blob/main/src/auth.tsx#L51) ___ @@ -29,7 +29,7 @@ ___ #### Defined in -[src/auth.tsx:57](https://github.com/FirebaseExtended/reactfire/blob/main/src/auth.tsx#L57) +[src/auth.tsx:50](https://github.com/FirebaseExtended/reactfire/blob/main/src/auth.tsx#L50) ___ @@ -43,7 +43,7 @@ ___ #### Defined in -[src/auth.tsx:59](https://github.com/FirebaseExtended/reactfire/blob/main/src/auth.tsx#L59) +[src/auth.tsx:52](https://github.com/FirebaseExtended/reactfire/blob/main/src/auth.tsx#L52) ___ @@ -53,4 +53,4 @@ ___ #### Defined in -[src/auth.tsx:56](https://github.com/FirebaseExtended/reactfire/blob/main/src/auth.tsx#L56) +[src/auth.tsx:49](https://github.com/FirebaseExtended/reactfire/blob/main/src/auth.tsx#L49) diff --git a/docs/reference/interfaces/ClaimsValidator.md b/docs/reference/interfaces/ClaimsValidator.md index a42965b3..e4ff0df7 100644 --- a/docs/reference/interfaces/ClaimsValidator.md +++ b/docs/reference/interfaces/ClaimsValidator.md @@ -25,4 +25,4 @@ #### Defined in -[src/auth.tsx:89](https://github.com/FirebaseExtended/reactfire/blob/main/src/auth.tsx#L89) +[src/auth.tsx:82](https://github.com/FirebaseExtended/reactfire/blob/main/src/auth.tsx#L82) diff --git a/docs/reference/interfaces/SignInCheckOptionsBasic.md b/docs/reference/interfaces/SignInCheckOptionsBasic.md index ac45a715..0f618a5a 100644 --- a/docs/reference/interfaces/SignInCheckOptionsBasic.md +++ b/docs/reference/interfaces/SignInCheckOptionsBasic.md @@ -30,7 +30,7 @@ #### Defined in -[src/auth.tsx:81](https://github.com/FirebaseExtended/reactfire/blob/main/src/auth.tsx#L81) +[src/auth.tsx:74](https://github.com/FirebaseExtended/reactfire/blob/main/src/auth.tsx#L74) ___ diff --git a/docs/reference/interfaces/SignInCheckOptionsClaimsObject.md b/docs/reference/interfaces/SignInCheckOptionsClaimsObject.md index 2d651eb9..b7b2ab88 100644 --- a/docs/reference/interfaces/SignInCheckOptionsClaimsObject.md +++ b/docs/reference/interfaces/SignInCheckOptionsClaimsObject.md @@ -31,7 +31,7 @@ #### Defined in -[src/auth.tsx:81](https://github.com/FirebaseExtended/reactfire/blob/main/src/auth.tsx#L81) +[src/auth.tsx:74](https://github.com/FirebaseExtended/reactfire/blob/main/src/auth.tsx#L74) ___ @@ -69,7 +69,7 @@ ___ #### Defined in -[src/auth.tsx:85](https://github.com/FirebaseExtended/reactfire/blob/main/src/auth.tsx#L85) +[src/auth.tsx:78](https://github.com/FirebaseExtended/reactfire/blob/main/src/auth.tsx#L78) ___ diff --git a/docs/reference/interfaces/SignInCheckOptionsClaimsValidator.md b/docs/reference/interfaces/SignInCheckOptionsClaimsValidator.md index 460270ab..fd896d29 100644 --- a/docs/reference/interfaces/SignInCheckOptionsClaimsValidator.md +++ b/docs/reference/interfaces/SignInCheckOptionsClaimsValidator.md @@ -31,7 +31,7 @@ #### Defined in -[src/auth.tsx:81](https://github.com/FirebaseExtended/reactfire/blob/main/src/auth.tsx#L81) +[src/auth.tsx:74](https://github.com/FirebaseExtended/reactfire/blob/main/src/auth.tsx#L74) ___ @@ -101,4 +101,4 @@ ___ #### Defined in -[src/auth.tsx:96](https://github.com/FirebaseExtended/reactfire/blob/main/src/auth.tsx#L96) +[src/auth.tsx:89](https://github.com/FirebaseExtended/reactfire/blob/main/src/auth.tsx#L89) diff --git a/package-lock.json b/package-lock.json index fd11cee4..7405817a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "reactfire", - "version": "4.2.2", + "version": "4.2.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "reactfire", - "version": "4.2.2", + "version": "4.2.3", "license": "MIT", "dependencies": { "rxfire": "^6.0.3", diff --git a/package.json b/package.json index 49c5516f..a1be9056 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "4.2.2", + "version": "4.2.3", "license": "MIT", "type": "module", "main": "dist/index.umd.cjs", diff --git a/src/auth.tsx b/src/auth.tsx index 0a9db169..82aea8b7 100644 --- a/src/auth.tsx +++ b/src/auth.tsx @@ -24,15 +24,8 @@ export function useUser(options?: ReactFireOptions): ObservableS const observableId = `auth:user:${auth.name}`; const observable$ = user(auth); - const _options: ReactFireOptions = { ...options } ?? {}; - // only set/override initialData if auth has finished loading - if (auth.currentUser !== undefined) { - _options.initialData = auth.currentUser; - _options.startWithValue = auth.currentUser; - } - - return useObservable(observableId, observable$, _options); + return useObservable(observableId, observable$, options); } export function useIdTokenResult(user: User, forceRefresh: boolean = false, options?: ReactFireOptions): ObservableStatus {