配置 mdx 与 turbopack 继承;修复退出登录后循环跳转的问题;button 统一复用可导出样式并微调样式
This commit is contained in:
@@ -1,67 +1,44 @@
|
||||
import * as React from 'react'
|
||||
import {merge} from '@/lib/utils'
|
||||
import {cva} from 'class-variance-authority'
|
||||
import {cva, VariantProps} from 'class-variance-authority'
|
||||
|
||||
const buttonVariants = cva(
|
||||
'inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0',
|
||||
export const buttonVariants = cva(
|
||||
[
|
||||
`transition-all duration-200 ease-in-out`,
|
||||
`h-10 px-4 rounded-md cursor-pointer whitespace-nowrap`,
|
||||
'inline-flex items-center justify-center gap-2',
|
||||
'[&_svg]:pointer-events-none [&_svg:not([class*=\'size-\'])]:size-4 shrink-0 [&_svg]:shrink-0 ',
|
||||
'outline-none focus-visible:ring-4 ring-blue-200',
|
||||
'disabled:pointer-events-none disabled:opacity-50 ',
|
||||
'aria-invalid:ring-fail/20 dark:aria-invalid:ring-fail/40 aria-invalid:border-fail',
|
||||
],
|
||||
{
|
||||
variants: {
|
||||
variant: {
|
||||
default:
|
||||
'bg-primary text-primary-foreground shadow hover:bg-primary/90',
|
||||
destructive:
|
||||
'bg-fail text-fail-foreground shadow-sm hover:bg-destructive/90',
|
||||
outline:
|
||||
'border border-input shadow-sm hover:bg-secondary hover:text-secondary-foreground bg-card',
|
||||
secondary:
|
||||
'bg-secondary text-secondary-foreground shadow-sm hover:bg-secondary/80',
|
||||
ghost: 'hover:bg-secondary hover:text-secondary-foreground',
|
||||
link: 'text-primary underline-offset-4 hover:underline',
|
||||
},
|
||||
size: {
|
||||
default: 'h-9 px-4 py-2',
|
||||
sm: 'h-8 rounded-md px-3 text-xs',
|
||||
lg: 'h-10 rounded-md px-8',
|
||||
icon: 'h-9 w-9',
|
||||
theme: {
|
||||
gradient: 'bg-gradient-to-r from-blue-400 to-cyan-300 text-white ring-offset-2',
|
||||
default: 'bg-primary text-primary-foreground hover:bg-primary/90',
|
||||
outline: 'border bg-background hover:bg-secondary hover:text-secondary-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50',
|
||||
ghost: 'text-foreground hover:bg-muted',
|
||||
accent: 'bg-accent text-accent-foreground hover:bg-accent/90',
|
||||
fail: 'bg-fail text-white hover:bg-fail/90',
|
||||
warn: '',
|
||||
done: '',
|
||||
},
|
||||
},
|
||||
defaultVariants: {
|
||||
variant: 'default',
|
||||
size: 'default',
|
||||
theme: 'default',
|
||||
},
|
||||
},
|
||||
)
|
||||
|
||||
type ButtonProps = React.ComponentProps<'button'> & {
|
||||
theme?: 'default' | 'outline' | 'gradient' | 'error' | 'accent' | 'ghost'
|
||||
}
|
||||
type ButtonProps = React.ComponentProps<'button'> & VariantProps<typeof buttonVariants>
|
||||
|
||||
function Button(rawProps: ButtonProps) {
|
||||
export function Button(rawProps: ButtonProps) {
|
||||
const {className, theme, ...props} = rawProps
|
||||
return (
|
||||
<button
|
||||
{...props}
|
||||
className={merge(
|
||||
`transition-all duration-200 ease-in-out`,
|
||||
`h-10 px-4 rounded-md cursor-pointer`,
|
||||
'whitespace-nowrap',
|
||||
'inline-flex items-center justify-center gap-2',
|
||||
'disabled:pointer-events-none disabled:opacity-50 ',
|
||||
'[&_svg]:pointer-events-none [&_svg:not([class*=\'size-\'])]:size-4 shrink-0 [&_svg]:shrink-0 ',
|
||||
'outline-none focus-visible:ring-4 ring-blue-200',
|
||||
'aria-invalid:ring-fail/20 dark:aria-invalid:ring-fail/40 aria-invalid:border-fail',
|
||||
{
|
||||
gradient: 'bg-gradient-to-r from-blue-400 to-cyan-300 text-white ring-offset-2',
|
||||
default: 'bg-primary text-primary-foreground hover:bg-primary/90',
|
||||
accent: 'bg-accent text-accent-foreground hover:bg-accent/90',
|
||||
error: 'bg-fail text-white hover:bg-fail/90',
|
||||
outline: 'border bg-background hover:bg-secondary hover:text-secondary-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50',
|
||||
ghost: 'text-foreground hover:bg-muted',
|
||||
}[theme ?? 'default'],
|
||||
className,
|
||||
)}
|
||||
className={merge(buttonVariants({theme}), className)}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
export {Button, buttonVariants}
|
||||
|
||||
@@ -24,7 +24,7 @@ function Calendar({
|
||||
caption_label: "text-sm font-medium",
|
||||
nav: "flex items-center gap-1",
|
||||
nav_button: merge(
|
||||
buttonVariants({ variant: "outline" }),
|
||||
buttonVariants({ theme: "outline" }),
|
||||
"size-7 bg-transparent p-0 opacity-50 hover:opacity-100"
|
||||
),
|
||||
nav_button_previous: "absolute left-1",
|
||||
@@ -41,7 +41,7 @@ function Calendar({
|
||||
: "[&:has([aria-selected])]:rounded-md"
|
||||
),
|
||||
day: merge(
|
||||
buttonVariants({ variant: "ghost" }),
|
||||
buttonVariants({ theme: "ghost" }),
|
||||
"size-8 p-0 font-normal aria-selected:opacity-100"
|
||||
),
|
||||
day_range_start:
|
||||
|
||||
@@ -26,7 +26,7 @@ function TabsList({
|
||||
<TabsPrimitive.List
|
||||
data-slot="tabs-list"
|
||||
className={merge(
|
||||
"bg-muted text-muted-foreground inline-flex w-fit items-center justify-center rounded-lg p-1 h-10",
|
||||
"bg-muted text-muted-foreground inline-flex w-fit items-center justify-center rounded-lg p-1",
|
||||
className
|
||||
)}
|
||||
{...props}
|
||||
|
||||
Reference in New Issue
Block a user