Skip to content
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

Jump to bottom

feat(core): add Button with loading state #916

Merged
merged 4 commits into from
May 17, 2024
Merged

feat(core): add Button with loading state #916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0a6cb27
feat(core): add Button with loading state
jorgemoya May 15, 2024
8587c4d
refactor: delete button component, use ui button
jorgemoya May 16, 2024
0668520
fix: keep width when loading is showing
jorgemoya May 16, 2024
7ab2247
refactor: wrap in span and hide visibility instead
jorgemoya May 17, 2024
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
5 changes: 5 additions & 0 deletions .changeset/neat-grapes-allow.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@bigcommerce/catalyst-core": patch
---

Add Button with loading state.
16 changes: 3 additions & 13 deletions core/app/[locale]/(default)/account/[tab]/_components/change-password-form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
'use client';

import { Loader2 as Spinner } from 'lucide-react';
import { useTranslations } from 'next-intl';
import { ChangeEvent, useEffect, useRef, useState } from 'react';
import { useFormState, useFormStatus } from 'react-dom';
Expand Down Expand Up @@ -74,20 +73,11 @@ const SubmitButton = () => {
<Button
className="relative w-full items-center px-8 py-2 md:w-fit"
data-button
disabled={pending}
loading={pending}
loadingText={t('spinnerText')}
variant="primary"
>
<>
{pending && (
<>
<span className="absolute z-10 flex h-full w-full items-center justify-center bg-gray-400">
<Spinner aria-hidden="true" className="animate-spin" />
</span>
<span className="sr-only">{t('spinnerText')}</span>
</>
)}
<span aria-hidden={pending}>{t('submitText')}</span>
</>
{t('submitText')}
</Button>
);
};
Expand Down
12 changes: 2 additions & 10 deletions core/app/[locale]/(default)/cart/_components/checkout-button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
'use client';

import { Loader2 as Spinner } from 'lucide-react';
import { useTranslations } from 'next-intl';
import { useFormStatus } from 'react-dom';

Expand All @@ -13,15 +12,8 @@ const InternalButton = () => {
const { pending } = useFormStatus();

return (
<Button className="mt-6" disabled={pending}>
{pending ? (
<>
<Spinner aria-hidden="true" className="animate-spin text-primary " />
<span className="sr-only">{t('loading')}</span>
</>
) : (
t('proceedToCheckout')
)}
<Button className="mt-6" loading={pending} loadingText={t('loading')}>
{t('proceedToCheckout')}
</Button>
);
};
Expand Down
18 changes: 8 additions & 10 deletions core/app/[locale]/(default)/cart/_components/coupon-code/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use client';

import { AlertCircle, Loader2 as Spinner } from 'lucide-react';
import { AlertCircle } from 'lucide-react';
import { useFormatter, useTranslations } from 'next-intl';
import { useEffect, useState } from 'react';
import { useFormStatus } from 'react-dom';
Expand All @@ -20,15 +20,13 @@ const SubmitButton = () => {
const { pending } = useFormStatus();

return (
<Button className="items-center px-8 py-2" disabled={pending} variant="secondary">
{pending ? (
<>
<Spinner aria-hidden="true" className="animate-spin" />
<span className="sr-only">{t('spinnerText')}</span>
</>
) : (
<span>{t('submitText')}</span>
)}
<Button
className="items-center px-8 py-2"
loading={pending}
loadingText={t('spinnerText')}
variant="secondary"
>
{t('submitText')}
</Button>
);
};
Expand Down
23 changes: 9 additions & 14 deletions core/app/[locale]/(default)/cart/_components/remove-from-cart-button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,23 @@
'use client';

import { Loader2 as Spinner } from 'lucide-react';
import { useTranslations } from 'next-intl';
import { useFormStatus } from 'react-dom';

import { Button } from '~/components/ui/button';

