@octanejs/shadcn 0.0.37 → 0.0.39

package/src/bases/radix/ui/toggle.tsrx

@@ -4,7 +4,7 @@
 import { cva, type VariantProps } from 'class-variance-authority';
 import { Toggle as TogglePrimitive } from '@octanejs/radix';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 
 export const toggleVariants = cva(
 	'inline-flex items-center justify-center gap-2 rounded-md text-sm font-medium whitespace-nowrap transition-[color,box-shadow] outline-none hover:bg-muted hover:text-muted-foreground focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:pointer-events-none disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 data-[state=on]:bg-accent data-[state=on]:text-accent-foreground dark:aria-invalid:ring-destructive/40 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*=\'size-\'])]:size-4',

package/src/bases/radix/ui/tooltip.tsrx

@@ -10,7 +10,7 @@
 import { createElement, type OctaneNode } from 'octane';
 import { Tooltip as TooltipPrimitive } from '@octanejs/radix';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 
 export interface TooltipProviderProps extends Record<string, unknown> {
 	delayDuration?: number;

package/src/bases/react-aria/ui/accordion.tsrx

@@ -11,7 +11,7 @@ import {
 	type DisclosureProps,
 } from '@octanejs/aria/components';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 import { ChevronDownIcon, ChevronUpIcon } from '@octanejs/lucide';
 
 export function Accordion({ className, ...props }: DisclosureGroupProps) {

package/src/bases/react-aria/ui/alert-dialog.tsrx

@@ -14,7 +14,7 @@ import {
 } from '@octanejs/aria/components';
 import type { HeadingProps } from '@octanejs/aria/components';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 import type { HostProps } from '../../../lib/types';
 import { Button } from './button.tsrx';
 

package/src/bases/react-aria/ui/alert.tsrx

@@ -1,6 +1,6 @@
 import { cva, type VariantProps } from 'class-variance-authority';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 import type { HostProps } from '../../../lib/types';
 
 const alertVariants = cva(

package/src/bases/react-aria/ui/aspect-ratio.tsrx

@@ -1,4 +1,4 @@
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 import type { HostProps } from '../../../lib/types';
 
 export function AspectRatio({ ratio, className, ...props }: HostProps<'div'> & { ratio: number }) {

package/src/bases/react-aria/ui/avatar.tsrx

@@ -1,6 +1,6 @@
 import { useState } from 'octane';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 import type { HostProps } from '../../../lib/types';
 
 export function Avatar({ className, size = 'default', ...props }: HostProps<'div'> & {

package/src/bases/react-aria/ui/badge.tsrx

@@ -1,7 +1,7 @@
 import { type OctaneNode } from 'octane';
 import { cva, type VariantProps } from 'class-variance-authority';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 import type { HostProps } from '../../../lib/types';
 
 export const badgeVariants = cva(

package/src/bases/react-aria/ui/breadcrumb.tsrx

@@ -15,7 +15,7 @@ import {
 	type LinkProps,
 } from '@octanejs/aria/components';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 import type { HostProps } from '../../../lib/types';
 import { ChevronRightIcon, MoreHorizontalIcon } from '@octanejs/lucide';
 

package/src/bases/react-aria/ui/button.tsrx

@@ -19,7 +19,7 @@ import type {
 	LinkProps as LinkPrimitiveProps,
 } from '@octanejs/aria/components';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 
 export const buttonVariants = cva(
 	'group/button inline-flex shrink-0 items-center justify-center rounded-lg border border-transparent bg-clip-padding text-sm font-medium whitespace-nowrap transition-all outline-none select-none focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 active:not-aria-[haspopup]:translate-y-px disabled:pointer-events-none disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-3 aria-invalid:ring-destructive/20 dark:aria-invalid:border-destructive/50 dark:aria-invalid:ring-destructive/40 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*=\'size-\'])]:size-4',

package/src/bases/react-aria/ui/card.tsrx

@@ -1,4 +1,4 @@
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 import type { HostProps } from '../../../lib/types';
 
 export function Card({ className, size = 'default', ...props }: HostProps<'div'> & {

package/src/bases/react-aria/ui/checkbox.tsrx

@@ -11,7 +11,7 @@ import {
 	type CheckboxRenderProps,
 } from '@octanejs/aria/components';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 import { CheckIcon } from '@octanejs/lucide';
 
 export function Checkbox({ className, children, ...props }: CheckboxProps) {

package/src/bases/react-aria/ui/dialog.tsrx

@@ -10,7 +10,7 @@ import {
 	type ModalOverlayProps as ModalOverlayPrimitiveProps,
 } from '@octanejs/aria/components';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 import type { HostProps } from '../../../lib/types';
 import { Button } from './button.tsrx';
 import { XIcon } from '@octanejs/lucide';

package/src/bases/react-aria/ui/empty.tsrx

@@ -1,6 +1,6 @@
 import { cva, type VariantProps } from 'class-variance-authority';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 import type { HostProps } from '../../../lib/types';
 
 export function Empty({ className, ...props }: HostProps<'div'>) {

package/src/bases/react-aria/ui/field.tsrx

@@ -1,7 +1,7 @@
 import { type OctaneNode, useMemo } from 'octane';
 import { cva, type VariantProps } from 'class-variance-authority';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 import type { HostProps } from '../../../lib/types';
 import { Label } from './label.tsrx';
 import { Separator } from './separator.tsrx';

package/src/bases/react-aria/ui/input.tsrx

@@ -8,7 +8,7 @@
 import { composeRenderProps, Input as InputPrimitive } from '@octanejs/aria/components';
 import type { InputProps as InputPrimitiveProps } from '@octanejs/aria/components';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 
 export interface InputProps extends InputPrimitiveProps {}
 

package/src/bases/react-aria/ui/item.tsrx

@@ -1,7 +1,7 @@
 import { cva, type VariantProps } from 'class-variance-authority';
 import { Link as LinkPrimitive, type LinkProps } from '@octanejs/aria/components';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 import type { HostProps } from '../../../lib/types';
 import { Separator } from './separator.tsrx';
 

package/src/bases/react-aria/ui/kbd.tsrx

@@ -5,7 +5,7 @@
 // utilities-inlined flavor, matching the Radix base.
 import { Keyboard as KbdPrimitive } from '@octanejs/aria/components';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 import type { HostProps } from '../../../lib/types';
 
 export interface KbdProps extends HostProps<'kbd'> {}

package/src/bases/react-aria/ui/label.tsrx

@@ -1,6 +1,6 @@
 import { LabelContext, Label as LabelPrimitive, type LabelProps } from '@octanejs/aria/components';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 
 export function Label({ className, htmlFor, slot, ...props }: LabelProps) {
 	const label = <LabelPrimitive

package/src/bases/react-aria/ui/native-select.tsrx

@@ -1,4 +1,4 @@
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 import type { HostProps } from '../../../lib/types';
 import { ChevronDownIcon } from '@octanejs/lucide';
 

package/src/bases/react-aria/ui/pagination.tsrx

@@ -1,4 +1,4 @@
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 import type { HostProps } from '../../../lib/types';
 import { LinkButton } from './button.tsrx';
 import { ChevronLeftIcon, ChevronRightIcon, MoreHorizontalIcon } from '@octanejs/lucide';

package/src/bases/react-aria/ui/popover.tsrx

@@ -7,7 +7,7 @@ import {
 } from '@octanejs/aria/components';
 import type { HeadingProps } from '@octanejs/aria/components';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 import type { HostProps } from '../../../lib/types';
 
 export function PopoverTrigger({ children, ...props }: DialogTriggerProps) {

package/src/bases/react-aria/ui/radio-group.tsrx

@@ -13,7 +13,7 @@ import {
 	type RadioProps,
 } from '@octanejs/aria/components';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 
 export function RadioGroup({ className, ...props }: RadioGroupProps) {
 	return <RadioGroupPrimitive

package/src/bases/react-aria/ui/scroll-area.tsrx

@@ -1,4 +1,4 @@
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 import type { HostProps } from '../../../lib/types';
 
 export function ScrollArea({ className, children, ...props }: HostProps<'div'>) {

package/src/bases/react-aria/ui/separator.tsrx

@@ -8,7 +8,7 @@
 // reason. The non-conditional utilities stay in step with the Radix base.
 import { Separator as SeparatorPrimitive } from '@octanejs/aria/components';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 
 export interface SeparatorProps extends Record<string, unknown> {
 	className?: string;

package/src/bases/react-aria/ui/sheet.tsrx

@@ -14,7 +14,7 @@ import {
 } from '@octanejs/aria/components';
 import type { HeadingProps } from '@octanejs/aria/components';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 import type { HostProps } from '../../../lib/types';
 import { Button } from './button.tsrx';
 import { XIcon } from '@octanejs/lucide';

package/src/bases/react-aria/ui/skeleton.tsrx

@@ -1,4 +1,4 @@
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 import type { HostProps } from '../../../lib/types';
 
 export function Skeleton({ className, ...props }: HostProps<'div'>) {

package/src/bases/react-aria/ui/slider.tsrx

@@ -11,7 +11,7 @@ import {
 	type SliderRenderProps,
 } from '@octanejs/aria/components';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 
 type SliderValue = number | number[];
 type SliderProps<T extends SliderValue = SliderValue> =

package/src/bases/react-aria/ui/spinner.tsrx

@@ -11,7 +11,7 @@
 // SVG attribute types do not describe them.
 import { Loader2Icon } from '@octanejs/lucide';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 
 export interface SpinnerProps extends Record<string, unknown> {
 	className?: string;

package/src/bases/react-aria/ui/switch.tsrx

@@ -11,7 +11,7 @@ import {
 	type SwitchRenderProps,
 } from '@octanejs/aria/components';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 
 export function Switch({ className, size = 'default', children, ...props }: SwitchPrimitiveProps & {
 	size?: 'sm' | 'default';

package/src/bases/react-aria/ui/table.tsrx

@@ -19,7 +19,7 @@ import {
 	type TableProps,
 } from '@octanejs/aria/components';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 import type { HostProps } from '../../../lib/types';
 
 export function Table({ className, ...props }: TableProps) {

package/src/bases/react-aria/ui/tabs.tsrx

@@ -7,7 +7,7 @@ import {
 } from '@octanejs/aria/components';
 import type { TabPanelProps, TabProps, TabsProps } from '@octanejs/aria/components';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 
 export function Tabs({ className, ...props }: TabsProps) {
 	return <TabsPrimitive

package/src/bases/react-aria/ui/textarea.tsrx

@@ -7,7 +7,7 @@
 import { composeRenderProps, TextArea as TextareaPrimitive } from '@octanejs/aria/components';
 import type { TextAreaProps as TextareaPrimitiveProps } from '@octanejs/aria/components';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 
 export interface TextareaProps extends TextareaPrimitiveProps {}
 

package/src/bases/react-aria/ui/toggle.tsrx

@@ -1,7 +1,7 @@
 import { cva, type VariantProps } from 'class-variance-authority';
 import { ToggleButton as TogglePrimitive, type ToggleButtonProps } from '@octanejs/aria/components';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 
 export const toggleVariants = cva(
 	'group/toggle inline-flex items-center justify-center gap-1 rounded-lg text-sm font-medium whitespace-nowrap transition-all outline-none hover:bg-muted hover:text-foreground focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:pointer-events-none disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 aria-pressed:bg-muted data-[state=on]:bg-muted dark:aria-invalid:ring-destructive/40 data-selected:bg-muted [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*=\'size-\'])]:size-4',

package/src/lib/utils.ts

@@ -1,8 +1 @@
-// Ported from shadcn-ui/ui@4baadbc6517070ae8f8feb2c97037adc2b305544
-// apps/v4/registry/bases/radix/lib/utils.ts — unchanged (framework-free).
-import { clsx, type ClassValue } from 'clsx';
-import { twMerge } from 'tailwind-merge';
-
-export function cn(...inputs: ClassValue[]) {
-	return twMerge(clsx(inputs));
-}
+export { cn } from 'cn';