From c2386ae248766f84be69e5c274b4e8ffed9928c1 Mon Sep 17 00:00:00 2001 From: Tobias Barsnes Date: Thu, 1 Feb 2024 10:33:51 +0100 Subject: [PATCH 1/2] feat(DropdownMenuItem): Add `asChild` support to `DropdownMenuItem` --- .../DropdownMenuItem/DropdownMenuItem.tsx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/react/src/components/DropdownMenu/DropdownMenuItem/DropdownMenuItem.tsx b/packages/react/src/components/DropdownMenu/DropdownMenuItem/DropdownMenuItem.tsx index 39d8934776..1ee9963b1c 100644 --- a/packages/react/src/components/DropdownMenu/DropdownMenuItem/DropdownMenuItem.tsx +++ b/packages/react/src/components/DropdownMenu/DropdownMenuItem/DropdownMenuItem.tsx @@ -7,10 +7,13 @@ import { DropdownMenuContext } from '../DropdownMenu'; import classes from './DropdownMenuItem.module.css'; -export type DropdownMenuItemProps = Omit< - ButtonProps, - 'variant' | 'size' | 'color' | 'fullWidth' ->; +export type DropdownMenuItemProps = { + /** + * Change the default rendered element for the one passed as a child, merging their props and behavior. + * @default false + */ + asChild?: boolean; +} & Omit; export const DropdownMenuItem: OverridableComponent< DropdownMenuItemProps, From c11fcfe15aa4cfe6cf7b0059155e4c71a41188ff Mon Sep 17 00:00:00 2001 From: Tobias Barsnes Date: Thu, 1 Feb 2024 15:35:02 +0100 Subject: [PATCH 2/2] remoe `asChild` type --- .../DropdownMenuItem/DropdownMenuItem.tsx | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/packages/react/src/components/DropdownMenu/DropdownMenuItem/DropdownMenuItem.tsx b/packages/react/src/components/DropdownMenu/DropdownMenuItem/DropdownMenuItem.tsx index 1ee9963b1c..39d8934776 100644 --- a/packages/react/src/components/DropdownMenu/DropdownMenuItem/DropdownMenuItem.tsx +++ b/packages/react/src/components/DropdownMenu/DropdownMenuItem/DropdownMenuItem.tsx @@ -7,13 +7,10 @@ import { DropdownMenuContext } from '../DropdownMenu'; import classes from './DropdownMenuItem.module.css'; -export type DropdownMenuItemProps = { - /** - * Change the default rendered element for the one passed as a child, merging their props and behavior. - * @default false - */ - asChild?: boolean; -} & Omit; +export type DropdownMenuItemProps = Omit< + ButtonProps, + 'variant' | 'size' | 'color' | 'fullWidth' +>; export const DropdownMenuItem: OverridableComponent< DropdownMenuItemProps,