Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Keep verification icons visible when hovering dashboard question picker items (#83712)

Andersona0989a8cc8e9
diff --git a/frontend/src/metabase/common/components/SelectList/SelectListItem.module.css b/frontend/src/metabase/common/components/SelectList/SelectListItem.module.css
new file mode 100644
index 00000000000..b5e789efe97
--- /dev/null
+++ b/frontend/src/metabase/common/components/SelectList/SelectListItem.module.css
@@ -0,0 +1,11 @@
+.icon {
+ justify-self: end;
+ color: var(--select-list-item-icon-color);
+}
+
+.root {
+ &[aria-selected="true"] .icon,
+ &:hover .icon {
+ color: var(--mb-color-text-primary-inverse);
+ }
+}
diff --git a/frontend/src/metabase/common/components/SelectList/SelectListItem.styled.tsx b/frontend/src/metabase/common/components/SelectList/SelectListItem.styled.tsx
index 1a87c5c21d7..f895cf092cf 100644
--- a/frontend/src/metabase/common/components/SelectList/SelectListItem.styled.tsx
+++ b/frontend/src/metabase/common/components/SelectList/SelectListItem.styled.tsx
@@ -5,8 +5,6 @@ import styled from "@emotion/styled";
import { Text, type TextProps } from "metabase/ui";
-import { EntityIcon } from "../EntityIcon";
-
// Unjustified type cast. FIXME
export const ItemTitle = styled(Text)<TextProps>`
margin: 0;
@@ -14,15 +12,9 @@ export const ItemTitle = styled(Text)<TextProps>`
word-break: break-word;
` as unknown as typeof Text;
-export const ItemIcon = styled(EntityIcon)`
- justify-self: end;
- color: var(--mb-color-core-brand);
-`;
-
const activeItemCss = css`
background-color: var(--mb-color-core-brand);
- ${ItemIcon},
${ItemTitle} {
color: var(--mb-color-text-primary-inverse);
}
diff --git a/frontend/src/metabase/common/components/SelectList/SelectListItem.tsx b/frontend/src/metabase/common/components/SelectList/SelectListItem.tsx
index 5016f3d772f..d63f382bd49 100644
--- a/frontend/src/metabase/common/components/SelectList/SelectListItem.tsx
+++ b/frontend/src/metabase/common/components/SelectList/SelectListItem.tsx
@@ -1,12 +1,18 @@
import cx from "classnames";
import _ from "underscore";
+import {
+ EntityIcon,
+ type EntityIconProps,
+} from "metabase/common/components/EntityIcon";
import type { IconProps } from "metabase/ui";
import { Ellipsified } from "metabase/ui";
+import { maybeColor } from "metabase/ui/utils/colors";
import type { BaseSelectListItemProps } from "./BaseSelectListItem";
import { BaseSelectListItem } from "./BaseSelectListItem";
-import { ItemIcon, ItemRoot, ItemTitle } from "./SelectListItem.styled";
+import S from "./SelectListItem.module.css";
+import { ItemRoot, ItemTitle } from "./SelectListItem.styled";
export interface SelectListItemProps extends Omit<
BaseSelectListItemProps,
@@ -43,7 +49,7 @@ export function SelectListItem({
return (
<BaseSelectListItem
as={ItemRoot}
- className={cx(classNames.root, className)}
+ className={cx(S.root, classNames.root, className)}
{...otherProps}
name={name}
aria-label={name}
@@ -71,3 +77,21 @@ export function SelectListItem({
</BaseSelectListItem>
);
}
+
+function ItemIcon({
+ color = "core-brand",
+ className,
+ style,
+ ...props
+}: EntityIconProps) {
+ return (
+ <EntityIcon
+ {...props}
+ className={cx(S.icon, className)}
+ style={{
+ "--select-list-item-icon-color": maybeColor(color),
+ ...style,
+ }}
+ />
+ );
+}