export const RemoveFromCartButton = () => {
const { pending } = useFormStatus();
const t = useTranslations('Cart.SubmitRemoveItem');

return (
<button
aria-label={t('submitText')}
className="items-center text-primary hover:text-secondary focus-visible:outline-none focus-visible:ring-4 focus-visible:ring-primary/20"
disabled={pending}
<Button
className="w-auto items-center p-0 text-primary hover:bg-transparent disabled:text-primary"
loading={pending}
loadingText={t('spinnerText')}
type="submit"
variant="subtle"
>
{pending ? (
<>
<Spinner aria-hidden="true" className="animate-spin text-primary " />
<span className="sr-only">{t('spinnerText')}</span>
</>
) : (
<>{t('remove')}</>
)}
</button>
{t('remove')}
</Button>
);
};
18 changes: 8 additions & 10 deletions core/app/[locale]/(default)/cart/_components/shipping-info/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AlertCircle, Loader2 as Spinner } from 'lucide-react';
import { AlertCircle } from 'lucide-react';
import { useTranslations } from 'next-intl';
import { useEffect, useReducer } from 'react';
import { useFormStatus } from 'react-dom';
Expand Down Expand Up @@ -37,15 +37,13 @@ const SubmitButton = () => {
const t = useTranslations('Cart.SubmitShippingInfo');

return (
<Button className="w-full items-center px-8 py-2" disabled={pending} variant="secondary">
{pending ? (
<>
<Spinner aria-hidden="true" className="animate-spin" />
<span className="sr-only">{t('spinnerText')}</span>
</>
) : (
<span>{t('submitText')}</span>
)}
<Button
className="w-full items-center px-8 py-2"
loading={pending}
loadingText={t('spinnerText')}
variant="secondary"
>
{t('submitText')}
</Button>
);
};
Expand Down
17 changes: 7 additions & 10 deletions core/app/[locale]/(default)/cart/_components/shipping-options/submit-button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { Loader2 as Spinner } from 'lucide-react';
import { useTranslations } from 'next-intl';
import { useFormStatus } from 'react-dom';

Expand All @@ -9,15 +8,13 @@ export const SubmitButton = () => {
const { pending } = useFormStatus();

return (
<Button className="w-full items-center px-8 py-2" disabled={pending} variant="secondary">
{pending ? (
<>
<Spinner aria-hidden="true" className="animate-spin" />
<span className="sr-only">{t('spinnerText')}</span>
</>
) : (
<span>{t('submitText')}</span>
)}
<Button
className="w-full items-center px-8 py-2"
loading={pending}
loadingText={t('spinnerText')}
variant="secondary"
>
{t('submitText')}
</Button>
);
};
18 changes: 8 additions & 10 deletions core/app/[locale]/(default)/compare/_components/add-to-cart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
'use client';

import { Loader2 as Spinner } from 'lucide-react';
import { useTranslations } from 'next-intl';
import { useFormStatus } from 'react-dom';

Expand All @@ -17,15 +16,14 @@ export const AddToCart = ({
const { pending } = useFormStatus();

return (
<Button aria-label={productName} disabled={disabled || pending} type="submit">
{pending ? (
<>
<Spinner aria-hidden="true" className="animate-spin" />
<span className="sr-only">{t('processing')}</span>
</>
) : (
t('addToCart')
)}
<Button
aria-label={productName}
disabled={disabled}
loading={pending}
loadingText={t('processing')}
type="submit"
>
{t('addToCart')}
</Button>
);
};
16 changes: 3 additions & 13 deletions core/app/[locale]/(default)/login/_components/change-password-form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
'use client';

import { Loader2 as Spinner } from 'lucide-react';
import { useTranslations } from 'next-intl';
import { ChangeEvent, useRef, useState } from 'react';
import { useFormState, useFormStatus } from 'react-dom';
Expand Down Expand Up @@ -33,20 +32,11 @@ const SubmitButton = () => {
<Button
className="relative w-fit items-center px-8 py-2"
data-button
disabled={pending}
loading={pending}
loadingText={t('spinnerText')}
variant="primary"
>
<>
{pending && (
<>
<span className="absolute z-10 flex h-full w-full items-center justify-center bg-gray-400">
<Spinner aria-hidden="true" className="animate-spin" />
</span>
<span className="sr-only">{t('spinnerText')}</span>
</>
)}
<span aria-hidden={pending}>{t('submitText')}</span>
</>
{t('submitText')}
</Button>
);
};
Expand Down
29 changes: 17 additions & 12 deletions core/app/[locale]/(default)/login/_components/login-form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
'use client';

import { Loader2 as Spinner } from 'lucide-react';
import { useTranslations } from 'next-intl';
import { ChangeEvent, useState } from 'react';
import { useFormState, useFormStatus } from 'react-dom';
Expand All @@ -20,8 +19,23 @@ import { Message } from '~/components/ui/message';

import { submitLoginForm } from '../_actions/submit-login-form';

