Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

♻️ Style svgs in DropdownMenuItem and remove DropdownMenuItemIconLabel (#2673)

Luke Vellafa63670033f3
diff --git a/apps/web/src/app/[locale]/(space)/settings/api-keys/components/revoke-api-key-button.tsx b/apps/web/src/app/[locale]/(space)/settings/api-keys/components/revoke-api-key-button.tsx
index ec4910539..310a0401e 100644
--- a/apps/web/src/app/[locale]/(space)/settings/api-keys/components/revoke-api-key-button.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/api-keys/components/revoke-api-key-button.tsx
@@ -63,9 +63,9 @@ export function RevokeApiKeyButton({
onClick={() => {
revokeDialog.trigger();
}}
- className="text-destructive"
+ variant="destructive"
>
- <BanIcon className="size-4" />
+ <BanIcon />
<Trans i18nKey="revoke" defaults="Revoke" />
</DropdownMenuItem>
</DropdownMenuContent>
diff --git a/apps/web/src/app/[locale]/(space)/settings/members/components/invite-dropdown-menu.tsx b/apps/web/src/app/[locale]/(space)/settings/members/components/invite-dropdown-menu.tsx
index d36a44021..807980882 100644
--- a/apps/web/src/app/[locale]/(space)/settings/members/components/invite-dropdown-menu.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/members/components/invite-dropdown-menu.tsx
@@ -63,9 +63,9 @@ export function InviteDropdownMenu({ invite }: { invite: SpaceMemberInvite }) {
cancelInviteDialog.trigger();
}}
disabled={!canCancelInvite}
- className="text-destructive"
+ variant="destructive"
>
- <XIcon className="size-4" />
+ <XIcon />
<Trans i18nKey="cancelInvite" defaults="Cancel invite" />
</DropdownMenuItem>
</DropdownMenuContent>
diff --git a/apps/web/src/app/[locale]/(space)/settings/members/components/member-dropdown-menu.tsx b/apps/web/src/app/[locale]/(space)/settings/members/components/member-dropdown-menu.tsx
index 165a8f4d3..8f3540280 100644
--- a/apps/web/src/app/[locale]/(space)/settings/members/components/member-dropdown-menu.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/members/components/member-dropdown-menu.tsx
@@ -107,9 +107,9 @@ export function MemberDropdownMenu({ member }: { member: MemberDTO }) {
removeMemberDialog.trigger();
}}
disabled={!canDeleteMember}
- className="text-destructive"
+ variant="destructive"
>
- <XIcon className="size-4" />
+ <XIcon />
<Trans i18nKey="removeMember" defaults="Remove member" />
</DropdownMenuItem>
</DropdownMenuContent>
diff --git a/apps/web/src/app/[locale]/control-panel/users/user-row.tsx b/apps/web/src/app/[locale]/control-panel/users/user-row.tsx
index 78efb4034..7bd0be88e 100644
--- a/apps/web/src/app/[locale]/control-panel/users/user-row.tsx
+++ b/apps/web/src/app/[locale]/control-panel/users/user-row.tsx
@@ -145,24 +145,24 @@ export function UserRow({
</DropdownMenuItem>
) : (
<DropdownMenuItem
- className="text-destructive"
+ variant="destructive"
onClick={() => {
banDialog.trigger();
}}
disabled={!canBan}
>
- <BanIcon className="size-4" />
+ <BanIcon />
<Trans i18nKey="banUser" defaults="Ban user" />
</DropdownMenuItem>
)}
<DropdownMenuItem
- className="text-destructive"
+ variant="destructive"
onClick={async () => {
deleteDialog.trigger();
}}
disabled={!canDelete}
>
- <TrashIcon className="size-4" />
+ <TrashIcon />
<Trans i18nKey="delete" defaults="Delete" />
</DropdownMenuItem>
</DropdownMenuContent>
diff --git a/apps/web/src/features/poll/components/discussion.tsx b/apps/web/src/features/poll/components/discussion.tsx
index b152d9fc0..9076c6c6d 100644
--- a/apps/web/src/features/poll/components/discussion.tsx
+++ b/apps/web/src/features/poll/components/discussion.tsx
@@ -222,7 +222,7 @@ function DiscussionInner() {
</DropdownMenuTrigger>
<DropdownMenuContent align="start">
<DropdownMenuItem
- className="text-destructive"
+ variant="destructive"
onClick={() => {
deleteComment.mutate({
commentId: comment.id,
@@ -230,7 +230,7 @@ function DiscussionInner() {
});
}}
>
- <TrashIcon className="size-4" />
+ <TrashIcon />
<Trans i18nKey="delete" />
</DropdownMenuItem>
</DropdownMenuContent>
diff --git a/apps/web/src/features/poll/components/manage-poll.tsx b/apps/web/src/features/poll/components/manage-poll.tsx
index 38e7e3d56..bc4a8733c 100644
--- a/apps/web/src/features/poll/components/manage-poll.tsx
+++ b/apps/web/src/features/poll/components/manage-poll.tsx
@@ -5,11 +5,9 @@ import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
- DropdownMenuItemIconLabel,
DropdownMenuSeparator,
DropdownMenuTrigger,
} from "@rallly/ui/dropdown-menu";
-import { Icon } from "@rallly/ui/icon";
import {
CalendarCheck2Icon,
ChevronDownIcon,
@@ -80,9 +78,7 @@ function OpenCloseToggle() {
);
}}
>
- <Icon>
- <PlayIcon />
- </Icon>
+ <PlayIcon />
<Trans i18nKey="reopenPoll" defaults="Reopen" />
</DropdownMenuItem>
);
@@ -106,9 +102,7 @@ function OpenCloseToggle() {
);
}}
>
- <Icon>
- <CircleStopIcon />
- </Icon>
+ <CircleStopIcon />
<Trans i18nKey="closePoll" defaults="Close" />
</DropdownMenuItem>
);
@@ -141,23 +135,20 @@ const ManagePoll: React.FunctionComponent<{
<DropdownMenuItem
render={<Link href={`/poll/${poll.id}/edit-details`} />}
>
- <DropdownMenuItemIconLabel icon={PencilIcon}>
- <Trans i18nKey="editDetails" />
- </DropdownMenuItemIconLabel>
+ <PencilIcon />
+ <Trans i18nKey="editDetails" />
</DropdownMenuItem>
<DropdownMenuItem
render={<Link href={`/poll/${poll.id}/edit-options`} />}
>
- <DropdownMenuItemIconLabel icon={TableIcon}>
- <Trans i18nKey="editOptions" />
- </DropdownMenuItemIconLabel>
+ <TableIcon />
+ <Trans i18nKey="editOptions" />
</DropdownMenuItem>
<DropdownMenuItem
render={<Link href={`/poll/${poll.id}/edit-settings`} />}
>
- <DropdownMenuItemIconLabel icon={Settings2Icon}>
- <Trans i18nKey="editSettings" defaults="Edit settings" />
- </DropdownMenuItemIconLabel>
+ <Settings2Icon />
+ <Trans i18nKey="editSettings" defaults="Edit settings" />
</DropdownMenuItem>
<DropdownMenuSeparator />
{poll.status === "scheduled" || poll.status === "canceled" ? null : (
@@ -177,9 +168,7 @@ const ManagePoll: React.FunctionComponent<{
}
}}
>
- <Icon>
- <CalendarCheck2Icon />
- </Icon>
+ <CalendarCheck2Icon />
<Trans i18nKey="schedulePoll" defaults="Schedule" />
{isFree ? <ProBadge /> : null}
</DropdownMenuItem>
@@ -188,9 +177,8 @@ const ManagePoll: React.FunctionComponent<{
)}
<DropdownMenuSeparator />
<DropdownMenuItem onClick={exportToCsv}>
- <DropdownMenuItemIconLabel icon={DownloadIcon}>
- <Trans i18nKey="exportToCsv" />
- </DropdownMenuItemIconLabel>
+ <DownloadIcon />
+ <Trans i18nKey="exportToCsv" />
</DropdownMenuItem>
<DropdownMenuItem
onClick={() => {
@@ -206,10 +194,9 @@ const ManagePoll: React.FunctionComponent<{
}
}}
>
- <DropdownMenuItemIconLabel icon={CopyIcon}>
- <Trans i18nKey="duplicate" defaults="Duplicate" />
- {isFree ? <ProBadge /> : null}
- </DropdownMenuItemIconLabel>
+ <CopyIcon />
+ <Trans i18nKey="duplicate" defaults="Duplicate" />
+ {isFree ? <ProBadge /> : null}
</DropdownMenuItem>
<DropdownMenuSeparator />
<DropdownMenuItem
@@ -218,7 +205,7 @@ const ManagePoll: React.FunctionComponent<{
setShowDeletePollDialog(true);
}}
>
- <TrashIcon className="size-4 opacity-75" />
+ <TrashIcon />
<Trans i18nKey="delete" />
</DropdownMenuItem>
</DropdownMenuContent>
diff --git a/apps/web/src/features/poll/components/participant-dropdown.tsx b/apps/web/src/features/poll/components/participant-dropdown.tsx
index 0579cd49f..8b9084da7 100644
--- a/apps/web/src/features/poll/components/participant-dropdown.tsx
+++ b/apps/web/src/features/poll/components/participant-dropdown.tsx
@@ -12,7 +12,6 @@ import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
- DropdownMenuItemIconLabel,
DropdownMenuLabel,
DropdownMenuSeparator,
DropdownMenuTrigger,
@@ -88,20 +87,18 @@ export const ParticipantDropdown = ({
</DropdownMenuLabel>
<DropdownMenuSeparator />
<DropdownMenuItem onClick={onEdit}>
- <DropdownMenuItemIconLabel icon={PencilIcon}>
- <Trans i18nKey="editVotes" />
- </DropdownMenuItemIconLabel>
+ <PencilIcon />
+ <Trans i18nKey="editVotes" />
</DropdownMenuItem>
<DropdownMenuItem onClick={() => setIsChangeNameModalVisible(true)}>
- <DropdownMenuItemIconLabel icon={TagIcon}>
- <Trans i18nKey="changeName" />
- </DropdownMenuItemIconLabel>
+ <TagIcon />
+ <Trans i18nKey="changeName" />
</DropdownMenuItem>
<DropdownMenuItem
- className="text-destructive"
+ variant="destructive"
onClick={() => setIsDeleteParticipantModalVisible(true)}
>
- <TrashIcon className="size-4" />
+ <TrashIcon />
<Trans i18nKey="delete" />
</DropdownMenuItem>
</DropdownMenuContent>
diff --git a/packages/ui/src/dropdown-menu.tsx b/packages/ui/src/dropdown-menu.tsx
index 914ef5bf9..ad0638133 100644
--- a/packages/ui/src/dropdown-menu.tsx
+++ b/packages/ui/src/dropdown-menu.tsx
@@ -52,12 +52,13 @@ function DropdownMenuContent({
}
const dropdownMenuItemVariants = cva(
- "relative flex cursor-default select-none items-center gap-x-2.5 rounded-lg px-2 py-1.5 text-sm outline-hidden data-disabled:pointer-events-none data-highlighted:bg-popover-accent data-disabled:opacity-50 data-highlighted:ring-1 data-highlighted:ring-menu-item-outline data-highlighted:ring-inset",
+ "relative flex cursor-default select-none items-center gap-x-2.5 rounded-lg px-2 py-1.5 text-sm outline-hidden data-disabled:pointer-events-none data-highlighted:bg-popover-accent data-disabled:opacity-50 data-highlighted:ring-1 data-highlighted:ring-menu-item-outline data-highlighted:ring-inset [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
{
variants: {
variant: {
- default: "",
- destructive: "text-destructive",
+ default: "[&_svg:not([class*='text-'])]:text-muted-foreground",
+ destructive:
+ "text-destructive [&_svg:not([class*='text-'])]:text-destructive",
},
},
defaultVariants: {
@@ -193,26 +194,10 @@ function DropdownMenuSubContent({
);
}
-function DropdownMenuItemIconLabel({
- icon: IconComponent,
- children,
-}: {
- icon: React.ComponentType<{ className?: string }>;
- children: React.ReactNode;
-}) {
- return (
- <span className="flex items-center gap-2.5">
- <IconComponent className="size-4 text-muted-foreground" />
- {children}
- </span>
- );
-}
-
export {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
- DropdownMenuItemIconLabel,
DropdownMenuLabel,
DropdownMenuRadioGroup,
DropdownMenuRadioItem,