-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
Feat: Implement custom button #7
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,19 @@ | ||
| import { CustomButton } from '@/components/Buttons/CustomButton'; | ||
| import { Chart } from '@/components/Charts/Chart'; | ||
| import container from '@/container'; | ||
| import CountryRepository from '@/domain/repositories/CountryRepository'; | ||
|
|
||
| /** | ||
| * You can use this page to try and show off your components. | ||
| * It's not accessible from the UI, but you can reach it by manually navigating to /elements | ||
| */ | ||
| export default async function Elements() { | ||
| const countryData = await container.resolve<CountryRepository>('CountryRepository').getCountryData(50); | ||
| return <Chart chartData={countryData.fcsGraph} />; | ||
| return ( | ||
| <div> | ||
| <Chart chartData={countryData.fcsGraph} />;<CustomButton variant="solid">Test</CustomButton> | ||
| <CustomButton variant="bordered">Test</CustomButton> | ||
| <CustomButton variant="flat">Test</CustomButton> | ||
| </div> | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| import { Button } from '@nextui-org/button'; | ||
| import clsx from 'clsx'; | ||
|
|
||
| import { CustomButtonProps } from '@/domain/props/CustomButtonProps'; | ||
|
|
||
| /** | ||
| * Custom button component in the variants solid, bordered and flat. It can be used like a normal NextUI button | ||
| * component. | ||
| * @param variant solid | bordered | flat | ||
| */ | ||
|
|
||
| export function CustomButton({ children, ...attributes }: CustomButtonProps) { | ||
| const { variant } = attributes; | ||
|
|
||
| return ( | ||
| <Button | ||
| {...attributes} | ||
| className={clsx({ | ||
| 'hover:bg-outlinedHover': variant === 'bordered', | ||
| 'hover:bg-hover dark:text-foreground': variant === 'flat' || variant === 'solid', | ||
| 'bg-clickableSecondary hover:text-background ': variant === 'flat', | ||
| 'bg-primary dark:hover:bg-hover text-background': variant === 'solid', | ||
| })} | ||
| > | ||
| {children} | ||
| </Button> | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| import { ButtonProps } from '@nextui-org/button'; | ||
|
|
||
| export interface CustomButtonProps extends ButtonProps { | ||
| children: React.ReactNode; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This file contains a lot of duplicated code. Generally all cases could be summarized in one and there is no need of having the same component with few changes for all cases. Imagine having 100 variants for the button, this simply will not work and the file will grow a lot. It's considered a good practice to separate the concerns (here styling and react component).
Nevertheless we use tailwindcss, which means we do not use
styleon the component but everything will be withclassName="tailwindClasses". Also you do not need to check for the theme here, neither you do need the useEffects for the theme switch. Everything you need will be handled by NextUI and TailwindCSS. Colors and everything will be defined in thiw way, not custom css colors: Check here. Also check the existingtailwind.config.jsand research how to apply all colors and customize them there.