From 86d64f34833718dbf24ce67e234dc0b0dc8b2b3b Mon Sep 17 00:00:00 2001 From: Jason Rasmussen Date: Thu, 15 May 2025 18:31:33 -0400 Subject: [PATCH] refactor: buttons (#18317) * refactor: buttons * fix: woopsie --------- Co-authored-by: Daniel Dietzler <36593685+danieldietzler@users.noreply.github.com> --- .../elements/buttons/__test__/button.spec.ts | 20 --- .../components/elements/buttons/button.svelte | 123 ------------------ .../elements/buttons/skip-link.svelte | 5 +- .../faces-page/edit-name-input.svelte | 8 +- .../manage-people-visibility.svelte | 9 +- .../faces-page/merge-face-selector.svelte | 9 +- .../faces-page/unmerge-face-selector.svelte | 32 ++--- .../forms/library-scan-settings-form.svelte | 21 +-- .../components/forms/tag-asset-form.svelte | 14 +- .../onboarding-page/onboarding-hello.svelte | 10 +- .../onboarding-page/onboarding-privacy.svelte | 20 +-- .../onboarding-storage-template.svelte | 22 ++-- .../onboarding-page/onboarding-theme.svelte | 12 +- .../navigation-bar/account-info-panel.svelte | 21 ++- .../profile-image-cropper.svelte | 10 +- .../individual-purchase-option-card.svelte | 4 +- .../purchase-activation-success.svelte | 4 +- .../purchasing/purchase-content.svelte | 5 +- .../server-purchase-option-card.svelte | 4 +- .../search-bar/search-people-section.svelte | 17 +-- .../version-announcement-box.svelte | 8 +- .../lib/components/slideshow-settings.svelte | 8 +- .../duplicates-compare-control.svelte | 22 +++- .../modals/PersonEditBirthDateModal.svelte | 11 +- .../[[assetId=id]]/+page.svelte | 6 +- .../[[assetId=id]]/+page.svelte | 2 +- 26 files changed, 148 insertions(+), 279 deletions(-) delete mode 100644 web/src/lib/components/elements/buttons/__test__/button.spec.ts delete mode 100644 web/src/lib/components/elements/buttons/button.svelte diff --git a/web/src/lib/components/elements/buttons/__test__/button.spec.ts b/web/src/lib/components/elements/buttons/__test__/button.spec.ts deleted file mode 100644 index 0539315c57..0000000000 --- a/web/src/lib/components/elements/buttons/__test__/button.spec.ts +++ /dev/null @@ -1,20 +0,0 @@ -import Button from '$lib/components/elements/buttons/button.svelte'; -import { render, screen } from '@testing-library/svelte'; - -describe('Button component', () => { - it('should render as a button', () => { - render(Button); - const button = screen.getByRole('button'); - expect(button).toBeInTheDocument(); - expect(button).toHaveAttribute('type', 'button'); - expect(button).not.toHaveAttribute('href'); - }); - - it('should render as a link if href prop is set', () => { - render(Button, { props: { href: '/test' } }); - const link = screen.getByRole('link'); - expect(link).toBeInTheDocument(); - expect(link).toHaveAttribute('href', '/test'); - expect(link).not.toHaveAttribute('type'); - }); -}); diff --git a/web/src/lib/components/elements/buttons/button.svelte b/web/src/lib/components/elements/buttons/button.svelte deleted file mode 100644 index ac7d9808f3..0000000000 --- a/web/src/lib/components/elements/buttons/button.svelte +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - {@render children?.()} - diff --git a/web/src/lib/components/elements/buttons/skip-link.svelte b/web/src/lib/components/elements/buttons/skip-link.svelte index b8f8fcd483..65e5001f8a 100644 --- a/web/src/lib/components/elements/buttons/skip-link.svelte +++ b/web/src/lib/components/elements/buttons/skip-link.svelte @@ -1,7 +1,7 @@ @@ -39,6 +39,6 @@ - + diff --git a/web/src/lib/components/shared-components/purchasing/purchase-activation-success.svelte b/web/src/lib/components/shared-components/purchasing/purchase-activation-success.svelte index 1b1a91d163..387f01395d 100644 --- a/web/src/lib/components/shared-components/purchasing/purchase-activation-success.svelte +++ b/web/src/lib/components/shared-components/purchasing/purchase-activation-success.svelte @@ -1,9 +1,9 @@ @@ -39,6 +39,6 @@ - + diff --git a/web/src/lib/components/shared-components/search-bar/search-people-section.svelte b/web/src/lib/components/shared-components/search-bar/search-people-section.svelte index e4b6ae7c3b..270be62527 100644 --- a/web/src/lib/components/shared-components/search-bar/search-people-section.svelte +++ b/web/src/lib/components/shared-components/search-bar/search-people-section.svelte @@ -1,13 +1,12 @@