🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor DropdownMenuTrigger component for improved flexibility
Bill Yang54486ad13f61
diff --git a/client/src/app/[site]/feature-flags/components/FeatureFlagTable.tsx b/client/src/app/[site]/feature-flags/components/FeatureFlagTable.tsxindex c921e1a61..936a69aff 100644--- a/client/src/app/[site]/feature-flags/components/FeatureFlagTable.tsx+++ b/client/src/app/[site]/feature-flags/components/FeatureFlagTable.tsx@@ -176,7 +176,7 @@ function RowActions({ flag }: { flag: FeatureFlag }) {return (<><DropdownMenu>- <DropdownMenuTrigger size="smIcon" variant="ghost" asChild>+ <DropdownMenuTrigger asChild><Button size="smIcon" variant="ghost" aria-label={t("Actions")}><MoreHorizontal className="h-4 w-4" /></Button>diff --git a/client/src/app/[site]/goals/components/GoalCard.tsx b/client/src/app/[site]/goals/components/GoalCard.tsxindex acb4ffac6..a4051ee35 100644--- a/client/src/app/[site]/goals/components/GoalCard.tsx+++ b/client/src/app/[site]/goals/components/GoalCard.tsx@@ -265,7 +265,7 @@ export default function GoalCard({ goal, siteId, timeSeries, isLoadingTimeSeries<div className="flex shrink-0 justify-end gap-1 md:pl-4"><div onClick={e => e.stopPropagation()}><DropdownMenu>- <DropdownMenuTrigger asChild variant="ghost" size="smIcon" aria-label={t("Goal actions")}>+ <DropdownMenuTrigger asChild><Button variant="ghost" size="smIcon" aria-label={t("Goal actions")}><MoreHorizontal className="h-4 w-4" /></Button>diff --git a/client/src/app/[site]/query/components/QueryResultsExportMenu.tsx b/client/src/app/[site]/query/components/QueryResultsExportMenu.tsxindex 3917539c0..c30c2cdb7 100644--- a/client/src/app/[site]/query/components/QueryResultsExportMenu.tsx+++ b/client/src/app/[site]/query/components/QueryResultsExportMenu.tsx@@ -64,13 +64,12 @@ export function QueryResultsExportMenu({<Buttontype="button"variant="ghost"- size={compact ? "smIcon" : "xs"}+ size="smIcon"disabled={!canExport}aria-label={t("Download results")}- className={cn(compact ? "h-7 w-7" : "h-7 px-2", className)}+ className={cn(compact && "h-6 w-6", className)}><Download className="h-3.5 w-3.5" />- {!compact && <span>{t("Export")}</span>}</Button></DropdownMenuTrigger></TooltipTrigger>diff --git a/client/src/components/ui/dropdown-menu.tsx b/client/src/components/ui/dropdown-menu.tsxindex 10f6d8e4a..a237cab49 100644--- a/client/src/components/ui/dropdown-menu.tsx+++ b/client/src/components/ui/dropdown-menu.tsx@@ -15,10 +15,11 @@ const DropdownMenuTrigger = React.forwardRef<ButtonProps & {unstyled?: boolean;}->(({ className, variant, size, unstyled, ...props }, ref) => (+>(({ asChild, className, variant, size, unstyled, ...props }, ref) => (<DropdownMenuPrimitive.Triggerref={ref}- className={unstyled ? className : cn(buttonVariants({ variant, size, className }))}+ asChild={asChild}+ className={unstyled || asChild ? className : cn(buttonVariants({ variant, size, className }))}{...props}/>));