From 6145cf16f39cd0ec715a4def21617d0606fbcbf6 Mon Sep 17 00:00:00 2001
From: RachelElysia <71795832+RachelElysia@users.noreply.github.com>
Date: Mon, 10 Feb 2025 13:08:27 -0500
Subject: [PATCH] Fleet UI: Unreleased selected option bug (#26217)

---
 .../DropdownWrapper/DropdownWrapper.tsx       | 35 +++++++++++++------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/frontend/components/forms/fields/DropdownWrapper/DropdownWrapper.tsx b/frontend/components/forms/fields/DropdownWrapper/DropdownWrapper.tsx
index e6d2a4dba4..7c982f6711 100644
--- a/frontend/components/forms/fields/DropdownWrapper/DropdownWrapper.tsx
+++ b/frontend/components/forms/fields/DropdownWrapper/DropdownWrapper.tsx
@@ -31,12 +31,6 @@ import Icon from "components/Icon";
 import { IconNames } from "components/icons";
 import { TooltipContent } from "interfaces/dropdownOption";
 
-const getOptionBackgroundColor = (
-  state: OptionProps<CustomOptionType, false>
-) => {
-  return state.isFocused ? COLORS["ui-vibrant-blue-10"] : "transparent";
-};
-
 export interface CustomOptionType {
   label: React.ReactNode;
   value: string;
@@ -46,6 +40,8 @@ export interface CustomOptionType {
   iconName?: IconNames;
 }
 
+type DropdownWrapperVariant = "table-filter" | "button";
+
 export interface IDropdownWrapper {
   options: CustomOptionType[];
   value?: PropsValue<CustomOptionType> | string;
@@ -64,13 +60,32 @@ export interface IDropdownWrapper {
   /** E.g. scroll to view dropdown menu in a scrollable parent container */
   onMenuOpen?: () => void;
   /** Table filter dropdowns have filter icon and height: 40px
-   *  Button dropdowns have hover/active state, padding, height like actual buttons */
-  variant?: "table-filter" | "button";
+   *  Button dropdowns have hover/active state, padding, height matching actual buttons, and no selected option styling */
+  variant?: DropdownWrapperVariant;
   /** This makes the menu fit all text without wrapping,
    * aligning right to fit text on screen */
   nowrapMenu?: boolean;
 }
 
+const getOptionBackgroundColor = (
+  state: OptionProps<CustomOptionType, false>
+) => {
+  return state.isFocused ? COLORS["ui-vibrant-blue-10"] : "transparent";
+};
+
+const getOptionFontWeight = (
+  state: OptionProps<CustomOptionType, false>,
+  variant?: DropdownWrapperVariant
+) => {
+  // For "button" dropdowns, selected options are not styled differently
+  if (variant === "button") {
+    return "normal";
+  }
+
+  // For other variants, selected options are bold
+  return state.isSelected ? "bold" : "normal";
+};
+
 const baseClass = "dropdown-wrapper";
 
 const DropdownWrapper = ({
@@ -380,7 +395,7 @@ const DropdownWrapper = ({
       fontSize: "14px",
       borderRadius: "4px",
       backgroundColor: getOptionBackgroundColor(state),
-      fontWeight: state.isSelected ? "bold" : "normal",
+      fontWeight: getOptionFontWeight(state, variant),
       color: COLORS["core-fleet-black"],
       "&:hover": {
         backgroundColor: state.isDisabled
@@ -473,7 +488,7 @@ const DropdownWrapper = ({
         tabIndex={isDisabled ? -1 : 0} // Ensures disabled dropdown has no keyboard accessibility
         placeholder={placeholder}
         onMenuOpen={onMenuOpen}
-        controlShouldRenderValue={variant !== "button"}
+        controlShouldRenderValue={variant !== "button"} // Control doesn't change placeholder to selected value
       />
     </FormField>
   );