Skip to content

feat: dropdown menu dialog item #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
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
53 changes: 53 additions & 0 deletions apps/www/components/examples/dropdown-menu/dialog-items.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
import { Button } from "@/components/ui/button"
import {
DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogTitle,
} from "@/components/ui/dialog"
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuDialogItem,
DropdownMenuGroup,
DropdownMenuLabel,
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu"

export function DropdownMenuDialogItemsDemo() {
return (
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button variant="outline">Open</Button>
</DropdownMenuTrigger>
<DropdownMenuContent className="w-56">
<DropdownMenuGroup>
<DropdownMenuLabel>Dialog items</DropdownMenuLabel>
<DropdownMenuDialogItem trigger="Open Dialog">
<DialogContent className="sm:max-w-[425px]">
<DialogHeader>
<DialogTitle>Dialog 1</DialogTitle>
<DialogDescription>Hello from Dialog 1</DialogDescription>
</DialogHeader>
<DialogFooter>
<Button type="submit">Save changes</Button>
</DialogFooter>
</DialogContent>
</DropdownMenuDialogItem>
<DropdownMenuDialogItem trigger="Open Dialog 2">
<DialogContent className="sm:max-w-[425px]">
<DialogHeader>
<DialogTitle>Dialog 2</DialogTitle>
<DialogDescription>Hello from Dialog 2</DialogDescription>
</DialogHeader>
<DialogFooter>
<Button type="submit">Save changes</Button>
</DialogFooter>
</DialogContent>
</DropdownMenuDialogItem>
</DropdownMenuGroup>
</DropdownMenuContent>
</DropdownMenu>
)
}
32 changes: 32 additions & 0 deletions apps/www/components/ui/dropdown-menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu"
import { Check, ChevronRight, Circle } from "lucide-react"

import { cn } from "@/lib/utils"
import { Dialog, DialogTrigger } from "./dialog"

const DropdownMenu = DropdownMenuPrimitive.Root

Expand Down Expand Up @@ -184,6 +185,36 @@ const DropdownMenuShortcut = ({
}
DropdownMenuShortcut.displayName = "DropdownMenuShortcut"

const DropdownMenuDialogItem = React.forwardRef<
React.ElementRef<typeof DropdownMenuPrimitive.Item>,
React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Item> & {
trigger: React.ReactNode
children: React.ReactNode
open?: boolean
onOpenChange?: (open: boolean) => void
onSelect?: () => void
}
>(({ trigger, children, open, onOpenChange, onSelect, ...props }, ref) => {
return (
<Dialog open={open} onOpenChange={onOpenChange}>
<DialogTrigger asChild>
<DropdownMenuItem
ref={ref}
onSelect={(event) => {
event.preventDefault()
onSelect && onSelect()
}}
{...props}
>
{trigger}
</DropdownMenuItem>
</DialogTrigger>
{children}
</Dialog>
)
})
DropdownMenuDialogItem.displayName = "DropdownMenuDialogItem"

export {
DropdownMenu,
DropdownMenuTrigger,
Expand All @@ -200,4 +231,5 @@ export {
DropdownMenuSubContent,
DropdownMenuSubTrigger,
DropdownMenuRadioGroup,
DropdownMenuDialogItem,
}
6 changes: 6 additions & 0 deletions apps/www/content/docs/primitives/dropdown-menu.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,9 @@ import {
<ComponentExample src="/components/examples/dropdown-menu/radio-group.tsx">
<DropdownMenuRadioGroupDemo />
</ComponentExample>

### Dialog

<ComponentExample src="/components/examples/dropdown-menu/dialog-items.tsx">
<DropdownMenuDialogItemsDemo />
</ComponentExample>