Skip to content

update return type for AuthCheck and SuspenseWithPerf to JSX.Element #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 5, 2019
Merged

update return type for AuthCheck and SuspenseWithPerf to JSX.Element #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bdebb35
update return type for AuthCheck and SuspenseWithPerf to JSX.Element
seanemmer Oct 18, 2019
8e87751
remove changes to yarn.lock
seanemmer Oct 19, 2019
2564e48
wrap AuthCheck fallback and children in React Fragment
seanemmer Oct 21, 2019
d25504a
fix brackets
seanemmer Oct 21, 2019
772f650
Merge branch 'master' into master
jhuleatt Nov 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions reactfire/auth/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ export function AuthCheck({
fallback,
children,
requiredClaims
}: AuthCheckProps): React.ReactNode {
}: AuthCheckProps): JSX.Element {
Copy link
Collaborator

@jhuleatt jhuleatt Oct 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This and the change on line 36 cause a typescript compile error because they conflict with the props declared on line 47 and 48

const user = useUser<User>(auth);

if (user) {
Expand All @@ -105,9 +105,9 @@ export function AuthCheck({
{children}
</ClaimsCheck>
) : (
children
<>{children}</>
);
} else {
return fallback;
return <>{fallback}</>;
}
}
2 changes: 1 addition & 1 deletion reactfire/performance/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export function SuspenseWithPerf({
traceId,
fallback,
firePerf
}: SuspensePerfProps) {
}: SuspensePerfProps): JSX.Element {
firePerf = firePerf || getPerfFromContext();

const Fallback = () => {
Expand Down