Skip to content

Commit 5c9696a

Browse files
committed
Update shadcn/ui components to 3.2.1
1 parent 1f64a17 commit 5c9696a

5 files changed

Lines changed: 44 additions & 36 deletions

File tree

app/frontend/components/ui/dialog.tsx

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,11 @@ function DialogOverlay({
4747
function DialogContent({
4848
className,
4949
children,
50+
showCloseButton = true,
5051
...props
51-
}: React.ComponentProps<typeof DialogPrimitive.Content>) {
52+
}: React.ComponentProps<typeof DialogPrimitive.Content> & {
53+
showCloseButton?: boolean
54+
}) {
5255
return (
5356
<DialogPortal data-slot="dialog-portal">
5457
<DialogOverlay />
@@ -61,10 +64,15 @@ function DialogContent({
6164
{...props}
6265
>
6366
{children}
64-
<DialogPrimitive.Close className="ring-offset-background focus:ring-ring data-[state=open]:bg-accent data-[state=open]:text-muted-foreground absolute top-4 right-4 rounded-xs opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:ring-offset-2 focus:outline-hidden disabled:pointer-events-none [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4">
65-
<XIcon />
66-
<span className="sr-only">Close</span>
67-
</DialogPrimitive.Close>
67+
{showCloseButton && (
68+
<DialogPrimitive.Close
69+
data-slot="dialog-close"
70+
className="ring-offset-background focus:ring-ring data-[state=open]:bg-accent data-[state=open]:text-muted-foreground absolute top-4 right-4 rounded-xs opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:ring-offset-2 focus:outline-hidden disabled:pointer-events-none [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4"
71+
>
72+
<XIcon />
73+
<span className="sr-only">Close</span>
74+
</DialogPrimitive.Close>
75+
)}
6876
</DialogPrimitive.Content>
6977
</DialogPortal>
7078
)

app/frontend/components/ui/separator.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ function Separator({
1313
}: React.ComponentProps<typeof SeparatorPrimitive.Root>) {
1414
return (
1515
<SeparatorPrimitive.Root
16-
data-slot="separator-root"
16+
data-slot="separator"
1717
decorative={decorative}
1818
orientation={orientation}
1919
className={cn(

app/frontend/components/ui/sidebar.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ function SidebarInset({ className, ...props }: React.ComponentProps<"main">) {
310310
<main
311311
data-slot="sidebar-inset"
312312
className={cn(
313-
"bg-background relative flex min-h-svh max-w-full flex-1 flex-col",
313+
"bg-background relative flex w-full flex-1 flex-col",
314314
"md:peer-data-[variant=inset]:m-2 md:peer-data-[variant=inset]:ml-0 md:peer-data-[variant=inset]:rounded-xl md:peer-data-[variant=inset]:shadow-sm md:peer-data-[variant=inset]:peer-data-[state=collapsed]:ml-2",
315315
className,
316316
)}
@@ -407,7 +407,7 @@ function SidebarGroupLabel({
407407
data-sidebar="group-label"
408408
className={cn(
409409
"text-sidebar-foreground/70 ring-sidebar-ring flex h-8 shrink-0 items-center rounded-md px-2 text-xs font-medium outline-hidden transition-[margin,opacity] duration-200 ease-linear focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0",
410-
"group-data-[collapsible=icon]:pointer-events-none group-data-[collapsible=icon]:-mt-8 group-data-[collapsible=icon]:opacity-0 group-data-[collapsible=icon]:select-none",
410+
"group-data-[collapsible=icon]:-mt-8 group-data-[collapsible=icon]:opacity-0",
411411
className,
412412
)}
413413
{...props}

package-lock.json

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@
1717
"dependencies": {
1818
"@headlessui/react": "^2.2.0",
1919
"@inertiajs/react": "^2.1.2",
20-
"@radix-ui/react-avatar": "^1.1.4",
21-
"@radix-ui/react-checkbox": "^1.1.5",
22-
"@radix-ui/react-collapsible": "^1.1.4",
23-
"@radix-ui/react-dialog": "^1.1.7",
24-
"@radix-ui/react-dropdown-menu": "^2.1.7",
25-
"@radix-ui/react-label": "^2.1.3",
26-
"@radix-ui/react-navigation-menu": "^1.2.6",
27-
"@radix-ui/react-select": "^2.1.7",
28-
"@radix-ui/react-separator": "^1.1.3",
29-
"@radix-ui/react-slot": "^1.2.0",
30-
"@radix-ui/react-toggle": "^1.1.3",
31-
"@radix-ui/react-toggle-group": "^1.1.3",
32-
"@radix-ui/react-tooltip": "^1.2.0",
20+
"@radix-ui/react-avatar": "^1.1.10",
21+
"@radix-ui/react-checkbox": "^1.3.3",
22+
"@radix-ui/react-collapsible": "^1.1.12",
23+
"@radix-ui/react-dialog": "^1.1.15",
24+
"@radix-ui/react-dropdown-menu": "^2.1.16",
25+
"@radix-ui/react-label": "^2.1.7",
26+
"@radix-ui/react-navigation-menu": "^1.2.14",
27+
"@radix-ui/react-select": "^2.2.6",
28+
"@radix-ui/react-separator": "^1.1.7",
29+
"@radix-ui/react-slot": "^1.2.3",
30+
"@radix-ui/react-toggle": "^1.1.10",
31+
"@radix-ui/react-toggle-group": "^1.1.11",
32+
"@radix-ui/react-tooltip": "^1.2.8",
3333
"@tailwindcss/forms": "^0.5.10",
3434
"@tailwindcss/typography": "^0.5.16",
3535
"@tailwindcss/vite": "^4.0.6",
@@ -42,7 +42,7 @@
4242
"next-themes": "^0.4.6",
4343
"react": "^19.0.0",
4444
"react-dom": "^19.0.0",
45-
"sonner": "^2.0.3",
45+
"sonner": "^2.0.7",
4646
"tailwind-merge": "^3.2.0",
4747
"tailwindcss": "^4.0.6",
4848
"tailwindcss-animate": "^1.0.7",

0 commit comments

Comments
 (0)