export const LoginForm = () => {
const SubmitButton = () => {
const { pending } = useFormStatus();
const t = useTranslations('Account.Login');

return (
<Button
className="md:w-auto"
loading={pending}
loadingText={t('Form.submitting')}
variant="primary"
>
{t('Form.logIn')}
</Button>
);
};

export const LoginForm = () => {
const [isEmailValid, setIsEmailValid] = useState(true);
const [isPasswordValid, setIsPasswordValid] = useState(true);
const [state, formAction] = useFormState(submitLoginForm, { status: 'idle' });
Expand Down Expand Up @@ -101,16 +115,7 @@ export const LoginForm = () => {
</Field>
<div className="flex flex-col items-start md:flex-row md:items-center md:justify-start md:gap-10">
<FormSubmit asChild>
<Button className="w-auto" disabled={pending} variant="primary">
{pending ? (
<>
<Spinner aria-hidden="true" className="animate-spin" />
<span className="sr-only"> {t('Form.submitting')}</span>
</>
) : (
<span>{t('Form.logIn')}</span>
)}
</Button>
<SubmitButton />
</FormSubmit>
<Link
className="my-5 inline-flex items-center justify-start text-primary hover:text-secondary md:my-0"
Expand Down
16 changes: 3 additions & 13 deletions core/app/[locale]/(default)/login/_components/reset-password-form/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
'use client';

import { Loader2 as Spinner } from 'lucide-react';
import { useTranslations } from 'next-intl';
import { ChangeEvent, useRef, useState } from 'react';
import { useFormStatus } from 'react-dom';
Expand Down Expand Up @@ -40,20 +39,11 @@ const SubmitButton = () => {
<Button
className="relative w-fit items-center px-8 py-2"
data-button
disabled={pending}
loading={pending}
loadingText={t('spinnerText')}
variant="primary"
>
<>
{pending && (
<>
<span className="absolute z-10 flex h-full w-full items-center justify-center bg-gray-400">
<Spinner aria-hidden="true" className="animate-spin" />
</span>
<span className="sr-only">{t('spinnerText')}</span>
</>
)}
<span aria-hidden={pending}>{t('submitText')}</span>
</>
{t('submitText')}
</Button>
);
};
Expand Down
16 changes: 3 additions & 13 deletions ...p/[locale]/(default)/login/register-customer/_components/register-customer-form/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
'use client';

import { Loader2 as Spinner } from 'lucide-react';
import { useTranslations } from 'next-intl';
import { ChangeEvent, useRef, useState } from 'react';
import { useFormStatus } from 'react-dom';
Expand Down Expand Up @@ -101,20 +100,11 @@ const SubmitButton = ({ messages }: SumbitMessages) => {
return (
<Button
className="relative mt-8 w-fit items-center px-8 py-2"
disabled={pending}
loading={pending}
loadingText={messages.submitting}
variant="primary"
>
<>
{pending && (
<>
<span className="absolute z-10 flex h-full w-full items-center justify-center bg-gray-400">
<Spinner aria-hidden="true" className="animate-spin" />
</span>
<span className="sr-only">{messages.submitting}</span>
</>
)}
<span aria-hidden={pending}>{messages.submit}</span>
</>
{messages.submit}
jorgemoya marked this conversation as resolved.
Show resolved Hide resolved
</Button>
);
};
Expand Down
16 changes: 3 additions & 13 deletions core/app/[locale]/(default)/webpages/contact/[id]/contact-us/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
'use client';

import { type FragmentOf } from 'gql.tada';
import { Loader2 as Spinner } from 'lucide-react';
import { useTranslations } from 'next-intl';
import { ChangeEvent, useRef, useState } from 'react';
import { useFormStatus } from 'react-dom';
Expand Down Expand Up @@ -46,20 +45,11 @@ const Submit = () => {
<FormSubmit asChild>
<Button
className="relative mt-8 w-fit items-center px-8 py-2"
disabled={pending}
loading={pending}
loadingText={t('onSubmitText')}
variant="primary"
>
<>
{pending && (
<>
<span className="absolute z-10 flex h-full w-full items-center justify-center bg-gray-400">
<Spinner aria-hidden="true" className="animate-spin" />
</span>
<span className="sr-only">{t('onSubmitText')}</span>
</>
)}
<span aria-hidden={pending}>{t('submitFormText')}</span>
</>
{t('submitFormText')}
</Button>
</FormSubmit>
);
Expand Down
Loading
Loading