Skip to content

Commit cf8a55b

Browse files
committed
fix(): Update dropdown menu.
1 parent 7e5c968 commit cf8a55b

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

src/shadcn/ui/dropdown-menu.tsx

+9-13
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@
22

33
import * as React from "react"
44
import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu"
5-
import {
6-
CheckIcon,
7-
ChevronRightIcon,
8-
DotFilledIcon,
9-
} from "@radix-ui/react-icons"
5+
import { Check, ChevronRight, Circle } from "lucide-react"
106

11-
import { cn } from "src/utils"
7+
import { cn } from "src"
128

139
const DropdownMenu = DropdownMenuPrimitive.Root
1410

@@ -31,14 +27,14 @@ const DropdownMenuSubTrigger = React.forwardRef<
3127
<DropdownMenuPrimitive.SubTrigger
3228
ref={ref}
3329
className={cn(
34-
"flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none focus:bg-accent data-[state=open]:bg-accent",
30+
"flex cursor-default gap-2 select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none focus:bg-accent data-[state=open]:bg-accent [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",
3531
inset && "pl-8",
3632
className
3733
)}
3834
{...props}
3935
>
4036
{children}
41-
<ChevronRightIcon className="ml-auto h-4 w-4" />
37+
<ChevronRight className="ml-auto" />
4238
</DropdownMenuPrimitive.SubTrigger>
4339
))
4440
DropdownMenuSubTrigger.displayName =
@@ -64,7 +60,7 @@ const DropdownMenuContent = React.forwardRef<
6460
React.ElementRef<typeof DropdownMenuPrimitive.Content>,
6561
React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Content>
6662
>(({ className, sideOffset = 4, ...props }, ref) => (
67-
63+
<DropdownMenuPrimitive.Portal>
6864
<DropdownMenuPrimitive.Content
6965
ref={ref}
7066
sideOffset={sideOffset}
@@ -75,7 +71,7 @@ const DropdownMenuContent = React.forwardRef<
7571
)}
7672
{...props}
7773
/>
78-
74+
</DropdownMenuPrimitive.Portal>
7975
))
8076
DropdownMenuContent.displayName = DropdownMenuPrimitive.Content.displayName
8177

@@ -88,7 +84,7 @@ const DropdownMenuItem = React.forwardRef<
8884
<DropdownMenuPrimitive.Item
8985
ref={ref}
9086
className={cn(
91-
"relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none transition-colors focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
87+
"relative flex cursor-default select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-none transition-colors focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&>svg]:size-4 [&>svg]:shrink-0",
9288
inset && "pl-8",
9389
className
9490
)}
@@ -112,7 +108,7 @@ const DropdownMenuCheckboxItem = React.forwardRef<
112108
>
113109
<span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
114110
<DropdownMenuPrimitive.ItemIndicator>
115-
<CheckIcon className="h-4 w-4" />
111+
<Check className="h-4 w-4" />
116112
</DropdownMenuPrimitive.ItemIndicator>
117113
</span>
118114
{children}
@@ -135,7 +131,7 @@ const DropdownMenuRadioItem = React.forwardRef<
135131
>
136132
<span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
137133
<DropdownMenuPrimitive.ItemIndicator>
138-
<DotFilledIcon className="h-4 w-4 fill-current" />
134+
<Circle className="h-2 w-2 fill-current" />
139135
</DropdownMenuPrimitive.ItemIndicator>
140136
</span>
141137
{children}

stories/shadcn/dropdown-menu.stories.tsx

+5-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
} from "src";
1010

1111
import type { Meta, StoryObj } from "@storybook/react";
12+
import { Folder } from "lucide-react";
1213

1314
const DropdownDemo = () => {
1415
return (
@@ -17,7 +18,10 @@ const DropdownDemo = () => {
1718
<DropdownMenuContent>
1819
<DropdownMenuLabel>My Account</DropdownMenuLabel>
1920
<DropdownMenuSeparator />
20-
<DropdownMenuItem>Profile</DropdownMenuItem>
21+
<DropdownMenuItem>
22+
<Folder className="text-muted-foreground" />
23+
<span>With Icon</span>
24+
</DropdownMenuItem>
2125
<DropdownMenuItem>Billing</DropdownMenuItem>
2226
<DropdownMenuItem>Team</DropdownMenuItem>
2327
<DropdownMenuItem>Subscription</DropdownMenuItem>

0 commit comments

Comments
 (0)