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

OPHJOD-300: Add hover style for RoundButton/RoundLinkButton #41

Merged
merged 1 commit into from
Apr 26, 2024
Merged

OPHJOD-300: Add hover style for RoundButton/RoundLinkButton #41

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
10 changes: 7 additions & 3 deletions lib/components/RoundButton/RoundButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,19 @@ export const RoundButton = ({
disabled={disabled}
type="button"
onClick={onClick}
className={`${className ? className : ''} flex flex-col justify-center ${disabled ? 'cursor-not-allowed opacity-50' : ''} min-w-[110px] items-center gap-2`.trim()}
className={`${className ? className : ''} group flex flex-col justify-center ${disabled ? 'cursor-not-allowed opacity-50' : ''} min-w-[110px] items-center gap-2`.trim()}
>
<span
aria-hidden
className={`size-[72px] rounded-full ${selected ? 'bg-accent' : 'bg-bg-gray'} flex items-center justify-center ${selected ? 'text-white' : 'text-secondary-gray'} material-symbols-outlined size-48 select-none`}
className={`size-[72px] rounded-full ${selected ? 'bg-accent' : 'bg-bg-gray'} flex items-center justify-center ${selected ? 'text-white' : 'text-primary-gray hover:text-accent'} material-symbols-outlined size-48 select-none`}
>
{icon}
</span>
<span className={`text-button-sm ${selected ? 'text-accent' : 'text-primary-gray'}`}>{label}</span>
<span
className={`text-button-sm ${selected ? 'text-accent' : 'text-primary-gray'} group-hover:text-accent group-hover:underline`}
>
{label}
</span>
</button>
);
};
24 changes: 12 additions & 12 deletions lib/components/RoundButton/__snapshots__/RoundButton.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@

exports[`Snapshot testing > Default 1`] = `
<button
class="flex flex-col justify-center min-w-[110px] items-center gap-2"
class="group flex flex-col justify-center min-w-[110px] items-center gap-2"
type="button"
>
<span
aria-hidden="true"
class="size-[72px] rounded-full bg-bg-gray flex items-center justify-center text-secondary-gray material-symbols-outlined size-48 select-none"
class="size-[72px] rounded-full bg-bg-gray flex items-center justify-center text-primary-gray hover:text-accent material-symbols-outlined size-48 select-none"
>
target
</span>
<span
class="text-button-sm text-primary-gray"
class="text-button-sm text-primary-gray group-hover:text-accent group-hover:underline"
>
Default
</span>
Expand All @@ -21,17 +21,17 @@ exports[`Snapshot testing > Default 1`] = `

exports[`Snapshot testing > Disabled, non-selected 1`] = `
<button
class="flex flex-col justify-center min-w-[110px] items-center gap-2"
class="group flex flex-col justify-center min-w-[110px] items-center gap-2"
type="button"
>
<span
aria-hidden="true"
class="size-[72px] rounded-full bg-bg-gray flex items-center justify-center text-secondary-gray material-symbols-outlined size-48 select-none"
class="size-[72px] rounded-full bg-bg-gray flex items-center justify-center text-primary-gray hover:text-accent material-symbols-outlined size-48 select-none"
>
target
</span>
<span
class="text-button-sm text-primary-gray"
class="text-button-sm text-primary-gray group-hover:text-accent group-hover:underline"
>
Disabled, non-selected
</span>
Expand All @@ -40,7 +40,7 @@ exports[`Snapshot testing > Disabled, non-selected 1`] = `

exports[`Snapshot testing > Disabled, selected 1`] = `
<button
class="flex flex-col justify-center min-w-[110px] items-center gap-2"
class="group flex flex-col justify-center min-w-[110px] items-center gap-2"
type="button"
>
<span
Expand All @@ -50,7 +50,7 @@ exports[`Snapshot testing > Disabled, selected 1`] = `
target
</span>
<span
class="text-button-sm text-accent"
class="text-button-sm text-accent group-hover:text-accent group-hover:underline"
>
Disabled, non-selected
</span>
Expand All @@ -59,7 +59,7 @@ exports[`Snapshot testing > Disabled, selected 1`] = `

exports[`Snapshot testing > Disabled, selected 2`] = `
<button
class="flex flex-col justify-center min-w-[110px] items-center gap-2"
class="group flex flex-col justify-center min-w-[110px] items-center gap-2"
type="button"
>
<span
Expand All @@ -69,7 +69,7 @@ exports[`Snapshot testing > Disabled, selected 2`] = `
target
</span>
<span
class="text-button-sm text-accent"
class="text-button-sm text-accent group-hover:text-accent group-hover:underline"
>
Disabled, non-selected
</span>
Expand All @@ -78,7 +78,7 @@ exports[`Snapshot testing > Disabled, selected 2`] = `

