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
2 changes: 1 addition & 1 deletion apps/ui/public/r/combobox.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/ui/public/r/drawer.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/ui/public/r/select.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions apps/ui/registry/default/ui/combobox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ export function ComboboxItem({
return (
<ComboboxPrimitive.Item
className={cn(
"grid min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-default grid-cols-[1rem_1fr] items-center gap-2 rounded-sm py-1 ps-2 pe-4 text-base outline-none data-disabled:pointer-events-none data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
"grid min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-default grid-cols-[1rem_minmax(0,1fr)] items-center gap-2 rounded-sm py-1 ps-2 pe-4 text-base outline-none data-disabled:pointer-events-none data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
className,
)}
data-slot="combobox-item"
Expand All @@ -232,7 +232,7 @@ export function ComboboxItem({
<path d="M5.252 12.7 10.2 18.63 18.748 5.37" />
</svg>
</ComboboxPrimitive.ItemIndicator>
<div className="col-start-2">{children}</div>
<div className="wrap-anywhere col-start-2 min-w-0">{children}</div>
</ComboboxPrimitive.Item>
);
}
Expand Down
12 changes: 6 additions & 6 deletions apps/ui/registry/default/ui/drawer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -527,8 +527,8 @@ export function DrawerMenuCheckboxItem({
className={cn(
"grid min-h-9 w-full cursor-default select-none items-center gap-2 rounded-sm px-2 py-1 text-base text-foreground outline-none hover:bg-accent hover:text-accent-foreground data-disabled:pointer-events-none data-disabled:opacity-64 sm:min-h-8 sm:text-sm [&_svg:not([class*='opacity-'])]:opacity-80 [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:-mx-0.5 [&_svg]:shrink-0",
variant === "switch"
? "grid-cols-[1fr_auto] gap-4 pe-1.5"
: "grid-cols-[1rem_1fr] pe-4",
? "grid-cols-[minmax(0,1fr)_auto] gap-4 pe-1.5"
: "grid-cols-[1rem_minmax(0,1fr)] pe-4",
className,
)}
data-slot="drawer-menu-checkbox-item"
Expand All @@ -540,7 +540,7 @@ export function DrawerMenuCheckboxItem({
>
{variant === "switch" ? (
<>
<span className="col-start-1">{children}</span>
<span className="wrap-anywhere col-start-1 min-w-0">{children}</span>
<CheckboxPrimitive.Indicator
className="inset-shadow-[0_1px_--theme(--color-black/4%)] col-start-2 inline-flex h-[calc(var(--thumb-size)+2px)] w-[calc(var(--thumb-size)*2-2px)] shrink-0 items-center rounded-full p-px outline-none transition-[background-color,box-shadow] duration-200 [--thumb-size:--spacing(4)] focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background data-checked:bg-primary data-unchecked:bg-input data-disabled:opacity-64 sm:[--thumb-size:--spacing(3)]"
keepMounted
Expand All @@ -565,7 +565,7 @@ export function DrawerMenuCheckboxItem({
<path d="M5.252 12.7 10.2 18.63 18.748 5.37" />
</svg>
</CheckboxPrimitive.Indicator>
<span className="col-start-2">{children}</span>
<span className="wrap-anywhere col-start-2 min-w-0">{children}</span>
</>
)}
</CheckboxPrimitive.Root>
Expand Down Expand Up @@ -600,7 +600,7 @@ export function DrawerMenuRadioItem({
<RadioPrimitive.Root
className={cn(
"grid min-h-9 w-full cursor-default select-none items-center gap-2 rounded-sm px-2 py-1 text-base text-foreground outline-none hover:bg-accent hover:text-accent-foreground data-disabled:pointer-events-none data-disabled:opacity-64 sm:min-h-8 sm:text-sm [&_svg:not([class*='opacity-'])]:opacity-80 [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:-mx-0.5 [&_svg]:shrink-0",
"grid-cols-[1rem_1fr] items-center pe-4",
"grid-cols-[1rem_minmax(0,1fr)] items-center pe-4",
className,
)}
data-slot="drawer-menu-radio-item"
Expand All @@ -624,7 +624,7 @@ export function DrawerMenuRadioItem({
<path d="M5.252 12.7 10.2 18.63 18.748 5.37" />
</svg>
</RadioPrimitive.Indicator>
<span className="col-start-2">{children}</span>
<span className="wrap-anywhere col-start-2 min-w-0">{children}</span>
</RadioPrimitive.Root>
);
}
Expand Down
4 changes: 2 additions & 2 deletions apps/ui/registry/default/ui/select.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ export function SelectItem({
return (
<SelectPrimitive.Item
className={cn(
"grid min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-default grid-cols-[1rem_1fr] items-center gap-2 rounded-sm py-1 ps-2 pe-4 text-base outline-none data-disabled:pointer-events-none data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
"grid min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-default grid-cols-[1rem_minmax(0,1fr)] items-center gap-2 rounded-sm py-1 ps-2 pe-4 text-base outline-none data-disabled:pointer-events-none data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
className,
)}
data-slot="select-item"
Expand All @@ -200,7 +200,7 @@ export function SelectItem({
<path d="M5.252 12.7 10.2 18.63 18.748 5.37" />
</svg>
</SelectPrimitive.ItemIndicator>
<SelectPrimitive.ItemText className="col-start-2 min-w-0">
<SelectPrimitive.ItemText className="wrap-anywhere col-start-2 min-w-0">
{children}
</SelectPrimitive.ItemText>
</SelectPrimitive.Item>
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/src/components/combobox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ export function ComboboxItem({
return (
<ComboboxPrimitive.Item
className={cn(
"grid min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-default grid-cols-[1rem_1fr] items-center gap-2 rounded-sm py-1 ps-2 pe-4 text-base outline-none data-disabled:pointer-events-none data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
"grid min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-default grid-cols-[1rem_minmax(0,1fr)] items-center gap-2 rounded-sm py-1 ps-2 pe-4 text-base outline-none data-disabled:pointer-events-none data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
className,
)}
data-slot="combobox-item"
Expand All @@ -232,7 +232,7 @@ export function ComboboxItem({
<path d="M5.252 12.7 10.2 18.63 18.748 5.37" />
</svg>
</ComboboxPrimitive.ItemIndicator>
<div className="col-start-2">{children}</div>
<div className="wrap-anywhere col-start-2 min-w-0">{children}</div>
</ComboboxPrimitive.Item>
);
}
Expand Down
12 changes: 6 additions & 6 deletions packages/ui/src/components/drawer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -527,8 +527,8 @@ export function DrawerMenuCheckboxItem({
className={cn(
"grid min-h-9 w-full cursor-default select-none items-center gap-2 rounded-sm px-2 py-1 text-base text-foreground outline-none hover:bg-accent hover:text-accent-foreground data-disabled:pointer-events-none data-disabled:opacity-64 sm:min-h-8 sm:text-sm [&_svg:not([class*='opacity-'])]:opacity-80 [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:-mx-0.5 [&_svg]:shrink-0",
variant === "switch"
? "grid-cols-[1fr_auto] gap-4 pe-1.5"
: "grid-cols-[1rem_1fr] pe-4",
? "grid-cols-[minmax(0,1fr)_auto] gap-4 pe-1.5"
: "grid-cols-[1rem_minmax(0,1fr)] pe-4",
className,
)}
data-slot="drawer-menu-checkbox-item"
Expand All @@ -540,7 +540,7 @@ export function DrawerMenuCheckboxItem({
>
{variant === "switch" ? (
<>
<span className="col-start-1">{children}</span>
<span className="wrap-anywhere col-start-1 min-w-0">{children}</span>
<CheckboxPrimitive.Indicator
className="inset-shadow-[0_1px_--theme(--color-black/4%)] col-start-2 inline-flex h-[calc(var(--thumb-size)+2px)] w-[calc(var(--thumb-size)*2-2px)] shrink-0 items-center rounded-full p-px outline-none transition-[background-color,box-shadow] duration-200 [--thumb-size:--spacing(4)] focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background data-checked:bg-primary data-unchecked:bg-input data-disabled:opacity-64 sm:[--thumb-size:--spacing(3)]"
keepMounted
Expand All @@ -565,7 +565,7 @@ export function DrawerMenuCheckboxItem({
<path d="M5.252 12.7 10.2 18.63 18.748 5.37" />
</svg>
</CheckboxPrimitive.Indicator>
<span className="col-start-2">{children}</span>
<span className="wrap-anywhere col-start-2 min-w-0">{children}</span>
</>
)}
</CheckboxPrimitive.Root>
Expand Down Expand Up @@ -600,7 +600,7 @@ export function DrawerMenuRadioItem({
<RadioPrimitive.Root
className={cn(
"grid min-h-9 w-full cursor-default select-none items-center gap-2 rounded-sm px-2 py-1 text-base text-foreground outline-none hover:bg-accent hover:text-accent-foreground data-disabled:pointer-events-none data-disabled:opacity-64 sm:min-h-8 sm:text-sm [&_svg:not([class*='opacity-'])]:opacity-80 [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:-mx-0.5 [&_svg]:shrink-0",
"grid-cols-[1rem_1fr] items-center pe-4",
"grid-cols-[1rem_minmax(0,1fr)] items-center pe-4",
className,
)}
data-slot="drawer-menu-radio-item"
Expand All @@ -624,7 +624,7 @@ export function DrawerMenuRadioItem({
<path d="M5.252 12.7 10.2 18.63 18.748 5.37" />
</svg>
</RadioPrimitive.Indicator>
<span className="col-start-2">{children}</span>
<span className="wrap-anywhere col-start-2 min-w-0">{children}</span>
</RadioPrimitive.Root>
);
}
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/src/components/select.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ export function SelectItem({
return (
<SelectPrimitive.Item
className={cn(
"grid min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-default grid-cols-[1rem_1fr] items-center gap-2 rounded-sm py-1 ps-2 pe-4 text-base outline-none data-disabled:pointer-events-none data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
"grid min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-default grid-cols-[1rem_minmax(0,1fr)] items-center gap-2 rounded-sm py-1 ps-2 pe-4 text-base outline-none data-disabled:pointer-events-none data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
className,
)}
data-slot="select-item"
Expand All @@ -200,7 +200,7 @@ export function SelectItem({
<path d="M5.252 12.7 10.2 18.63 18.748 5.37" />
</svg>
</SelectPrimitive.ItemIndicator>
<SelectPrimitive.ItemText className="col-start-2 min-w-0">
<SelectPrimitive.ItemText className="wrap-anywhere col-start-2 min-w-0">
{children}
</SelectPrimitive.ItemText>
</SelectPrimitive.Item>
Expand Down
Loading