@health-samurai/react-components 0.0.0-alpha.2 → 0.0.0-alpha.21

package/src/shadcn/components/ui/drawer.tsx

@@ -1,8 +1,97 @@
+"use client";
 import type * as React from "react";
 import { Drawer as DrawerPrimitive } from "vaul";
 
 import { cn } from "#shadcn/lib/utils";
 
+// Drawer overlay styles
+const drawerOverlayStyles = cn(
+	// Layout
+	"fixed",
+	"inset-0",
+	"z-50",
+	// Background
+	"bg-black/50",
+	// Animations - open
+	"data-[state=open]:animate-in",
+	"data-[state=open]:fade-in-0",
+	// Animations - closed
+	"data-[state=closed]:animate-out",
+	"data-[state=closed]:fade-out-0",
+);
+
+// Drawer content styles
+const drawerContentStyles = cn(
+	// Group
+	"group/drawer-content",
+	// Background
+	"bg-bg-primary",
+	// Layout
+	"fixed",
+	"z-50",
+	"flex",
+	"h-auto",
+	"flex-col",
+	// Top direction
+	"data-[vaul-drawer-direction=top]:inset-x-0",
+	"data-[vaul-drawer-direction=top]:top-0",
+	"data-[vaul-drawer-direction=top]:mb-24",
+	"data-[vaul-drawer-direction=top]:max-h-[80vh]",
+	"data-[vaul-drawer-direction=top]:rounded-b-lg",
+	"data-[vaul-drawer-direction=top]:border-b",
+	"data-[vaul-drawer-direction=top]:border-border-primary",
+	// Bottom direction
+	"data-[vaul-drawer-direction=bottom]:inset-x-0",
+	"data-[vaul-drawer-direction=bottom]:bottom-0",
+	"data-[vaul-drawer-direction=bottom]:mt-24",
+	"data-[vaul-drawer-direction=bottom]:max-h-[80vh]",
+	"data-[vaul-drawer-direction=bottom]:rounded-t-lg",
+	"data-[vaul-drawer-direction=bottom]:border-t",
+	"data-[vaul-drawer-direction=bottom]:border-border-primary",
+	// Right direction
+	"data-[vaul-drawer-direction=right]:inset-y-0",
+	"data-[vaul-drawer-direction=right]:right-0",
+	"data-[vaul-drawer-direction=right]:w-3/4",
+	"data-[vaul-drawer-direction=right]:border-l",
+	"data-[vaul-drawer-direction=right]:border-border-primary",
+	"data-[vaul-drawer-direction=right]:sm:max-w-sm",
+	// Left direction
+	"data-[vaul-drawer-direction=left]:inset-y-0",
+	"data-[vaul-drawer-direction=left]:left-0",
+	"data-[vaul-drawer-direction=left]:w-3/4",
+	"data-[vaul-drawer-direction=left]:border-r",
+	"data-[vaul-drawer-direction=left]:border-border-primary",
+	"data-[vaul-drawer-direction=left]:sm:max-w-sm",
+);
+
+// Drawer handle styles
+const drawerHandleStyles = cn(
+	"bg-bg-tertiary",
+	"mx-auto",
+	"mt-4",
+	"hidden",
+	"h-2",
+	"w-[100px]",
+	"shrink-0",
+	"rounded-full",
+	"group-data-[vaul-drawer-direction=bottom]/drawer-content:block",
+);
+
+// Drawer header styles
+const drawerHeaderStyles = cn(
+	"flex",
+	"flex-col",
+	"gap-0.5",
+	"p-4",
+	"group-data-[vaul-drawer-direction=bottom]/drawer-content:text-center",
+	"group-data-[vaul-drawer-direction=top]/drawer-content:text-center",
+	"md:gap-1.5",
+	"md:text-left",
+);
+
+// Drawer footer styles
+const drawerFooterStyles = cn("mt-auto", "flex", "flex-col", "gap-2", "p-4");
+
 function Drawer({
 	...props
 }: React.ComponentProps<typeof DrawerPrimitive.Root>) {
@@ -34,10 +123,7 @@ function DrawerOverlay({
 	return (
 		<DrawerPrimitive.Overlay
 			data-slot="drawer-overlay"
-			className={cn(
-				"data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/50",
-				className,
-			)}
+			className={cn(drawerOverlayStyles, className)}
 			{...props}
 		/>
 	);
@@ -53,17 +139,10 @@ function DrawerContent({
 			<DrawerOverlay />
 			<DrawerPrimitive.Content
 				data-slot="drawer-content"
-				className={cn(
-					"group/drawer-content bg-background fixed z-50 flex h-auto flex-col",
-					"data-[vaul-drawer-direction=top]:inset-x-0 data-[vaul-drawer-direction=top]:top-0 data-[vaul-drawer-direction=top]:mb-24 data-[vaul-drawer-direction=top]:max-h-[80vh] data-[vaul-drawer-direction=top]:rounded-b-lg data-[vaul-drawer-direction=top]:border-b",
-					"data-[vaul-drawer-direction=bottom]:inset-x-0 data-[vaul-drawer-direction=bottom]:bottom-0 data-[vaul-drawer-direction=bottom]:mt-24 data-[vaul-drawer-direction=bottom]:max-h-[80vh] data-[vaul-drawer-direction=bottom]:rounded-t-lg data-[vaul-drawer-direction=bottom]:border-t",
-					"data-[vaul-drawer-direction=right]:inset-y-0 data-[vaul-drawer-direction=right]:right-0 data-[vaul-drawer-direction=right]:w-3/4 data-[vaul-drawer-direction=right]:border-l data-[vaul-drawer-direction=right]:sm:max-w-sm",
-					"data-[vaul-drawer-direction=left]:inset-y-0 data-[vaul-drawer-direction=left]:left-0 data-[vaul-drawer-direction=left]:w-3/4 data-[vaul-drawer-direction=left]:border-r data-[vaul-drawer-direction=left]:sm:max-w-sm",
-					className,
-				)}
+				className={cn(drawerContentStyles, className)}
 				{...props}
 			>
-				<div className="bg-muted mx-auto mt-4 hidden h-2 w-[100px] shrink-0 rounded-full group-data-[vaul-drawer-direction=bottom]/drawer-content:block" />
+				<div className={drawerHandleStyles} />
 				{children}
 			</DrawerPrimitive.Content>
 		</DrawerPortal>
@@ -74,10 +153,7 @@ function DrawerHeader({ className, ...props }: React.ComponentProps<"div">) {
 	return (
 		<div
 			data-slot="drawer-header"
-			className={cn(
-				"flex flex-col gap-0.5 p-4 group-data-[vaul-drawer-direction=bottom]/drawer-content:text-center group-data-[vaul-drawer-direction=top]/drawer-content:text-center md:gap-1.5 md:text-left",
-				className,
-			)}
+			className={cn(drawerHeaderStyles, className)}
 			{...props}
 		/>
 	);
@@ -87,7 +163,7 @@ function DrawerFooter({ className, ...props }: React.ComponentProps<"div">) {
 	return (
 		<div
 			data-slot="drawer-footer"
-			className={cn("mt-auto flex flex-col gap-2 p-4", className)}
+			className={cn(drawerFooterStyles, className)}
 			{...props}
 		/>
 	);

package/src/shadcn/components/ui/dropdown-menu.stories.tsx

@@ -1,9 +1,11 @@
 import type { Meta, StoryObj } from "@storybook/react-vite";
+import { Edit, Trash2 } from "lucide-react";
 import { Button } from "#shadcn/components/ui/button";
 import {
 	DropdownMenu,
 	DropdownMenuContent,
 	DropdownMenuGroup,
+	DropdownMenuIcon,
 	DropdownMenuItem,
 	DropdownMenuLabel,
 	DropdownMenuPortal,
@@ -30,6 +32,7 @@ export const Demo = {
 			</DropdownMenuTrigger>
 			<DropdownMenuContent className="w-56" align="start">
 				<DropdownMenuLabel>My Account</DropdownMenuLabel>
+				<DropdownMenuSeparator />
 				<DropdownMenuGroup>
 					<DropdownMenuItem>
 						Profile
@@ -37,7 +40,9 @@ export const Demo = {
 					</DropdownMenuItem>
 					<DropdownMenuItem>
 						Billing
-						<DropdownMenuShortcut>⌘B</DropdownMenuShortcut>
+						<div>
+							<DropdownMenuShortcut>⌘B</DropdownMenuShortcut>
+						</div>
 					</DropdownMenuItem>
 					<DropdownMenuItem>
 						Settings
@@ -68,7 +73,18 @@ export const Demo = {
 					</DropdownMenuItem>
 				</DropdownMenuGroup>
 				<DropdownMenuSeparator />
-				<DropdownMenuItem>GitHub</DropdownMenuItem>
+				<DropdownMenuItem>
+					GitHub
+					<div className="ml-auto flex items-center gap-0.5">
+						<DropdownMenuIcon>
+							<Edit />
+						</DropdownMenuIcon>
+						<DropdownMenuIcon>
+							<Trash2 />
+						</DropdownMenuIcon>
+					</div>
+				</DropdownMenuItem>
+
 				<DropdownMenuItem>Support</DropdownMenuItem>
 				<DropdownMenuItem disabled>API</DropdownMenuItem>
 				<DropdownMenuSeparator />

package/src/shadcn/components/ui/dropdown-menu.tsx

@@ -1,9 +1,307 @@
 import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu";
+import { cva, type VariantProps } from "class-variance-authority";
 import { CheckIcon, ChevronRightIcon, CircleIcon } from "lucide-react";
 import type * as React from "react";
 
 import { cn } from "#shadcn/lib/utils";
 
+// Styles
+const dropdownMenuContentBaseStyles = cn(
+	// Background
+	"bg-bg-primary",
+	// Layout
+	"z-50",
+	"max-h-(--radix-dropdown-menu-content-available-height)",
+	"min-w-[8rem]",
+	"origin-(--radix-dropdown-menu-content-transform-origin)",
+	"overflow-x-hidden",
+	"overflow-y-auto",
+	// Shape
+	"rounded-md",
+	// Border
+	"border",
+	"border-border-primary",
+	// Spacing
+	"p-2",
+	"gap-1",
+	"flex",
+	"flex-col",
+	// Shadow
+	"dropdown-menu-shadow",
+	// Animations - open
+	"data-[state=open]:animate-in",
+	"data-[state=open]:fade-in-0",
+	"data-[state=open]:zoom-in-95",
+	// Animations - closed
+	"data-[state=closed]:animate-out",
+	"data-[state=closed]:fade-out-0",
+	"data-[state=closed]:zoom-out-95",
+	// Slide animations
+	"data-[side=bottom]:slide-in-from-top-2",
+	"data-[side=left]:slide-in-from-right-2",
+	"data-[side=right]:slide-in-from-left-2",
+	"data-[side=top]:slide-in-from-bottom-2",
+);
+
+const dropdownMenuItemBaseStyles = cn(
+	// Layout
+	"flex",
+	"items-center",
+	"justify-between",
+	"gap-2",
+	"h-7",
+	// Spacing
+	"px-2",
+	"py-0",
+	// Shape
+	"rounded",
+	// Typography
+	"typo-body",
+	// Colors
+	"text-text-primary",
+	// Interaction
+	"cursor-pointer",
+	"outline-hidden",
+	"select-none",
+	// Focus states
+	"focus:bg-bg-tertiary",
+	"focus:text-text-primary",
+	"focus:rounded",
+	// Disabled states
+	"data-[disabled]:pointer-events-none",
+	"data-[disabled]:opacity-50",
+	// Inset spacing
+	"data-[inset]:pl-8",
+	// SVG
+	"[&_svg]:pointer-events-none",
+	"[&_svg]:shrink-0",
+	"[&_svg:not([class*='size-'])]:size-4",
+	"[&_svg:not([class*='text-'])]:text-fg-secondary",
+);
+
+const dropdownMenuItemVariants = cva(dropdownMenuItemBaseStyles, {
+	variants: {
+		variant: {
+			default: "",
+			destructive: cn(
+				"data-[variant=destructive]:text-text-error-primary",
+				"data-[variant=destructive]:focus:bg-bg-error-tertiary",
+				"data-[variant=destructive]:focus:text-text-error-primary",
+				"data-[variant=destructive]:*:[svg]:!text-text-error-primary",
+			),
+		},
+	},
+	defaultVariants: {
+		variant: "default",
+	},
+});
+
+const dropdownMenuCheckboxItemBaseStyles = cn(
+	// Layout
+	"relative",
+	"flex",
+	"items-center",
+	"gap-2",
+	"h-7",
+	// Spacing
+	"py-0",
+	"pr-2",
+	"pl-9",
+	// Shape
+	"rounded",
+	// Typography
+	"typo-body",
+	// Colors
+	"text-text-primary",
+	// Interaction
+	"cursor-default",
+	"outline-hidden",
+	"select-none",
+	// Focus states
+	"focus:bg-bg-secondary",
+	"focus:text-text-primary",
+	// Disabled states
+	"data-[disabled]:pointer-events-none",
+	"data-[disabled]:opacity-50",
+	// SVG
+	"[&_svg]:pointer-events-none",
+	"[&_svg]:shrink-0",
+	"[&_svg:not([class*='size-'])]:size-4",
+	"[&_svg]:text-text-link",
+);
+
+const dropdownMenuCheckboxIndicatorStyles = cn(
+	// Layout
+	"pointer-events-none",
+	"absolute",
+	"left-3",
+	"flex",
+	"size-3.5",
+	"items-center",
+	"justify-center",
+);
+
+const dropdownMenuRadioItemBaseStyles = cn(
+	// Layout
+	"relative",
+	"flex",
+	"items-center",
+	"gap-2",
+	"h-7",
+	// Spacing
+	"py-0",
+	"pr-2",
+	// Shape
+	"rounded",
+	// Typography
+	"typo-body",
+	// Colors
+	"text-text-primary",
+	// Interaction
+	"cursor-pointer",
+	"outline-hidden",
+	"select-none",
+	// Focus states
+	"focus:bg-bg-secondary",
+	"focus:text-text-primary",
+	// Disabled states
+	"data-[disabled]:pointer-events-none",
+	"data-[disabled]:opacity-50",
+	// SVG
+	"[&_svg]:pointer-events-none",
+	"[&_svg]:shrink-0",
+	"[&_svg:not([class*='size-'])]:size-4",
+);
+
+const dropdownMenuRadioIndicatorStyles = cn(
+	// Layout
+	"pointer-events-none",
+	"absolute",
+	"left-2",
+	"flex",
+	"size-3.5",
+	"items-center",
+	"justify-center",
+);
+
+const dropdownMenuLabelBaseStyles = cn(
+	// Layout
+	"flex",
+	"items-center",
+	"h-7",
+	// Spacing
+	"px-2",
+	"py-0",
+	"data-[inset]:pl-10",
+	// Typography
+	"typo-label-tiny",
+	// Colors
+	"text-text-secondary",
+);
+
+const dropdownMenuSeparatorBaseStyles = cn(
+	// Border
+	"border-t",
+	"border-border-separator",
+	// Spacing
+	"-mx-1",
+	"my-1",
+	// Size
+	"h-1",
+);
+
+const dropdownMenuShortcutBaseStyles = cn(
+	// Typography
+	"text-xs",
+	"tracking-widest",
+	// Colors
+	"text-text-secondary",
+	// Spacing
+	"ml-auto",
+);
+
+const dropdownMenuIconBaseStyles = cn(
+	// Layout
+	"flex",
+	"items-center",
+	"justify-center",
+	// Size
+	"size-6",
+	// Spacing
+	"p-1",
+	// SVG
+	"[&_svg]:pointer-events-none",
+	"[&_svg]:shrink-0",
+	"[&_svg:not([class*='size-'])]:size-4",
+	"[&_svg:not([class*='text-'])]:text-fg-tertiary",
+	// Hover states
+	"hover:[&_svg:not([class*='text-'])]:text-fg-tertiary_hover",
+);
+
+const dropdownMenuSubTriggerBaseStyles = cn(
+	// Layout
+	"flex",
+	"items-center",
+	"h-7",
+	// Spacing
+	"px-2",
+	"py-0",
+	"data-[inset]:pl-8",
+	// Shape
+	"rounded",
+	// Typography
+	"typo-body",
+	// Colors
+	"text-text-primary",
+	// Interaction
+	"cursor-default",
+	"outline-hidden",
+	"select-none",
+	// Focus states
+	"focus:bg-bg-secondary",
+	"focus:text-text-primary",
+	"data-[state=open]:bg-accent",
+	"data-[state=open]:text-accent-foreground",
+);
+
+const dropdownMenuSubContentBaseStyles = cn(
+	// Background
+	"bg-bg-primary",
+	// Layout
+	"z-50",
+	"min-w-[8rem]",
+	"origin-(--radix-dropdown-menu-content-transform-origin)",
+	"overflow-hidden",
+	// Shape
+	"rounded-md",
+	// Border
+	"border",
+	"border-border-primary",
+	// Spacing
+	"p-2",
+	"gap-1",
+	"flex",
+	"flex-col",
+	// Colors
+	"text-text-primary",
+	// Shadow
+	"dropdown-menu-shadow",
+	// Animations - open
+	"data-[state=open]:animate-in",
+	"data-[state=open]:fade-in-0",
+	"data-[state=open]:zoom-in-95",
+	// Animations - closed
+	"data-[state=closed]:animate-out",
+	"data-[state=closed]:fade-out-0",
+	"data-[state=closed]:zoom-out-95",
+	// Slide animations
+	"data-[side=bottom]:slide-in-from-top-2",
+	"data-[side=left]:slide-in-from-right-2",
+	"data-[side=right]:slide-in-from-left-2",
+	"data-[side=top]:slide-in-from-bottom-2",
+);
+
+// Components
 function DropdownMenu({
 	...props
 }: React.ComponentProps<typeof DropdownMenuPrimitive.Root>) {
@@ -39,15 +337,7 @@ function DropdownMenuContent({
 			<DropdownMenuPrimitive.Content
 				data-slot="dropdown-menu-content"
 				sideOffset={sideOffset}
-				className={cn(
-					"bg-bg-primary data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0",
-					"data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95",
-					"data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2",
-					"data-[side=top]:slide-in-from-bottom-2 z-50 max-h-(--radix-dropdown-menu-content-available-height)",
-					"min-w-[8rem] origin-(--radix-dropdown-menu-content-transform-origin)",
-					"overflow-x-hidden overflow-y-auto rounded-md border border-border-separator px-2 py-3 shadow-lg space-y-0.5",
-					className,
-				)}
+				className={cn(dropdownMenuContentBaseStyles, className)}
 				{...props}
 			/>
 		</DropdownMenuPrimitive.Portal>
@@ -67,33 +357,16 @@ function DropdownMenuItem({
 	inset,
 	variant = "default",
 	...props
-}: React.ComponentProps<typeof DropdownMenuPrimitive.Item> & {
-	inset?: boolean;
-	variant?: "default" | "destructive";
-}) {
+}: React.ComponentProps<typeof DropdownMenuPrimitive.Item> &
+	VariantProps<typeof dropdownMenuItemVariants> & {
+		inset?: boolean;
+	}) {
 	return (
 		<DropdownMenuPrimitive.Item
 			data-slot="dropdown-menu-item"
 			data-inset={inset}
 			data-variant={variant}
-			className={cn(
-				"cursor-pointer items-center flex gap-2 h-8 px-3 py-1.5 relativerounded-md",
-				"outline-hidden select-none typo-body text-text-secondary",
-				"focus:bg-bg-secondary focus:text-text-primary",
-				"data-[variant=destructive]:text-text-error-primary",
-				"data-[variant=destructive]:focus:bg-bg-error-tertiary",
-				"dark:data-[variant=destructive]:focus:bg-bg-error-tertiary",
-				"data-[variant=destructive]:focus:text-text-error-primary",
-				"data-[variant=destructive]:*:[svg]:!text-text-error-primary",
-				"[&_svg:not([class*='text-'])]:fg-fg-secondary",
-				"data-[disabled]:pointer-events-none",
-				"data-[disabled]:opacity-50",
-				"data-[inset]:pl-8",
-				"[&_svg]:pointer-events-none",
-				"[&_svg]:shrink-0",
-				"[&_svg:not([class*='size-'])]:size-4",
-				className,
-			)}
+			className={cn(dropdownMenuItemVariants({ variant }), className)}
 			{...props}
 		/>
 	);
@@ -107,15 +380,10 @@ function DropdownMenuCheckboxItem({
 	return (
 		<DropdownMenuPrimitive.CheckboxItem
 			data-slot="dropdown-menu-checkbox-item"
-			className={cn(
-				"focus:bg-bg-secondary focus:text-text-primary relative flex cursor-default items-center gap-2 rounded-lg py-1 pr-2 pl-9",
-				"outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none",
-				"[&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 [&_svg]:text-text-link h-8 typo-body text-text-secondary",
-				className,
-			)}
+			className={cn(dropdownMenuCheckboxItemBaseStyles, className)}
 			{...props}
 		>
-			<span className="pointer-events-none absolute left-3 flex size-3.5 items-center justify-center">
+			<span className={dropdownMenuCheckboxIndicatorStyles}>
 				<DropdownMenuPrimitive.ItemIndicator>
 					<CheckIcon className="size-4" />
 				</DropdownMenuPrimitive.ItemIndicator>
@@ -144,15 +412,10 @@ function DropdownMenuRadioItem({
 	return (
 		<DropdownMenuPrimitive.RadioItem
 			data-slot="dropdown-menu-radio-item"
-			className={cn(
-				"focus:bg-bg-secondary focus:text-text-primary relative flex cursor-pointer items-center gap-2 rounded-md py-1.5 pr-2",
-				"outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none",
-				"[&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 h-8 typo-body text-text-secondary",
-				className,
-			)}
+			className={cn(dropdownMenuRadioItemBaseStyles, className)}
 			{...props}
 		>
-			<span className="pointer-events-none absolute left-2 flex size-3.5 items-center justify-center">
+			<span className={dropdownMenuRadioIndicatorStyles}>
 				<DropdownMenuPrimitive.ItemIndicator>
 					<CircleIcon className="size-2 fill-current" />
 				</DropdownMenuPrimitive.ItemIndicator>
@@ -173,10 +436,7 @@ function DropdownMenuLabel({
 		<DropdownMenuPrimitive.Label
 			data-slot="dropdown-menu-label"
 			data-inset={inset}
-			className={cn(
-				"px-3 py-1.5 data-[inset]:pl-10 typo-body text-text-secondary",
-				className,
-			)}
+			className={cn(dropdownMenuLabelBaseStyles, className)}
 			{...props}
 		/>
 	);
@@ -189,7 +449,7 @@ function DropdownMenuSeparator({
 	return (
 		<DropdownMenuPrimitive.Separator
 			data-slot="dropdown-menu-separator"
-			className={cn("bg-bg-quaternary -mx-1 my-1 h-px", className)}
+			className={cn(dropdownMenuSeparatorBaseStyles, className)}
 			{...props}
 		/>
 	);
@@ -202,15 +462,28 @@ function DropdownMenuShortcut({
 	return (
 		<span
 			data-slot="dropdown-menu-shortcut"
-			className={cn(
-				"text-text-secondary ml-auto text-xs tracking-widest",
-				className,
-			)}
+			className={cn(dropdownMenuShortcutBaseStyles, className)}
 			{...props}
 		/>
 	);
 }
 
+function DropdownMenuIcon({
+	className,
+	children,
+	...props
+}: React.ComponentProps<"span">) {
+	return (
+		<span
+			data-slot="dropdown-menu-icon"
+			className={cn(dropdownMenuIconBaseStyles, className)}
+			{...props}
+		>
+			{children}
+		</span>
+	);
+}
+
 function DropdownMenuSub({
 	...props
 }: React.ComponentProps<typeof DropdownMenuPrimitive.Sub>) {
@@ -229,15 +502,13 @@ function DropdownMenuSubTrigger({
 		<DropdownMenuPrimitive.SubTrigger
 			data-slot="dropdown-menu-sub-trigger"
 			data-inset={inset}
-			className={cn(
-				"focus:bg-bg-secondary focus:text-text-primary data-[state=open]:bg-accent data-[state=open]:text-accent-foreground flex",
-				"cursor-default items-center rounded-md px-3 py-1.5 outline-hidden select-none data-[inset]:pl-8 h-8 typo-body text-text-secondary",
-				className,
-			)}
+			className={cn(dropdownMenuSubTriggerBaseStyles, className)}
 			{...props}
 		>
 			{children}
-			<ChevronRightIcon className="ml-auto size-4" />
+			<DropdownMenuIcon className="ml-auto">
+				<ChevronRightIcon />
+			</DropdownMenuIcon>
 		</DropdownMenuPrimitive.SubTrigger>
 	);
 }
@@ -249,14 +520,7 @@ function DropdownMenuSubContent({
 	return (
 		<DropdownMenuPrimitive.SubContent
 			data-slot="dropdown-menu-sub-content"
-			className={cn(
-				"bg-bg-primary text-text-primary data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0",
-				"data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2",
-				"data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50",
-				"min-w-[8rem] origin-(--radix-dropdown-menu-content-transform-origin) overflow-hidden rounded-md border border-border-separator",
-				"p-2 shadow-lg",
-				className,
-			)}
+			className={cn(dropdownMenuSubContentBaseStyles, className)}
 			{...props}
 		/>
 	);
@@ -270,11 +534,13 @@ export {
 	DropdownMenuGroup,
 	DropdownMenuLabel,
 	DropdownMenuItem,
+	dropdownMenuItemVariants,
 	DropdownMenuCheckboxItem,
 	DropdownMenuRadioGroup,
 	DropdownMenuRadioItem,
 	DropdownMenuSeparator,
 	DropdownMenuShortcut,
+	DropdownMenuIcon,
 	DropdownMenuSub,
 	DropdownMenuSubTrigger,
 	DropdownMenuSubContent,