From 9bbab10f1de89f652ac95e41e7540011680a5f3b Mon Sep 17 00:00:00 2001 From: Jason Gill Date: Wed, 11 Dec 2024 13:32:24 -0700 Subject: [PATCH] Ant Select minor fixes (#5594) --- CHANGELOG.md | 3 +++ clients/admin-ui/src/theme/ant.ts | 2 +- clients/fidesui/src/hoc/CustomSelect.tsx | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f5e5a5f50..24f0e34ecb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,9 @@ The types of changes are: ### Fixed - Fixing quickstart.py script [#5585](https://github.com/ethyca/fides/pull/5585) +### Changed +- Adjusted Ant's Select component colors and icon [#5594](https://github.com/ethyca/fides/pull/5594) + ## [2.51.1](https://github.com/ethyca/fides/compare/2.51.0...2.51.1) ### Fixed diff --git a/clients/admin-ui/src/theme/ant.ts b/clients/admin-ui/src/theme/ant.ts index b5a678bf2d..3f5568dcde 100644 --- a/clients/admin-ui/src/theme/ant.ts +++ b/clients/admin-ui/src/theme/ant.ts @@ -51,7 +51,7 @@ export const antTheme: AntThemeConfig = { bodyBg: palette.FIDESUI_NEUTRAL_50, }, Select: { - optionActiveBg: palette.FIDESUI_SANDSTONE, + optionActiveBg: palette.FIDESUI_NEUTRAL_50, }, Tooltip: { colorBgSpotlight: palette.FIDESUI_MINOS, diff --git a/clients/fidesui/src/hoc/CustomSelect.tsx b/clients/fidesui/src/hoc/CustomSelect.tsx index 87753f2494..fac7724a43 100644 --- a/clients/fidesui/src/hoc/CustomSelect.tsx +++ b/clients/fidesui/src/hoc/CustomSelect.tsx @@ -1,4 +1,4 @@ -import { ChevronDown } from "@carbon/icons-react"; +import { Checkmark, ChevronDown } from "@carbon/icons-react"; import { Flex, Select, SelectProps, Typography } from "antd/lib"; import { BaseOptionType, DefaultOptionType } from "antd/lib/select"; import React from "react"; @@ -37,6 +37,7 @@ const withCustomProps = (WrappedComponent: typeof Select) => { optionRender = optionDescriptionRender, className = "w-full", suffixIcon = , + menuItemSelectedIcon = , ...props }: SelectProps) => { const customProps = { @@ -44,6 +45,7 @@ const withCustomProps = (WrappedComponent: typeof Select) => { optionRender, className, suffixIcon, + menuItemSelectedIcon, "data-testid": `select${props.id ? `-${props.id}` : ""}`, ...props, };