Skip to content

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

Migrate EventCard to use CSS modules (#83765)

Nick Fitzpatricka33de4950f19
diff --git a/frontend/src/metabase/timelines/questions/components/EventCard/EventCard.module.css b/frontend/src/metabase/timelines/questions/components/EventCard/EventCard.module.css
new file mode 100644
index 00000000000..5fe632c1e8e
--- /dev/null
+++ b/frontend/src/metabase/timelines/questions/components/EventCard/EventCard.module.css
@@ -0,0 +1,13 @@
+.root {
+ border-left: 0.25rem solid transparent;
+ cursor: pointer;
+
+ &:hover {
+ background-color: var(--mb-color-background_surface-hover);
+ }
+
+ &.selected {
+ border-left-color: var(--mb-color-core-brand);
+ background-color: var(--mb-color-background_surface-hover);
+ }
+}
diff --git a/frontend/src/metabase/timelines/questions/components/EventCard/EventCard.styled.tsx b/frontend/src/metabase/timelines/questions/components/EventCard/EventCard.styled.tsx
deleted file mode 100644
index dee55c72821..00000000000
--- a/frontend/src/metabase/timelines/questions/components/EventCard/EventCard.styled.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-// eslint-disable-next-line eslint-js/no-restricted-imports
-import styled from "@emotion/styled";
-
-import { alpha } from "metabase/ui/colors";
-
-interface CardRootProps {
- isSelected?: boolean;
-}
-
-export const CardRoot = styled.div<CardRootProps>`
- display: flex;
- padding: 0.25rem 0.75rem;
- border-left: 0.25rem solid
- ${(props) =>
- props.isSelected ? "var(--mb-color-core-brand)" : "transparent"};
- background-color: ${(props) =>
- props.isSelected ? alpha("core-brand", 0.03) : "transparent"};
- cursor: pointer;
-
- &:hover {
- background-color: ${() => alpha("core-brand", 0.03)};
- }
-`;
-
-export const CardCheckboxContainer = styled.div`
- display: flex;
- flex: 0 0 auto;
- justify-content: center;
- align-items: center;
- width: 2rem;
- height: 2rem;
-`;
-
-export const CardBody = styled.div`
- flex: 1 1 auto;
- padding: 0.125rem 0.75rem 0 0.125rem;
- min-width: 0;
-`;
-
-export const CardAside = styled.div`
- flex: 0 0 auto;
- align-self: start;
-`;
diff --git a/frontend/src/metabase/timelines/questions/components/EventCard/EventCard.tsx b/frontend/src/metabase/timelines/questions/components/EventCard/EventCard.tsx
index 4fd87fb638d..42b85ceece7 100644
--- a/frontend/src/metabase/timelines/questions/components/EventCard/EventCard.tsx
+++ b/frontend/src/metabase/timelines/questions/components/EventCard/EventCard.tsx
@@ -1,18 +1,15 @@
+import cx from "classnames";
import type { ChangeEvent, SyntheticEvent } from "react";
import { memo, useCallback } from "react";
import { t } from "ttag";
import { TimelineEventInfo } from "metabase/common/components/TimelineEventInfo";
import { useScrollOnMount } from "metabase/common/hooks/use-scroll-on-mount";
-import { ActionIcon, Checkbox, Icon, Menu } from "metabase/ui";
+import CS from "metabase/css/core/index.css";
+import { ActionIcon, Box, Checkbox, Flex, Icon, Menu } from "metabase/ui";
import type { Timeline, TimelineEvent } from "metabase-types/api";
-import {
- CardAside,
- CardBody,
- CardCheckboxContainer,
- CardRoot,
-} from "./EventCard.styled";
+import S from "./EventCard.module.css";
export interface EventCardProps {
event: TimelineEvent;
@@ -27,7 +24,7 @@ export interface EventCardProps {
onHideTimelineEvents: (timelineEvent: TimelineEvent[]) => void;
}
-const EventCard = ({
+const EventCardInner = ({
event,
timeline,
isSelected,
@@ -64,24 +61,30 @@ const EventCard = ({
}, []);
return (
- <CardRoot
+ <Flex
+ className={cx(S.root, { [S.selected]: isVisible && isSelected })}
+ py="xxs"
+ px="md"
aria-label={t`Timeline event card`}
ref={isSelected ? selectedRef : null}
- isSelected={isVisible && isSelected}
onClick={handleToggleSelected}
>
- <CardCheckboxContainer>
+ <Flex flex="0 0 auto" justify="center" align="center" w="2rem" h="2rem">
<Checkbox
checked={isVisible}
onChange={handleChangeVisibility}
onClick={handleAsideClick}
/>
- </CardCheckboxContainer>
- <CardBody>
+ </Flex>
+ <Box flex="1 1 auto" pt="xxxs" pr="md" pl="xxxs" miw={0}>
<TimelineEventInfo event={event} />
- </CardBody>
+ </Box>
{menuItems.length > 0 && (
- <CardAside onClick={handleAsideClick}>
+ <Box
+ className={CS.alignSelfStart}
+ flex="0 0 auto"
+ onClick={handleAsideClick}
+ >
<Menu position="bottom-end" shadow="sm">
<Menu.Target>
<ActionIcon variant="subtle" aria-label={t`Event menu`}>
@@ -90,9 +93,9 @@ const EventCard = ({
</Menu.Target>
<Menu.Dropdown>{menuItems}</Menu.Dropdown>
</Menu>
- </CardAside>
+ </Box>
)}
- </CardRoot>
+ </Flex>
);
};
@@ -132,5 +135,4 @@ const getMenuItems = (
return items;
};
-// eslint-disable-next-line import/no-default-export -- deprecated usage
-export default memo(EventCard);
+export const EventCard = memo(EventCardInner);
diff --git a/frontend/src/metabase/timelines/questions/components/EventCard/EventCard.unit.spec.tsx b/frontend/src/metabase/timelines/questions/components/EventCard/EventCard.unit.spec.tsx
index 2d7de54e803..e06351bdb4c 100644
--- a/frontend/src/metabase/timelines/questions/components/EventCard/EventCard.unit.spec.tsx
+++ b/frontend/src/metabase/timelines/questions/components/EventCard/EventCard.unit.spec.tsx
@@ -7,8 +7,7 @@ import {
createMockTimelineEvent,
} from "metabase-types/api/mocks";
-import type { EventCardProps } from "./EventCard";
-import EventCard from "./EventCard";
+import { EventCard, type EventCardProps } from "./EventCard";
describe("EventCard", () => {
it("should render an event with date", () => {
diff --git a/frontend/src/metabase/timelines/questions/components/EventCard/index.ts b/frontend/src/metabase/timelines/questions/components/EventCard/index.ts
index cd93569b2ee..aebb45f921b 100644
--- a/frontend/src/metabase/timelines/questions/components/EventCard/index.ts
+++ b/frontend/src/metabase/timelines/questions/components/EventCard/index.ts
@@ -1,2 +1 @@
-// eslint-disable-next-line import/no-default-export -- deprecated usage
-export { default } from "./EventCard";
+export { EventCard } from "./EventCard";
diff --git a/frontend/src/metabase/timelines/questions/components/TimelineCard/TimelineCard.tsx b/frontend/src/metabase/timelines/questions/components/TimelineCard/TimelineCard.tsx
index 776e8abf816..56433f3afca 100644
--- a/frontend/src/metabase/timelines/questions/components/TimelineCard/TimelineCard.tsx
+++ b/frontend/src/metabase/timelines/questions/components/TimelineCard/TimelineCard.tsx
@@ -7,7 +7,7 @@ import { getTimelineName } from "metabase/common/utils/timelines";
import { Box, Checkbox, Ellipsified, Flex, Icon } from "metabase/ui";
import type { Timeline, TimelineEvent } from "metabase-types/api";
-import EventCard from "../EventCard";
+import { EventCard } from "../EventCard";
import S from "./TimelineCard.module.css";