Skip to content

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

Migrate the filter value lists off Emotion (#83384)

Andrei Chernykhc80438a0926d
diff --git a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Parameter_List_Single_With_Value.png b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Parameter_List_Single_With_Value.png
index ed2b9be898d..d12a891eff8 100644
Binary files a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Parameter_List_Single_With_Value.png and b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Parameter_List_Single_With_Value.png differ
diff --git a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Parameter_List_Single_With_Value.png b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Parameter_List_Single_With_Value.png
index ad5bb5b3875..94c8a14a0f2 100644
Binary files a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Parameter_List_Single_With_Value.png and b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Parameter_List_Single_With_Value.png differ
diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/FieldValuesWidget.tsx b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/FieldValuesWidget.tsx
index 266721b0802..1d8605ec4c6 100644
--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/FieldValuesWidget.tsx
+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/FieldValuesWidget.tsx
@@ -57,7 +57,7 @@ import type {
import { Value as ValueComponent } from "../Value";
import { ListField } from "./ListField";
-import SingleSelectListField from "./SingleSelectListField";
+import { SingleSelectListField } from "./SingleSelectListField";
import type { LoadingStateType, ValuesMode } from "./types";
import {
canUseCardEndpoints,
@@ -108,7 +108,6 @@ export interface IFieldValuesWidgetProps {
autoFocus?: boolean;
className?: string;
placeholder?: string;
- checkedColor?: string;
optionRenderer?: (option: FieldValue) => JSX.Element;
}
@@ -138,7 +137,6 @@ export const FieldValuesWidgetInner = forwardRef<
autoFocus,
className,
placeholder,
- checkedColor,
optionRenderer,
},
ref,
@@ -384,7 +382,6 @@ export const FieldValuesWidgetInner = forwardRef<
onChange={onChange}
options={options}
optionRenderer={optionRenderer}
- checkedColor={checkedColor}
/>
) : isListMode && hasListValues && !multi ? (
<SingleSelectListField
@@ -394,7 +391,6 @@ export const FieldValuesWidgetInner = forwardRef<
onChange={onChange}
options={options}
optionRenderer={optionRenderer}
- checkedColor={checkedColor}
/>
) : multi ? (
<MultiAutocompleteWithTranslation
diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/ListField.module.css b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/ListField.module.css
new file mode 100644
index 00000000000..c77a6fc28d9
--- /dev/null
+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/ListField.module.css
@@ -0,0 +1,4 @@
+.optionsList {
+ overflow: auto;
+ list-style: none;
+}
diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/ListField.styled.tsx b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/ListField.styled.tsx
deleted file mode 100644
index b9acbac2d1a..00000000000
--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/ListField.styled.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import styled from "@emotion/styled";
-
-export const EmptyStateContainer = styled.div`
- padding: 2rem 2rem 0 2rem;
-`;
-
-interface FilterInputProps {
- isDashboardFilter?: boolean;
-}
-
-export const FilterInputContainer = styled.div<FilterInputProps>`
- margin-bottom: ${(props) => (props.isDashboardFilter ? "0" : "0.5rem")};
-`;
-
-interface OptionListProps {
- isDashboardFilter?: boolean;
-}
-
-export const OptionsList = styled.ul<OptionListProps>`
- overflow: auto;
- list-style: none;
- max-height: ${(props) => (props.isDashboardFilter ? "300px" : "none")};
- padding: ${(props) => (props.isDashboardFilter ? "0.5rem" : "0")};
- padding-bottom: 0;
-`;
-
-export const OptionContainer = styled.li`
- padding: 0.5rem 0.125rem;
-`;
diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/ListField.tsx b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/ListField.tsx
index e6ea00c1a4a..f4baa2b0839 100644
--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/ListField.tsx
+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/ListField.tsx
@@ -1,42 +1,27 @@
import type { ChangeEventHandler } from "react";
import { useCallback, useMemo, useRef, useState } from "react";
import { t } from "ttag";
-import _ from "underscore";
import { EmptyState } from "metabase/common/components/EmptyState";
import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";
import { useTranslateContent } from "metabase/content-translation/hooks";
import { PLUGIN_CONTENT_TRANSLATION } from "metabase/content-translation/plugins";
-import { optionItemEqualsFilter } from "metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/utils";
-import { Checkbox, Input, Text, TextInput } from "metabase/ui";
+import { Box, Checkbox, Input, Text, TextInput } from "metabase/ui";
import { delay } from "metabase/utils/delay";
import type { RowValue } from "metabase-types/api";
-import {
- EmptyStateContainer,
- FilterInputContainer,
- OptionContainer,
- OptionsList,
-} from "./ListField.styled";
+import S from "./ListField.module.css";
import type { ListFieldProps, Option } from "./types";
import {
+ createOptionsFromValuesWithoutOptions,
getOptionDisplayName,
normalizeValuesToOptionKeys,
+ optionItemEqualsFilter,
optionMatchesFilter,
} from "./utils";
const DEBOUNCE_FILTER_TIME = delay(100);
-function createOptionsFromValuesWithoutOptions(
- values: RowValue[],
- options: Option[],
-): Option[] {
- const optionsMap = new Map(options.map((option) => [option[0], option]));
- return values
- .filter((value) => !optionsMap.has(value))
- .map((value) => [value]);
-}
-
export const ListField = ({
onChange,
value,
@@ -124,13 +109,13 @@ export const ListField = ({
const shouldShowEmptyState =
augmentedOptions.length > 0 && filteredOptions.length === 0;
- const handleToggleOption = (option: any) => {
+ const handleToggleOption = (option: RowValue) => {
const newSelectedValues = selectedValues.has(option)
? Array.from(selectedValues).filter((value) => value !== option)
: [...selectedValues, option];
setSelectedValues(new Set(newSelectedValues));
- onChange?.(newSelectedValues);
+ onChange(newSelectedValues);
};
const handleKeyDown = (event: React.KeyboardEvent) => {
@@ -140,7 +125,7 @@ export const ListField = ({
if (
event.key === "Enter" &&
filter.trim().length > 0 &&
- !_.find(augmentedOptions, (option) =>
+ !augmentedOptions.some((option) =>
optionItemEqualsFilter(option[0], filter),
)
) {
@@ -167,35 +152,40 @@ export const ListField = ({
return (
<>
- <FilterInputContainer isDashboardFilter={isDashboardFilter}>
- <TextInput
- autoFocus
- placeholder={placeholder}
- value={filter}
- onChange={handleFilterChange}
- onKeyDown={handleKeyDown}
- rightSectionPointerEvents="all"
- rightSection={
- filter.length > 0 ? (
- <Input.ClearButton
- c="text-secondary"
- onClick={() => setFilter("")}
- />
- ) : null
- }
- data-testid="list-field"
- />
- </FilterInputContainer>
+ <TextInput
+ autoFocus
+ placeholder={placeholder}
+ value={filter}
+ onChange={handleFilterChange}
+ onKeyDown={handleKeyDown}
+ rightSectionPointerEvents="all"
+ rightSection={
+ filter.length > 0 ? (
+ <Input.ClearButton
+ c="text-secondary"
+ onClick={() => setFilter("")}
+ />
+ ) : null
+ }
+ mb={isDashboardFilter ? 0 : "sm"}
+ data-testid="list-field"
+ />
{shouldShowEmptyState && (
- <EmptyStateContainer>
+ <Box pt="xxl" px="xxl">
<EmptyState message={t`Didn't find anything`} icon="search" />
- </EmptyStateContainer>
+ </Box>
)}
- <OptionsList isDashboardFilter={isDashboardFilter}>
+ <Box
+ component="ul"
+ className={S.optionsList}
+ mah={isDashboardFilter ? 300 : undefined}
+ pt={isDashboardFilter ? "sm" : undefined}
+ px={isDashboardFilter ? "sm" : undefined}
+ >
{filteredOptions.length > 0 && (
- <OptionContainer>
+ <Box component="li" py="sm" px="xxxs">
<Checkbox
variant="stacked"
label={
@@ -207,19 +197,19 @@ export const ListField = ({
indeterminate={!isAll && !isNone}
onChange={handleToggleAll}
/>
- </OptionContainer>
+ </Box>
)}
{filteredOptions.map((option, index) => (
- <OptionContainer key={index}>
+ <Box component="li" key={index} py="sm" px="xxxs">
<Checkbox
data-testid={`${option[0]}-filter-value`}
checked={selectedValues.has(option[0])}
label={optionRenderer(option)}
onChange={() => handleToggleOption(option[0])}
/>
- </OptionContainer>
+ </Box>
))}
- </OptionsList>
+ </Box>
</>
);
};
diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/ListField.unit.spec.tsx b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/ListField.unit.spec.tsx
index 38e586c1d42..8e218624e3c 100644
--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/ListField.unit.spec.tsx
+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/ListField.unit.spec.tsx
@@ -13,7 +13,6 @@ type SetupOpts = {
options?: Option[];
optionRenderer?: (option: Option) => JSX.Element;
placeholder?: string;
- checkedColor?: string;
isDashboardFilter?: boolean;
};
@@ -22,7 +21,6 @@ function setup({
options = [],
optionRenderer = ([value]) => <>{value}</>,
placeholder = "Search the list",
- checkedColor,
isDashboardFilter,
}: SetupOpts) {
const onChange = jest.fn();
@@ -33,7 +31,6 @@ function setup({
options={options}
optionRenderer={optionRenderer}
placeholder={placeholder}
- checkedColor={checkedColor}
isDashboardFilter={isDashboardFilter}
onChange={onChange}
/>,
diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/types.ts b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/types.ts
index d0ce8cc0a75..5244de4a256 100644
--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/types.ts
+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/types.ts
@@ -13,5 +13,4 @@ export interface ListFieldProps {
optionRenderer: (option: Option) => JSX.Element;
placeholder: string;
isDashboardFilter?: boolean;
- checkedColor?: string;
}
diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/utils.ts b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/utils.ts
index c4692f63ad6..c1287312624 100644
--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/utils.ts
+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/utils.ts
@@ -32,9 +32,27 @@ export function optionMatchesFilter(
export const removeDiacritics = (value: string) =>
value?.normalize("NFD").replace(/[\u0300-\u036f]/g, "");
+/** Turns selected values that have no matching option into options of their own. */
+export function createOptionsFromValuesWithoutOptions(
+ values: RowValue[],
+ options: Option[],
+): Option[] {
+ const optionsMap = new Map(options.map((option) => [option[0], option]));
+ return values
+ .filter((value) => !optionsMap.has(value))
+ .map((value) => [value]);
+}
+
export const getOptionDisplayName = (option: Option | RowValue[]) =>
String(option.at(-1));
+export function optionItemEqualsFilter(
+ optionItem: unknown,
+ filter: string,
+): boolean {
+ return String(optionItem) === filter;
+}
+
/**
* Coerces selected values to match option key types via string comparison.
* This fixes a type mismatch where URL query params are normalized to numbers
diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/utils.unit.spec.ts b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/utils.unit.spec.ts
index 8d1a9373ea3..ea4e8591d73 100644
--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/utils.unit.spec.ts
+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/utils.unit.spec.ts
@@ -2,7 +2,11 @@ import type { ContentTranslationFunction } from "metabase/content-translation/ty
import type { FieldValue } from "metabase-types/api";
import { translateToGerman, translateToJapanese } from "./test-constants";
-import { optionMatchesFilter, removeDiacritics } from "./utils";
+import {
+ createOptionsFromValuesWithoutOptions,
+ optionMatchesFilter,
+ removeDiacritics,
+} from "./utils";
describe("ListField - utils", () => {
describe("isValidOptionItem", () => {
@@ -68,4 +72,37 @@ describe("ListField - utils", () => {
expect(removeDiacritics("e\u0301")).toBe("e");
});
});
+
+ describe("createOptionsFromValuesWithoutOptions", () => {
+ it("should turn only the values without a matching option into options, in order", () => {
+ const options: FieldValue[] = [["Doohickey"], ["Gizmo"]];
+
+ expect(
+ createOptionsFromValuesWithoutOptions(
+ ["Widget", "Gizmo", "Gadget"],
+ options,
+ ),
+ ).toEqual([["Widget"], ["Gadget"]]);
+ });
+
+ it("should match values against the option key, not its display name", () => {
+ const options: FieldValue[] = [
+ [1, "Doohickey"],
+ [2, "Gadget"],
+ ];
+
+ expect(
+ createOptionsFromValuesWithoutOptions([2, "Gadget", 3], options),
+ ).toEqual([["Gadget"], [3]]);
+ });
+
+ it("should return nothing when every value has an option", () => {
+ expect(
+ createOptionsFromValuesWithoutOptions(
+ ["Gizmo"],
+ [["Gizmo"], ["Widget"]],
+ ),
+ ).toEqual([]);
+ });
+ });
});
diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/SingleSelectListField.module.css b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/SingleSelectListField.module.css
new file mode 100644
index 00000000000..2a4f700ea93
--- /dev/null
+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/SingleSelectListField.module.css
@@ -0,0 +1,16 @@
+.optionsList {
+ overflow: auto;
+ list-style: none;
+}
+
+/* Selected items set their color and background as props, which also override this hover. */
+.optionItem {
+ cursor: pointer;
+ color: var(--mb-color-text-primary);
+ background-color: var(--mb-color-background_page-primary);
+
+ &:hover {
+ color: var(--mb-color-text-brand-hover);
+ background-color: var(--mb-color-background_surface-hover);
+ }
+}
diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/SingleSelectListField.styled.tsx b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/SingleSelectListField.styled.tsx
deleted file mode 100644
index ca33a595144..00000000000
--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/SingleSelectListField.styled.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import { css } from "@emotion/react";
-// eslint-disable-next-line no-restricted-imports
-import styled from "@emotion/styled";
-
-export const EmptyStateContainer = styled.div`
- padding: 2rem 2rem 0 2rem;
-`;
-
-interface OptionListProps {
- isDashboardFilter?: boolean;
-}
-
-interface FilterInputProps {
- isDashboardFilter?: boolean;
-}
-
-export const FilterInputContainer = styled.div<FilterInputProps>`
- margin-bottom: ${(props) => (props.isDashboardFilter ? "0" : "0.5rem")};
-`;
-
-export const OptionsList = styled.ul<OptionListProps>`
- overflow: auto;
- list-style: none;
- max-height: ${(props) => (props.isDashboardFilter ? "300px" : "none")};
- padding: 0.5rem 0 0;
-`;
-
-export const OptionContainer = styled.li`
- padding: 0;
-`;
-
-interface OptionItemProps {
- selected?: boolean;
- selectedColor: string;
-}
-
-export const OptionItem = styled.div<OptionItemProps>`
- border-radius: 4px;
- cursor: pointer;
- display: inline-block;
- margin: 0;
- padding: 0.5rem 0.6rem;
- width: 100%;
- ${(props) =>
- props.selected
- ? css`
- color: var(--mb-color-text-selected);
- background-color: ${props.selectedColor};
- `
- : css`
- color: var(--mb-color-text-primary);
- background-color: var(--mb-color-background_page-primary);
- `}
-
- &:hover {
- ${(props) =>
- !props.selected &&
- css`
- color: var(--mb-color-text-brand-hover);
- background-color: var(--mb-color-background_surface-hover);
- `}
- }
-`;
diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/SingleSelectListField.tsx b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/SingleSelectListField.tsx
index a6b3cd7eff6..0b0f4d78853 100644
--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/SingleSelectListField.tsx
+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/SingleSelectListField.tsx
@@ -1,45 +1,29 @@
import type { ChangeEventHandler } from "react";
import { useMemo, useState } from "react";
import { t } from "ttag";
-import _ from "underscore";
import { EmptyState } from "metabase/common/components/EmptyState";
import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";
import { useTranslateContent } from "metabase/content-translation/hooks";
import { PLUGIN_CONTENT_TRANSLATION } from "metabase/content-translation/plugins";
-import { Input, TextInput } from "metabase/ui";
+import { Box, Input, TextInput } from "metabase/ui";
import { delay } from "metabase/utils/delay";
import type { RowValue } from "metabase-types/api";
import {
+ createOptionsFromValuesWithoutOptions,
getOptionDisplayName,
normalizeValuesToOptionKeys,
+ optionItemEqualsFilter,
optionMatchesFilter,
} from "../ListField/utils";
-import {
- EmptyStateContainer,
- FilterInputContainer,
- OptionContainer,
- OptionItem,
- OptionsList,
-} from "./SingleSelectListField.styled";
+import S from "./SingleSelectListField.module.css";
import type { Option, SingleSelectListFieldProps } from "./types";
-import { optionItemEqualsFilter } from "./utils";
const DEBOUNCE_FILTER_TIME = delay(100);
-function createOptionsFromValuesWithoutOptions(
- values: RowValue[],
- options: Option[],
-): Option[] {
- const optionsMap = new Map(options.map((option) => [option[0], option]));
- return values
- .filter((value) => !optionsMap.has(value))
- .map((value) => [value]);
-}
-
-const SingleSelectListField = ({
+export const SingleSelectListField = ({
onChange,
value,
options,
@@ -47,13 +31,12 @@ const SingleSelectListField = ({
placeholder = t`Find...`,
onSearchChange,
isDashboardFilter,
- checkedColor,
}: SingleSelectListFieldProps) => {
const normalizedValue = useMemo(
() => normalizeValuesToOptionKeys(value, options),
[value, options],
);
- const [selectedValue, setSelectedValue] = useState(normalizedValue?.[0]);
+ const [selectedValue, setSelectedValue] = useState(normalizedValue[0]);
const [addedOptions, setAddedOptions] = useState<Option[]>(() =>
createOptionsFromValuesWithoutOptions(normalizedValue, options),
);
@@ -118,13 +101,13 @@ const SingleSelectListField = ({
const shouldShowEmptyState =
filter.length > 0 && filteredOptions.length === 0;
- const onClickOption = (option: any) => {
+ const onClickOption = (option: RowValue) => {
if (selectedValue !== option) {
setSelectedValue(option);
const maybeTranslatedOption =
typeof option === "string" ? tc(option) : String(option);
setFilter(maybeTranslatedOption);
- onChange?.([option]);
+ onChange([option]);
}
};
@@ -135,9 +118,7 @@ const SingleSelectListField = ({
if (
event.key === "Enter" &&
filter.trim().length > 0 &&
- !_.find(augmentedOptions, (option) =>
- optionItemEqualsFilter(option, filter),
- )
+ !augmentedOptions.some((option) => optionItemEqualsFilter(option, filter))
) {
event.preventDefault();
setAddedOptions([...addedOptions, [filter]]);
@@ -152,6 +133,10 @@ const SingleSelectListField = ({
onSearchChange?.(value);
};
+ const selectedBackground = isDashboardFilter
+ ? "background_surface-selected"
+ : "core-filter";
+
const handleResetClick = () => {
setFilter("");
onChange([]);
@@ -161,54 +146,57 @@ const SingleSelectListField = ({
return (
<>
- <FilterInputContainer isDashboardFilter={isDashboardFilter}>
- <TextInput
- autoFocus
- placeholder={placeholder}
- value={filter}
- onChange={handleFilterChange}
- onKeyDown={handleKeyDown}
- rightSectionPointerEvents="all"
- rightSection={
- filter.length > 0 ? (
- <Input.ClearButton
- c="text-secondary"
- onClick={handleResetClick}
- />
- ) : null
- }
- data-testid="single-select-list-field"
- />
- </FilterInputContainer>
+ <TextInput
+ autoFocus
+ placeholder={placeholder}
+ value={filter}
+ onChange={handleFilterChange}
+ onKeyDown={handleKeyDown}
+ rightSectionPointerEvents="all"
+ rightSection={
+ filter.length > 0 ? (
+ <Input.ClearButton c="text-secondary" onClick={handleResetClick} />
+ ) : null
+ }
+ mb={isDashboardFilter ? 0 : "sm"}
+ data-testid="single-select-list-field"
+ />
{shouldShowEmptyState && (
- <EmptyStateContainer>
+ <Box pt="xxl" px="xxl">
<EmptyState message={t`Didn't find anything`} icon="search" />
- </EmptyStateContainer>
+ </Box>
)}
- <OptionsList isDashboardFilter={isDashboardFilter}>
- {filteredOptions.map((option) => (
- <OptionContainer key={String(option[0])}>
- <OptionItem
- data-testid={`${option[0]}-filter-value`}
- selectedColor={
- (checkedColor ?? isDashboardFilter)
- ? "var(--mb-color-background_surface-selected)"
- : "var(--mb-color-core-filter)"
- }
- selected={selectedValue === option[0]}
- onClick={() => onClickOption(option[0])}
- onMouseDown={(e) => e.preventDefault()}
- >
- {optionRenderer(option)}
- </OptionItem>
- </OptionContainer>
- ))}
- </OptionsList>
+ <Box
+ component="ul"
+ className={S.optionsList}
+ mah={isDashboardFilter ? 300 : undefined}
+ pt="sm"
+ >
+ {filteredOptions.map((option) => {
+ const isSelected = selectedValue === option[0];
+
+ return (
+ <li key={String(option[0])}>
+ <Box
+ className={S.optionItem}
+ data-testid={`${option[0]}-filter-value`}
+ display="inline-block"
+ w="100%"
+ p="sm"
+ bdrs="xxs"
+ c={isSelected ? "text-selected" : undefined}
+ bg={isSelected ? selectedBackground : undefined}
+ onClick={() => onClickOption(option[0])}
+ onMouseDown={(e) => e.preventDefault()}
+ >
+ {optionRenderer(option)}
+ </Box>
+ </li>
+ );
+ })}
+ </Box>
</>
);
};
-
-// eslint-disable-next-line import/no-default-export -- deprecated usage
-export default SingleSelectListField;
diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/SingleSelectListField.unit.spec.tsx b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/SingleSelectListField.unit.spec.tsx
index c7e89cd391d..650c69915cb 100644
--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/SingleSelectListField.unit.spec.tsx
+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/SingleSelectListField.unit.spec.tsx
@@ -7,7 +7,7 @@ import type { ColumnSettings, FieldValue, RowValue } from "metabase-types/api";
import { Value as ValueComponent } from "../../Value";
-import SingleSelectListField from "./index";
+import { SingleSelectListField } from "./index";
const value: RowValue[] = [];
const firstOption = "AK";
diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/index.ts b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/index.ts
index b6591e5da6e..81b6d015c76 100644
--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/index.ts
+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/index.ts
@@ -1,2 +1 @@
-// eslint-disable-next-line import/no-default-export -- deprecated usage
-export { default } from "./SingleSelectListField";
+export { SingleSelectListField } from "./SingleSelectListField";
diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/types.ts b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/types.ts
index 522ef4e87df..84386dbd543 100644
--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/types.ts
+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/types.ts
@@ -10,5 +10,4 @@ export interface SingleSelectListFieldProps {
onSearchChange?: (value: string) => void;
placeholder?: string;
isDashboardFilter?: boolean;
- checkedColor?: string;
}
diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/utils.ts b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/utils.ts
deleted file mode 100644
index e993291b869..00000000000
--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/utils.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export function optionItemEqualsFilter(
- optionItem: any,
- filter: string,
-): boolean {
- return String(optionItem) === filter;
-}
diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-filters.stories.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-filters.stories.tsx
index ea0cdd75256..2a31987af98 100644
--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-filters.stories.tsx
+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-filters.stories.tsx
@@ -599,10 +599,7 @@ export const LightThemeParameterListSingleWithValue = {
);
await userEvent.click(documentElement.getByText("Widget"));
const popover = getLastPopover();
- // Unjustified type cast. FIXME
- (popover.getByText("Gadget").parentNode as HTMLElement).classList.add(
- "pseudo-hover",
- );
+ popover.getByTestId("Gadget-filter-value").classList.add("pseudo-hover");
},
};