Skip to content

chore(ui): Implement loading scopes across sign in/up components #3964

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
alexcarpenter merged 1 commit into from
Aug 15, 2024
Merged

chore(ui): Implement loading scopes across sign in/up components #3964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 15 additions & 15 deletions packages/ui/src/components/sign-in/steps/reset-password.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,32 +66,32 @@ export function SignInResetPassword() {
</div>
</Card.Body>

<Common.Loading>
{isSubmitting => {
return (
<Card.Actions>
<Card.Actions>
<Common.Loading scope='submit'>
{isSubmitting => {
return (
<SignIn.Action
submit
asChild
>
<Button
busy={isSubmitting}
disabled={isGlobalLoading || isSubmitting}
disabled={isGlobalLoading}
>
{t('signIn.resetPassword.formButtonPrimary')}
</Button>
</SignIn.Action>
);
}}
</Common.Loading>

<SignIn.Action
navigate='start'
asChild
>
<LinkButton>{t('backButton')}</LinkButton>
</SignIn.Action>
</Card.Actions>
);
}}
</Common.Loading>
<SignIn.Action
navigate='start'
asChild
>
<LinkButton>{t('backButton')}</LinkButton>
</SignIn.Action>
</Card.Actions>
</Card.Content>
<Card.Footer {...cardFooterProps} />
</Card.Root>
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/components/sign-in/steps/start.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ export function SignInStart() {
<SignIn.Passkey asChild>
<LinkButton
type='button'
disabled={isGlobalLoading || isSubmitting}
disabled={isGlobalLoading}
>
{t('signIn.start.actionLink__use_passkey')}
</LinkButton>
Expand Down
213 changes: 97 additions & 116 deletions packages/ui/src/components/sign-in/steps/verifications.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@ export function SignInVerifications() {
/>
</Card.Body>

<Common.Loading>
{isSubmitting => {
return (
<Card.Actions>
<Card.Actions>
<Common.Loading scope='submit'>
{isSubmitting => {
return (
<SignIn.Action
submit
asChild
Expand All @@ -108,19 +108,17 @@ export function SignInVerifications() {
{t('formButtonPrimary')}
</Button>
</SignIn.Action>
);
}}
</Common.Loading>

<SignIn.Action
navigate='choose-strategy'
asChild
>
<LinkButton disabled={isGlobalLoading || isSubmitting}>
{t('signIn.password.actionLink')}
</LinkButton>
</SignIn.Action>
</Card.Actions>
);
}}
</Common.Loading>
<SignIn.Action
navigate='choose-strategy'
asChild
>
<LinkButton disabled={isGlobalLoading}>{t('signIn.password.actionLink')}</LinkButton>
</SignIn.Action>
</Card.Actions>
</SignIn.Strategy>

<SignIn.Strategy name='passkey'>
Expand Down Expand Up @@ -155,22 +153,10 @@ export function SignInVerifications() {

<GlobalError />

<Common.Loading>
{isSubmitting => {
return (
<Card.Actions>
{
// Note:
// 1. Currently this triggers the loading
// spinner for "Continue" which is a little
// confusing. We could use a manual setState
// on click, but we'll need to find a way to
// clean up the state based on `isSubmitting`
// 2. This button doesn't currently work; it's
// being tracked here:
// https://linear.app/clerk/issue/SDKI-172
}

<Card.Actions>
<Common.Loading scope='submit'>
{isSubmitting => {
return (
<SignIn.Action
submit
asChild
Expand All @@ -183,19 +169,16 @@ export function SignInVerifications() {
{t('formButtonPrimary')}
</Button>
</SignIn.Action>

<SignIn.Action
navigate='choose-strategy'
asChild
>
<LinkButton disabled={isGlobalLoading || isSubmitting}>
{t('footerActionLink__useAnotherMethod')}
</LinkButton>
</SignIn.Action>
</Card.Actions>
);
}}
</Common.Loading>
);
}}
</Common.Loading>
<SignIn.Action
navigate='choose-strategy'
asChild
>
<LinkButton disabled={isGlobalLoading}>{t('footerActionLink__useAnotherMethod')}</LinkButton>
</SignIn.Action>
</Card.Actions>
</SignIn.Strategy>

<SignIn.Strategy name='backup_code'>
Expand All @@ -217,10 +200,10 @@ export function SignInVerifications() {
<BackupCodeField />
</Card.Body>

<Common.Loading>
{isSubmitting => {
return (
<Card.Actions>
<Card.Actions>
<Common.Loading scope='submit'>
{isSubmitting => {
return (
<SignIn.Action
submit
asChild
Expand All @@ -233,22 +216,21 @@ export function SignInVerifications() {
{t('formButtonPrimary')}
</Button>
</SignIn.Action>

<SignIn.Action
navigate='choose-strategy'
asChild
>
<LinkButton
disabled={isGlobalLoading || isSubmitting}
type='button'
>
{t('footerActionLink__useAnotherMethod')}
</LinkButton>
</SignIn.Action>
</Card.Actions>
);
}}
</Common.Loading>
);
}}
</Common.Loading>
<SignIn.Action
navigate='choose-strategy'
asChild
>
<LinkButton
disabled={isGlobalLoading}
type='button'
>
{t('footerActionLink__useAnotherMethod')}
</LinkButton>
</SignIn.Action>
</Card.Actions>
</SignIn.Strategy>

<SignIn.Strategy name='email_code'>
Expand Down Expand Up @@ -307,10 +289,10 @@ export function SignInVerifications() {
}
/>
</Card.Body>
<Common.Loading scope='step:verifications'>
{isSubmitting => {
return (
<Card.Actions>
<Card.Actions>
<Common.Loading scope='submit'>
{isSubmitting => {
return (
<SignIn.Action
submit
asChild
Expand All @@ -323,17 +305,17 @@ export function SignInVerifications() {
{t('formButtonPrimary')}
</Button>
</SignIn.Action>
);
}}
</Common.Loading>

<SignIn.Action
asChild
navigate='choose-strategy'
>
<LinkButton type='button'>{t('footerActionLink__useAnotherMethod')}</LinkButton>
</SignIn.Action>
</Card.Actions>
);
}}
</Common.Loading>
<SignIn.Action
asChild
navigate='choose-strategy'
>
<LinkButton type='button'>{t('footerActionLink__useAnotherMethod')}</LinkButton>
</SignIn.Action>
</Card.Actions>
</SignIn.Strategy>

<SignIn.Strategy name='phone_code'>
Expand Down Expand Up @@ -393,10 +375,10 @@ export function SignInVerifications() {
/>
</Card.Body>

<Common.Loading scope='step:verifications'>
{isSubmitting => {
return (
<Card.Actions>
<Card.Actions>
<Common.Loading scope='submit'>
{isSubmitting => {
return (
<SignIn.Action
submit
asChild
Expand All @@ -409,17 +391,17 @@ export function SignInVerifications() {
{t('formButtonPrimary')}
</Button>
</SignIn.Action>
);
}}
</Common.Loading>

<SignIn.Action
asChild
navigate='choose-strategy'
>
<LinkButton type='button'>{t('footerActionLink__useAnotherMethod')}</LinkButton>
</SignIn.Action>
</Card.Actions>
);
}}
</Common.Loading>
<SignIn.Action
asChild
navigate='choose-strategy'
>
<LinkButton type='button'>{t('footerActionLink__useAnotherMethod')}</LinkButton>
</SignIn.Action>
</Card.Actions>
</SignIn.Strategy>

<SignIn.Strategy name='email_link'>
Expand Down Expand Up @@ -517,10 +499,10 @@ export function SignInVerifications() {
/>
</Card.Body>

<Common.Loading scope='step:verifications'>
{isSubmitting => {
return (
<Card.Actions>
<Card.Actions>
<Common.Loading scope='submit'>
{isSubmitting => {
return (
<SignIn.Action
submit
asChild
Expand All @@ -533,10 +515,10 @@ export function SignInVerifications() {
{t('formButtonPrimary')}
</Button>
</SignIn.Action>
</Card.Actions>
);
}}
</Common.Loading>
);
}}
</Common.Loading>
</Card.Actions>
</SignIn.Strategy>

<SignIn.Strategy name='totp'>
Expand All @@ -561,10 +543,10 @@ export function SignInVerifications() {
/>
</Card.Body>

<Common.Loading scope='step:verifications'>
{isSubmitting => {
return (
<Card.Actions>
<Card.Actions>
<Common.Loading scope='submit'>
{isSubmitting => {
return (
<SignIn.Action
submit
asChild
Expand All @@ -577,17 +559,16 @@ export function SignInVerifications() {
{t('formButtonPrimary')}
</Button>
</SignIn.Action>

<SignIn.Action
asChild
navigate='choose-strategy'
>
<LinkButton type='button'>{t('footerActionLink__useAnotherMethod')}</LinkButton>
</SignIn.Action>
</Card.Actions>
);
}}
</Common.Loading>
);
}}
</Common.Loading>
<SignIn.Action
asChild
navigate='choose-strategy'
>
<LinkButton type='button'>{t('footerActionLink__useAnotherMethod')}</LinkButton>
</SignIn.Action>
</Card.Actions>
</SignIn.Strategy>
</Card.Content>
<Card.Footer {...cardFooterProps} />
Expand Down
Loading