Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions .github/workflows/ci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ jobs:
yarn lint-git
# Always run this step so that all linting errors can be seen at once.
if: always()
- name: Prettier
run: yarn prettier-check
# Always run this step so that all linting errors can be seen at once.
if: always()
- name: ESLint
# Disallow warnings and always throw errors.
run: yarn lint --max-warnings 0
Expand Down
12 changes: 3 additions & 9 deletions src/components/ui/button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ const buttonVariants = cva(
}
)


export interface ButtonProps
extends React.ButtonHTMLAttributes<HTMLButtonElement>,
VariantProps<typeof buttonVariants> {
Expand All @@ -43,17 +42,12 @@ export interface ButtonProps

const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
({ className, variant, size, asChild = false, type = 'button', ...props }, ref) => {
const Comp = asChild ? Slot : "button"
const Comp = asChild ? Slot : 'button'
return (
<Comp
className={cn(buttonVariants({ variant, size, className }))}
type={type}
ref={ref}
{...props}
/>
<Comp className={cn(buttonVariants({ variant, size, className }))} type={type} ref={ref} {...props} />
)
}
)
Button.displayName = "Button"
Button.displayName = 'Button'

export { Button, buttonVariants }
4 changes: 2 additions & 2 deletions src/stories/Dialog/Dialog.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,9 @@ export const LongDialog: Story = {
<DialogHeader>
<DialogTitle>Sample Dialog</DialogTitle>
<DialogDescription>
{Array.from({length: 100}).map((_v, i) =>
{Array.from({ length: 100 }).map((_v, i) => (
<p key={i}>Sample description text goes here.</p>
)}
))}
</DialogDescription>
</DialogHeader>
<DialogFooter>
Expand Down