diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/collapsible/collapsible-params.vue b/packages/@core/ui-kit/shadcn-ui/src/components/collapsible/collapsible-params.vue index a9341c1d..921dcfb6 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/components/collapsible/collapsible-params.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/components/collapsible/collapsible-params.vue @@ -202,8 +202,7 @@ defineExpose({
diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/accordion/AccordionTrigger.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/accordion/AccordionTrigger.vue index 49f90dfa..b911eff7 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/ui/accordion/AccordionTrigger.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/ui/accordion/AccordionTrigger.vue @@ -23,7 +23,7 @@ const delegatedProps = reactiveOmit(props, 'class'); v-bind="delegatedProps" :class=" cn( - 'focus-visible:border-ring focus-visible:ring-ring/50 flex flex-1 items-start justify-between gap-4 rounded-md py-4 text-left text-sm font-medium transition-all outline-none hover:underline focus-visible:ring-[3px] disabled:pointer-events-none disabled:opacity-50 [&[data-state=open]>svg]:rotate-180', + 'focus-visible:border-ring focus-visible:ring-ring/50 flex flex-1 items-start justify-between gap-4 rounded-md py-4 text-left text-sm font-medium transition-all outline-none hover:underline focus-visible:ring-3 disabled:pointer-events-none disabled:opacity-50 [&[data-state=open]>svg]:rotate-180', props.class, ) " diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/badge/badge.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/badge/badge.ts index edd548b0..db437fe8 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/ui/badge/badge.ts +++ b/packages/@core/ui-kit/shadcn-ui/src/ui/badge/badge.ts @@ -3,7 +3,7 @@ import type { VariantProps } from 'class-variance-authority'; import { cva } from 'class-variance-authority'; export const badgeVariants = cva( - 'inline-flex items-center justify-center rounded-full border px-2 py-0.5 text-xs font-medium w-fit whitespace-nowrap shrink-0 [&>svg]:size-3 gap-1 [&>svg]:pointer-events-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive transition-[color,box-shadow] overflow-hidden', + 'inline-flex items-center justify-center rounded-full border px-2 py-0.5 text-xs font-medium w-fit whitespace-nowrap shrink-0 [&>svg]:size-3 gap-1 [&>svg]:pointer-events-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-3 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive transition-[color,box-shadow] overflow-hidden', { variants: { variant: { diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/checkbox/Checkbox.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/checkbox/Checkbox.vue index 87e93702..00d5aa52 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/ui/checkbox/Checkbox.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/ui/checkbox/Checkbox.vue @@ -29,7 +29,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits); v-bind="forwarded" :class=" cn( - 'peer border-input data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground data-[state=checked]:border-primary focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive size-4 shrink-0 rounded-[4px] border shadow-xs transition-shadow outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50', + 'peer border-input data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground data-[state=checked]:border-primary focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive size-4 shrink-0 rounded-sm border shadow-xs transition-shadow outline-none focus-visible:ring-3 disabled:cursor-not-allowed disabled:opacity-50', indeterminate && 'bg-primary text-primary-foreground border-primary', props.class, ) diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/pin-input/PinInputSlot.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/pin-input/PinInputSlot.vue index 8802c772..f103bb70 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/ui/pin-input/PinInputSlot.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/ui/pin-input/PinInputSlot.vue @@ -23,7 +23,7 @@ const forwardedProps = useForwardProps(delegatedProps); v-bind="forwardedProps" :class=" cn( - 'border-input focus:border-ring focus:ring-ring/50 focus:aria-invalid:ring-destructive/20 dark:bg-input/30 dark:focus:aria-invalid:ring-destructive/40 aria-invalid:border-destructive focus:aria-invalid:border-destructive relative flex h-9 w-9 items-center justify-center border-y border-r text-sm shadow-xs transition-all outline-none text-center first:rounded-l-md first:border-l last:rounded-r-md focus:z-10 focus:ring-[3px]', + 'border-input focus:border-ring focus:ring-ring/50 focus:aria-invalid:ring-destructive/20 dark:bg-input/30 dark:focus:aria-invalid:ring-destructive/40 aria-invalid:border-destructive focus:aria-invalid:border-destructive relative flex h-9 w-9 items-center justify-center border-y border-r text-sm shadow-xs transition-all outline-none text-center first:rounded-l-md first:border-l last:rounded-r-md focus:z-10 focus:ring-3', props.class, ) " diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/radio-group/RadioGroupItem.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/radio-group/RadioGroupItem.vue index 9ac7e889..3d1f4f6e 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/ui/radio-group/RadioGroupItem.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/ui/radio-group/RadioGroupItem.vue @@ -24,7 +24,7 @@ const forwardedProps = useForwardProps(delegatedProps); v-bind="forwardedProps" :class=" cn( - 'border-input text-primary focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 aspect-square size-4 shrink-0 rounded-full border shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50', + 'border-input text-primary focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 aspect-square size-4 shrink-0 rounded-full border shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-3 disabled:cursor-not-allowed disabled:opacity-50', props.class, ) " diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectTrigger.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectTrigger.vue index 64393dec..fde89684 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectTrigger.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectTrigger.vue @@ -30,7 +30,7 @@ const forwardedProps = useForwardProps(delegatedProps); v-bind="forwardedProps" :class=" cn( - 'border-input data-[placeholder]:text-muted-foreground [&_svg:not([class*=\'text-\'])]:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 dark:hover:bg-input/50 flex w-fit items-center justify-between gap-2 rounded-md border bg-transparent px-3 py-2 text-sm whitespace-nowrap shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 data-[size=default]:h-9 data-[size=sm]:h-8 *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-2 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*=\'size-\'])]:size-4', + 'border-input data-[placeholder]:text-muted-foreground [&_svg:not([class*=\'text-\'])]:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 dark:hover:bg-input/50 flex w-fit items-center justify-between gap-2 rounded-md border bg-transparent px-3 py-2 text-sm whitespace-nowrap shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-3 disabled:cursor-not-allowed disabled:opacity-50 data-[size=default]:h-9 data-[size=sm]:h-8 *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-2 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*=\'size-\'])]:size-4', props.class, ) " diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/switch/Switch.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/switch/Switch.vue index e3e3b954..41105d13 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/ui/switch/Switch.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/ui/switch/Switch.vue @@ -26,7 +26,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits); v-bind="forwarded" :class=" cn( - 'peer data-[state=checked]:bg-primary data-[state=unchecked]:bg-input focus-visible:border-ring focus-visible:ring-ring/50 dark:data-[state=unchecked]:bg-input/80 inline-flex h-[1.15rem] w-8 shrink-0 items-center rounded-full border border-transparent shadow-xs transition-all outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50', + 'peer data-[state=checked]:bg-primary data-[state=unchecked]:bg-input focus-visible:border-ring focus-visible:ring-ring/50 dark:data-[state=unchecked]:bg-input/80 inline-flex h-[1.15rem] w-8 shrink-0 items-center rounded-full border border-transparent shadow-xs transition-all outline-none focus-visible:ring-3 disabled:cursor-not-allowed disabled:opacity-50', props.class, ) " diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/tabs/TabsTrigger.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/tabs/TabsTrigger.vue index 79616251..237732d8 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/ui/tabs/TabsTrigger.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/ui/tabs/TabsTrigger.vue @@ -22,7 +22,7 @@ const forwardedProps = useForwardProps(delegatedProps); data-slot="tabs-trigger" :class=" cn( - 'data-[state=active]:bg-background dark:data-[state=active]:text-foreground focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:outline-ring dark:data-[state=active]:border-input dark:data-[state=active]:bg-input/30 text-foreground dark:text-muted-foreground inline-flex h-[calc(100%-1px)] flex-1 items-center justify-center gap-1.5 rounded-md border border-transparent px-2 py-1 text-sm font-medium whitespace-nowrap transition-[color,box-shadow] focus-visible:ring-[3px] focus-visible:outline-1 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:shadow-sm [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*=\'size-\'])]:size-4', + 'data-[state=active]:bg-background dark:data-[state=active]:text-foreground focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:outline-ring dark:data-[state=active]:border-input dark:data-[state=active]:bg-input/30 text-foreground dark:text-muted-foreground inline-flex h-[calc(100%-1px)] flex-1 items-center justify-center gap-1.5 rounded-md border border-transparent px-2 py-1 text-sm font-medium whitespace-nowrap transition-[color,box-shadow] focus-visible:ring-3 focus-visible:outline-1 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:shadow-sm [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*=\'size-\'])]:size-4', props.class, ) " diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/textarea/Textarea.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/textarea/Textarea.vue index 41298951..43389fbc 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/ui/textarea/Textarea.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/ui/textarea/Textarea.vue @@ -27,7 +27,7 @@ const modelValue = useVModel(props, 'modelValue', emits, { data-slot="textarea" :class=" cn( - 'border-input placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 flex field-sizing-content min-h-16 w-full rounded-md border bg-transparent px-3 py-2 text-base shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 md:text-sm', + 'border-input placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 flex field-sizing-content min-h-16 w-full rounded-md border bg-transparent px-3 py-2 text-base shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-3 disabled:cursor-not-allowed disabled:opacity-50 md:text-sm', props.class, ) " diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/toggle/toggle.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/toggle/toggle.ts index c42477cf..a672fe1d 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/ui/toggle/toggle.ts +++ b/packages/@core/ui-kit/shadcn-ui/src/ui/toggle/toggle.ts @@ -3,7 +3,7 @@ import type { VariantProps } from 'class-variance-authority'; import { cva } from 'class-variance-authority'; export const toggleVariants = cva( - "inline-flex items-center justify-center gap-2 rounded-md text-sm font-medium hover:bg-muted hover:text-muted-foreground disabled:pointer-events-none disabled:opacity-50 data-[state=on]:bg-accent data-[state=on]:text-accent-foreground [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 [&_svg]:shrink-0 focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] outline-none transition-[color,box-shadow] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive whitespace-nowrap", + "inline-flex items-center justify-center gap-2 rounded-md text-sm font-medium hover:bg-muted hover:text-muted-foreground disabled:pointer-events-none disabled:opacity-50 data-[state=on]:bg-accent data-[state=on]:text-accent-foreground [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 [&_svg]:shrink-0 focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-3 outline-none transition-[color,box-shadow] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive whitespace-nowrap", { variants: { variant: { diff --git a/playground/src/views/demos/form-array/index.vue b/playground/src/views/demos/form-array/index.vue index 702c1960..699c5ba3 100644 --- a/playground/src/views/demos/form-array/index.vue +++ b/playground/src/views/demos/form-array/index.vue @@ -57,7 +57,7 @@ const formattedSubmitValues = computed(() => const outputClass = [ 'bg-muted', 'text-muted-foreground', - 'max-h-[420px]', + 'max-h-105', 'overflow-auto', 'rounded-md', 'p-3',