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 accordion list and aggregation header off Emotion (#83390)

Andrei Chernykha8ba83ff21c7
diff --git a/frontend/src/metabase/common/components/AccordionList/AccordionListCell.styled.tsx b/frontend/src/metabase/common/components/AccordionList/AccordionListCell.styled.tsx
deleted file mode 100644
index 6bcb89a3ce9..00000000000
--- a/frontend/src/metabase/common/components/AccordionList/AccordionListCell.styled.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import styled from "@emotion/styled";
-
-import { alpha } from "metabase/ui/colors";
-
-interface ListCellItemProps {
- isClickable: boolean;
-}
-
-export const ListCellItem = styled.div<ListCellItemProps>`
- border-color: ${(props) => props.isClickable && alpha("accent2", 0.2)};
-`;
-
-export const Content = styled.div<{ isClickable: boolean }>`
- flex: 1 1 auto;
- display: flex;
- align-items: center;
- padding: 0.5rem;
- cursor: ${(props) => (props.isClickable ? "pointer" : "default")};
- min-width: 0;
-`;
-
-export const IconWrapper = styled.span`
- margin-left: auto;
- font-size: 0.875rem;
-`;
-
-export const EmptyStateContainer = styled.div`
- margin-top: 1.5rem;
- margin-bottom: 1rem;
- font-size: 0.875rem;
-`;
diff --git a/frontend/src/metabase/common/components/AccordionList/AccordionListCell.tsx b/frontend/src/metabase/common/components/AccordionList/AccordionListCell.tsx
index 43b0857ad83..4de3051c482 100644
--- a/frontend/src/metabase/common/components/AccordionList/AccordionListCell.tsx
+++ b/frontend/src/metabase/common/components/AccordionList/AccordionListCell.tsx
@@ -15,18 +15,12 @@ import { ListSearchField } from "metabase/common/components/ListSearchField";
import ListS from "metabase/css/components/list.module.css";
import CS from "metabase/css/core/index.css";
import type { TextInputProps } from "metabase/ui";
-import { Box, Icon, Loader, Text, isValidIconName } from "metabase/ui";
+import { Box, Flex, Icon, Loader, Text, isValidIconName } from "metabase/ui";
import type { ColorName } from "metabase/ui/colors/types";
import { color } from "metabase/ui/utils/colors";
import { isTouchDevice } from "metabase/utils/browser";
import styles from "./AccordionListCell.module.css";
-import {
- Content,
- EmptyStateContainer,
- IconWrapper,
- ListCellItem,
-} from "./AccordionListCell.styled";
import type { Item, Row, Section } from "./types";
import { isReactNode } from "./utils";
@@ -301,16 +295,14 @@ export const AccordionListCell = forwardRef(function AccordionListCell<
<Loader size="xs" />
</Box>
)}
- <IconWrapper>
- <Icon name="chevronright" size={12} />
- </IconWrapper>
+ <Icon name="chevronright" size={12} ml="auto" flex="0 0 auto" />
</div>
);
} else if (type === "no-results") {
content = (
- <EmptyStateContainer>
+ <Box mt="xl" mb="lg" fz="md">
<EmptyState message={t`Didn't find any results`} icon="search" />
- </EmptyStateContainer>
+ </Box>
);
} else if (type === "loading") {
content = (
@@ -342,13 +334,12 @@ export const AccordionListCell = forwardRef(function AccordionListCell<
const label = renderItemLabel ? renderItemLabel(item) : name;
content = (
- <ListCellItem
+ <div
data-testid={itemTestId}
aria-label={label}
role="option"
aria-selected={isSelected}
aria-disabled={!isClickable}
- isClickable={isClickable}
data-element-id="list-item"
data-hascursor={hasCursor}
className={cx(
@@ -365,8 +356,12 @@ export const AccordionListCell = forwardRef(function AccordionListCell<
)}
style={getItemStyles(item, itemIndex) ?? {}}
>
- <Content
- isClickable={isClickable}
+ <Flex
+ className={isClickable ? CS.cursorPointer : CS.cursorDefault}
+ flex="1 1 auto"
+ align="center"
+ p="sm"
+ miw={0}
onClick={isClickable ? () => onChange(item) : undefined}
>
{icon && (
@@ -404,7 +399,7 @@ export const AccordionListCell = forwardRef(function AccordionListCell<
<Loader size="xs" />
</Box>
)}
- </Content>
+ </Flex>
{extra}
{showItemArrows && (
<div
@@ -413,7 +408,7 @@ export const AccordionListCell = forwardRef(function AccordionListCell<
<Icon name="chevronright" size={8} />
</div>
)}
- </ListCellItem>
+ </div>
);
if (renderItemWrapper) {
diff --git a/frontend/src/metabase/querying/common/components/AggregationPicker/AggregationPicker.styled.tsx b/frontend/src/metabase/querying/common/components/AggregationPicker/AggregationPicker.styled.tsx
deleted file mode 100644
index 5e6fc275931..00000000000
--- a/frontend/src/metabase/querying/common/components/AggregationPicker/AggregationPicker.styled.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import styled from "@emotion/styled";
-
-export const ColumnPickerHeaderContainer = styled.div`
- display: flex;
- align-items: center;
- padding: 1rem 0.5rem;
- border-bottom: 1px solid var(--mb-color-border-neutral);
- color: var(--mb-color-text-secondary);
-`;
-
-export const ColumnPickerHeaderTitleContainer = styled.a`
- display: flex;
- align-items: center;
- cursor: pointer;
- gap: 0.5rem;
-`;
diff --git a/frontend/src/metabase/querying/common/components/AggregationPicker/AggregationPicker.tsx b/frontend/src/metabase/querying/common/components/AggregationPicker/AggregationPicker.tsx
index e68702d3626..f9c0c4ff114 100644
--- a/frontend/src/metabase/querying/common/components/AggregationPicker/AggregationPicker.tsx
+++ b/frontend/src/metabase/querying/common/components/AggregationPicker/AggregationPicker.tsx
@@ -22,6 +22,7 @@ import {
import { Popover } from "metabase/common/components/MetadataInfo/Popover";
import { useToggle } from "metabase/common/hooks/use-toggle";
import { useTranslateContent } from "metabase/content-translation/hooks";
+import CS from "metabase/css/core/index.css";
import { hasFeature } from "metabase/databases";
import { QueryColumnPicker } from "metabase/querying/common/components/QueryColumnPicker";
import {
@@ -33,14 +34,9 @@ import {
clausesForMode,
getClauseDefinition,
} from "metabase/querying/expressions";
-import { Box, Flex, Icon, Text } from "metabase/ui";
+import { Box, Flex, Icon, Text, UnstyledButton } from "metabase/ui";
import * as Lib from "metabase-lib";
-import {
- ColumnPickerHeaderContainer,
- ColumnPickerHeaderTitleContainer,
-} from "./AggregationPicker.styled";
-
export interface AggregationPickerProps {
className?: string;
query: Lib.Query;
@@ -487,14 +483,26 @@ function ColumnPickerHeader({
onClick: () => void;
}) {
return (
- <ColumnPickerHeaderContainer>
- <ColumnPickerHeaderTitleContainer onClick={onClick} aria-label={t`Back`}>
+ <Flex
+ className={CS.borderBottom}
+ align="center"
+ py="lg"
+ px="sm"
+ c="text-secondary"
+ >
+ <Flex
+ component={UnstyledButton}
+ align="center"
+ gap="sm"
+ onClick={onClick}
+ aria-label={t`Back`}
+ >
<Icon name="chevronleft" size={18} />
<Text fz="lg" fw="bold" lh="normal" c="inherit">
{children}
</Text>
- </ColumnPickerHeaderTitleContainer>
- </ColumnPickerHeaderContainer>
+ </Flex>
+ </Flex>
);
}