Remove DropdownMenuComponent

BrunoQuaresma · BrunoQuaresma · commit 283080179ce1 · 2024-12-30T17:05:35.000Z
diff --git a/site/src/components/DropdownMenu/DropdownMenu.tsx b/site/src/components/DropdownMenu/DropdownMenu.tsx
@@ -216,23 +216,3 @@ export const DropdownMenuShortcut = ({
 	);
 };
 DropdownMenuShortcut.displayName = "DropdownMenuShortcut";
-
-export interface DropdownMenuButtonProps
-	extends ComponentPropsWithoutRef<typeof Button> {}
-
-export const DropdownMenuButton = forwardRef<
-	HTMLButtonElement,
-	DropdownMenuButtonProps
->(({ children, ...props }, ref) => {
-	return (
-		<Button ref={ref} variant="outline" {...props}>
-			{children}
-			<DropdownMenuChevronDown />
-		</Button>
-	);
-});
-DropdownMenuButton.displayName = "DropdownMenuButton";
-
-export const DropdownMenuChevronDown: FC = () => {
-	return <ChevronDownIcon className="text-content-primary !size-icon-xs" />;
-};
diff --git a/site/src/modules/dashboard/Navbar/DeploymentDropdown.tsx b/site/src/modules/dashboard/Navbar/DeploymentDropdown.tsx
@@ -1,13 +1,14 @@
 import { type Interpolation, type Theme, css, useTheme } from "@emotion/react";
 import MenuItem from "@mui/material/MenuItem";
-import { DropdownMenuButton } from "components/DropdownMenu/DropdownMenu";
+import { Button } from "components/Button/Button";
 import { FeatureStageBadge } from "components/FeatureStageBadge/FeatureStageBadge";
 import {
 	Popover,
 	PopoverContent,
 	PopoverTrigger,
 	usePopover,
 } from "components/deprecated/Popover/Popover";
+import { ChevronDownIcon } from "lucide-react";
 import { linkToAuditing } from "modules/navigation";
 import type { FC } from "react";
 import { NavLink } from "react-router-dom";
@@ -39,7 +40,10 @@ export const DeploymentDropdown: FC<DeploymentDropdownProps> = ({
 	return (
 		<Popover>
 			<PopoverTrigger>
-				<DropdownMenuButton size="lg">Admin settings</DropdownMenuButton>
+				<Button variant="outline" size="lg">
+					Admin settings
+					<ChevronDownIcon className="text-content-primary !size-icon-xs" />
+				</Button>
 			</PopoverTrigger>
 
 			<PopoverContent
diff --git a/site/src/modules/dashboard/Navbar/ProxyMenu.tsx b/site/src/modules/dashboard/Navbar/ProxyMenu.tsx
@@ -6,14 +6,15 @@ import Skeleton from "@mui/material/Skeleton";
 import { visuallyHidden } from "@mui/utils";
 import type * as TypesGen from "api/typesGenerated";
 import { Abbr } from "components/Abbr/Abbr";
-import { DropdownMenuButton } from "components/DropdownMenu/DropdownMenu";
 import { displayError } from "components/GlobalSnackbar/utils";
 import { Latency } from "components/Latency/Latency";
 import type { ProxyContextValue } from "contexts/ProxyContext";
 import { useAuthenticated } from "contexts/auth/RequireAuth";
 import { type FC, useRef, useState } from "react";
 import { useNavigate } from "react-router-dom";
 import { sortProxiesByLatency } from "./proxyUtils";
+import { Button } from "components/Button/Button";
+import { ChevronDownIcon } from "lucide-react";
 
 interface ProxyMenuProps {
 	proxyContextValue: ProxyContextValue;
@@ -69,7 +70,8 @@ export const ProxyMenu: FC<ProxyMenuProps> = ({ proxyContextValue }) => {
 
 	return (
 		<>
-			<DropdownMenuButton
+			<Button
+				variant="outline"
 				ref={buttonRef}
 				onClick={() => setIsOpen(true)}
 				size="lg"
@@ -102,7 +104,9 @@ export const ProxyMenu: FC<ProxyMenuProps> = ({ proxyContextValue }) => {
 				) : (
 					"Select Proxy"
 				)}
-			</DropdownMenuButton>
+
+				<ChevronDownIcon className="text-content-primary !size-icon-xs" />
+			</Button>
 
 			<Menu
 				open={isOpen}