exports[`Snapshot testing > selected 1`] = `
<button
class="flex flex-col justify-center min-w-[110px] items-center gap-2"
class="group flex flex-col justify-center min-w-[110px] items-center gap-2"
type="button"
>
<span
Expand All @@ -88,7 +88,7 @@ exports[`Snapshot testing > selected 1`] = `
target
</span>
<span
class="text-button-sm text-accent"
class="text-button-sm text-accent group-hover:text-accent group-hover:underline"
>
Selected
</span>
Expand Down
10 changes: 7 additions & 3 deletions lib/components/RoundLinkButton/RoundLinkButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,19 @@ export const RoundLinkButton = ({
return (
<Component
{...rest}
className={`${className ? className : ''} inline-flex min-w-[110px] flex-col items-center justify-center gap-2 border border-none no-underline`}
className={`${className ? className : ''} group inline-flex min-w-[110px] flex-col items-center justify-center gap-2 border border-none no-underline`}
>
<span
aria-hidden
className={`${selected ? 'text-white' : 'text-secondary-gray'} material-symbols-outlined size-48 flex size-[72px] select-none items-center justify-center self-center rounded-full ${selected ? 'bg-[#697077]' : 'bg-[#f5f5f5]'}`}
className={`${selected ? 'text-white' : 'text-primary-gray'} material-symbols-outlined size-48 group- flex size-[72px] select-none items-center justify-center self-center rounded-full ${selected ? 'bg-accent' : 'bg-bg-gray hover:text-accent'}`}
>
{icon}
</span>
<span className={`text-button-sm ${selected ? 'text-accent' : 'text-primary-gray'}`}>{label}</span>
<span
className={`text-button-sm ${selected ? 'text-accent' : 'text-primary-gray'} group-hover:text-accent group-hover:underline`}
>
{label}
</span>
</Component>
);
};
30 changes: 15 additions & 15 deletions lib/components/RoundLinkButton/__snapshots__/RoundLinkButton.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@

exports[`Snapshot testing > Default 1`] = `
<a
class=" inline-flex min-w-[110px] flex-col items-center justify-center gap-2 border border-none no-underline"
class=" group inline-flex min-w-[110px] flex-col items-center justify-center gap-2 border border-none no-underline"
href="/#"
>
<span
aria-hidden="true"
class="text-secondary-gray material-symbols-outlined size-48 flex size-[72px] select-none items-center justify-center self-center rounded-full bg-[#f5f5f5]"
class="text-primary-gray material-symbols-outlined size-48 group- flex size-[72px] select-none items-center justify-center self-center rounded-full bg-bg-gray hover:text-accent"
>
target
</span>
<span
class="text-button-sm text-primary-gray"
class="text-button-sm text-primary-gray group-hover:text-accent group-hover:underline"
>
Default
</span>
Expand All @@ -21,17 +21,17 @@ exports[`Snapshot testing > Default 1`] = `

exports[`Snapshot testing > Disabled, non-selected 1`] = `
<a
class=" inline-flex min-w-[110px] flex-col items-center justify-center gap-2 border border-none no-underline"
class=" group inline-flex min-w-[110px] flex-col items-center justify-center gap-2 border border-none no-underline"
href="/#"
>
<span
aria-hidden="true"
class="text-secondary-gray material-symbols-outlined size-48 flex size-[72px] select-none items-center justify-center self-center rounded-full bg-[#f5f5f5]"
class="text-primary-gray material-symbols-outlined size-48 group- flex size-[72px] select-none items-center justify-center self-center rounded-full bg-bg-gray hover:text-accent"
>
target
</span>
<span
class="text-button-sm text-primary-gray"
class="text-button-sm text-primary-gray group-hover:text-accent group-hover:underline"
>
Disabled, nonselected
</span>
Expand All @@ -40,17 +40,17 @@ exports[`Snapshot testing > Disabled, non-selected 1`] = `

exports[`Snapshot testing > Disabled, selected 1`] = `
<a
class=" inline-flex min-w-[110px] flex-col items-center justify-center gap-2 border border-none no-underline"
class=" group inline-flex min-w-[110px] flex-col items-center justify-center gap-2 border border-none no-underline"
href="/#"
>
<span
aria-hidden="true"
class="text-white material-symbols-outlined size-48 flex size-[72px] select-none items-center justify-center self-center rounded-full bg-[#697077]"
class="text-white material-symbols-outlined size-48 group- flex size-[72px] select-none items-center justify-center self-center rounded-full bg-accent"
>
target
</span>
<span
class="text-button-sm text-accent"
class="text-button-sm text-accent group-hover:text-accent group-hover:underline"
>
Disabled, nonselected
</span>
Expand All @@ -59,17 +59,17 @@ exports[`Snapshot testing > Disabled, selected 1`] = `

exports[`Snapshot testing > Disabled, selected 2`] = `
<a
class=" inline-flex min-w-[110px] flex-col items-center justify-center gap-2 border border-none no-underline"
class=" group inline-flex min-w-[110px] flex-col items-center justify-center gap-2 border border-none no-underline"
href="/#"
>
<span
aria-hidden="true"
class="text-white material-symbols-outlined size-48 flex size-[72px] select-none items-center justify-center self-center rounded-full bg-[#697077]"
class="text-white material-symbols-outlined size-48 group- flex size-[72px] select-none items-center justify-center self-center rounded-full bg-accent"
>
target
</span>
<span
class="text-button-sm text-accent"
class="text-button-sm text-accent group-hover:text-accent group-hover:underline"
>
Disabled, nonselected
</span>
Expand All @@ -78,17 +78,17 @@ exports[`Snapshot testing > Disabled, selected 2`] = `

exports[`Snapshot testing > selected 1`] = `
<a
class=" inline-flex min-w-[110px] flex-col items-center justify-center gap-2 border border-none no-underline"
class=" group inline-flex min-w-[110px] flex-col items-center justify-center gap-2 border border-none no-underline"
href="/#"
>
<span
aria-hidden="true"
class="text-white material-symbols-outlined size-48 flex size-[72px] select-none items-center justify-center self-center rounded-full bg-[#697077]"
class="text-white material-symbols-outlined size-48 group- flex size-[72px] select-none items-center justify-center self-center rounded-full bg-accent"
>
target
</span>
<span
class="text-button-sm text-accent"
class="text-button-sm text-accent group-hover:text-accent group-hover:underline"
>
Selected
</span>
Expand Down