The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Uxw 3699 emotion css mantine common timelines (#84317)
Nick Fitzpatrick5764c0a4e43d
diff --git a/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.tsx b/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.tsxindex 4d5bacaba54..f20b2785aec 100644--- a/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.tsx+++ b/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.tsx@@ -6,7 +6,7 @@ import { ForwardRefLink } from "metabase/common/components/Link";import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";import { getTimelineName } from "metabase/common/utils/timelines";import CS from "metabase/css/core/index.css";-import ModalHeader from "metabase/timelines/common/components/ModalHeader";+import { ModalHeader } from "metabase/timelines/common/components/ModalHeader";import { MODAL_MIN_HEIGHT } from "metabase/timelines/common/constants";import { ActionIcon, Button, Flex, Icon, Menu, TextInput } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/timelines/collections/components/TimelineListModal/TimelineListModal.tsx b/frontend/src/metabase/timelines/collections/components/TimelineListModal/TimelineListModal.tsxindex c2859094251..3310543077e 100644--- a/frontend/src/metabase/timelines/collections/components/TimelineListModal/TimelineListModal.tsx+++ b/frontend/src/metabase/timelines/collections/components/TimelineListModal/TimelineListModal.tsx@@ -7,7 +7,7 @@ import {getSortedTimelines,} from "metabase/common/utils/timelines";import CS from "metabase/css/core/index.css";-import ModalHeader from "metabase/timelines/common/components/ModalHeader";+import { ModalHeader } from "metabase/timelines/common/components/ModalHeader";import { MODAL_MIN_HEIGHT } from "metabase/timelines/common/constants";import { ActionIcon, Flex, Icon, Menu } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsx b/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsxindex 3e0a50ce8b8..365607eea87 100644--- a/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsx@@ -5,7 +5,8 @@ import {useListTimelinesQuery,} from "metabase/api";import { useNavigate } from "metabase/router";-import MoveEventModal, {+import {+ MoveEventModal,type MoveEventModalProps,} from "metabase/timelines/common/components/MoveEventModal";import { useSetTimeline } from "metabase/timelines/common/hooks";diff --git a/frontend/src/metabase/timelines/common/components/DeleteEventModal/DeleteEventModal.tsx b/frontend/src/metabase/timelines/common/components/DeleteEventModal/DeleteEventModal.tsxindex d3c35840e5d..221ec140b5c 100644--- a/frontend/src/metabase/timelines/common/components/DeleteEventModal/DeleteEventModal.tsx+++ b/frontend/src/metabase/timelines/common/components/DeleteEventModal/DeleteEventModal.tsx@@ -4,8 +4,8 @@ import { t } from "ttag";import { Button } from "metabase/ui";import type { TimelineEvent } from "metabase-types/api";-import ModalFooter from "../ModalFooter";-import ModalHeader from "../ModalHeader";+import { ModalFooter } from "../ModalFooter";+import { ModalHeader } from "../ModalHeader";export interface DeleteEventModalProps {event: TimelineEvent;diff --git a/frontend/src/metabase/timelines/common/components/DeleteTimelineModal/DeleteTimelineModal.tsx b/frontend/src/metabase/timelines/common/components/DeleteTimelineModal/DeleteTimelineModal.tsxindex 0e16f20ce54..54336b7dc16 100644--- a/frontend/src/metabase/timelines/common/components/DeleteTimelineModal/DeleteTimelineModal.tsx+++ b/frontend/src/metabase/timelines/common/components/DeleteTimelineModal/DeleteTimelineModal.tsx@@ -4,8 +4,8 @@ import { t } from "ttag";import { Button } from "metabase/ui";import type { Timeline } from "metabase-types/api";-import ModalFooter from "../ModalFooter";-import ModalHeader from "../ModalHeader";+import { ModalFooter } from "../ModalFooter";+import { ModalHeader } from "../ModalHeader";export interface DeleteTimelineModalProps {timeline: Timeline;diff --git a/frontend/src/metabase/timelines/common/components/EditEventModal/EditEventModal.tsx b/frontend/src/metabase/timelines/common/components/EditEventModal/EditEventModal.tsxindex e1662dd54c1..10a5dd43ebe 100644--- a/frontend/src/metabase/timelines/common/components/EditEventModal/EditEventModal.tsx+++ b/frontend/src/metabase/timelines/common/components/EditEventModal/EditEventModal.tsx@@ -9,7 +9,7 @@ import type {import EventForm from "../../containers/EventForm";import ModalBody from "../ModalBody";-import ModalHeader from "../ModalHeader";+import { ModalHeader } from "../ModalHeader";export interface EditEventModalProps {event: TimelineEvent;diff --git a/frontend/src/metabase/timelines/common/components/EditTimelineModal/EditTimelineModal.tsx b/frontend/src/metabase/timelines/common/components/EditTimelineModal/EditTimelineModal.tsxindex f8b9c5af166..4a16b2a89e7 100644--- a/frontend/src/metabase/timelines/common/components/EditTimelineModal/EditTimelineModal.tsx+++ b/frontend/src/metabase/timelines/common/components/EditTimelineModal/EditTimelineModal.tsx@@ -4,8 +4,8 @@ import { t } from "ttag";import type { Timeline, TimelineData } from "metabase-types/api";import ModalBody from "../ModalBody";-import ModalHeader from "../ModalHeader";-import TimelineForm from "../TimelineForm";+import { ModalHeader } from "../ModalHeader";+import { TimelineForm } from "../TimelineForm";export interface EditTimelineModalProps {timeline: Timeline;diff --git a/frontend/src/metabase/timelines/common/components/FormArchiveButton/FormArchiveButton.tsx b/frontend/src/metabase/timelines/common/components/FormArchiveButton/FormArchiveButton.tsxindex 4f3b3c608f0..7ac2abc2dd3 100644--- a/frontend/src/metabase/timelines/common/components/FormArchiveButton/FormArchiveButton.tsx+++ b/frontend/src/metabase/timelines/common/components/FormArchiveButton/FormArchiveButton.tsx@@ -19,7 +19,6 @@ const FormArchiveButton = ({type="button"variant="subtle"color="negative"- px={0}onClick={onClick}>{children}diff --git a/frontend/src/metabase/timelines/common/components/ModalFooter/ModalFooter.styled.tsx b/frontend/src/metabase/timelines/common/components/ModalFooter/ModalFooter.styled.tsxdeleted file mode 100644index 9bb1a5a05c4..00000000000--- a/frontend/src/metabase/timelines/common/components/ModalFooter/ModalFooter.styled.tsx+++ /dev/null@@ -1,13 +0,0 @@-// eslint-disable-next-line eslint-js/no-restricted-imports-import styled from "@emotion/styled";--interface FooterProps {- hasPadding?: boolean;-}--export const FooterRoot = styled.div<FooterProps>`- display: flex;- gap: 1rem;- justify-content: flex-end;- padding: ${(props) => (props.hasPadding ? "2rem" : "0")} 2rem 2rem;-`;diff --git a/frontend/src/metabase/timelines/common/components/ModalFooter/ModalFooter.tsx b/frontend/src/metabase/timelines/common/components/ModalFooter/ModalFooter.tsxindex 9425cc18294..a20d0499655 100644--- a/frontend/src/metabase/timelines/common/components/ModalFooter/ModalFooter.tsx+++ b/frontend/src/metabase/timelines/common/components/ModalFooter/ModalFooter.tsx@@ -1,18 +1,25 @@import type { ReactNode } from "react";-import { FooterRoot } from "./ModalFooter.styled";+import { Flex } from "metabase/ui";export interface ModalFooterProps {hasPadding?: boolean;children?: ReactNode;}-const ModalFooter = ({+export const ModalFooter = ({hasPadding,children,}: ModalFooterProps): JSX.Element => {- return <FooterRoot hasPadding={hasPadding}>{children}</FooterRoot>;+ return (+ <Flex+ gap="lg"+ justify="flex-end"+ pt={hasPadding ? "xxl" : 0}+ px="xxl"+ pb="xxl"+ >+ {children}+ </Flex>+ );};--// eslint-disable-next-line import/no-default-export -- deprecated usage-export default ModalFooter;diff --git a/frontend/src/metabase/timelines/common/components/ModalFooter/index.ts b/frontend/src/metabase/timelines/common/components/ModalFooter/index.tsindex 19fbcd3c7c9..82f200817c1 100644--- a/frontend/src/metabase/timelines/common/components/ModalFooter/index.ts+++ b/frontend/src/metabase/timelines/common/components/ModalFooter/index.ts@@ -1,2 +1 @@-// eslint-disable-next-line import/no-default-export -- deprecated usage-export { default } from "./ModalFooter";+export { ModalFooter } from "./ModalFooter";diff --git a/frontend/src/metabase/timelines/common/components/ModalHeader/ModalHeader.styled.tsx b/frontend/src/metabase/timelines/common/components/ModalHeader/ModalHeader.styled.tsxdeleted file mode 100644index 23e94e05c56..00000000000--- a/frontend/src/metabase/timelines/common/components/ModalHeader/ModalHeader.styled.tsx+++ /dev/null@@ -1,39 +0,0 @@-// eslint-disable-next-line eslint-js/no-restricted-imports-import styled from "@emotion/styled";--import { IconButtonWrapper } from "metabase/common/components/IconButtonWrapper";-import { Icon } from "metabase/ui";-import { color } from "metabase/ui/utils/colors";--export const HeaderLink = styled.div`- display: flex;- align-items: center;- min-width: 0;- margin-right: auto;- color: var(--mb-color-text-primary);- cursor: ${(props) => props.onClick && "pointer"};-- &:hover {- color: ${(props) => props.onClick && color("core-brand")};- }-`;--export const HeaderBackIcon = styled(Icon)`- margin-right: 0.5rem;-`;--export const HeaderMenu = styled.div`- margin-right: 1rem;-`;--/**- * Both the `height` and the `width` need to be in sync with `EntityMenuIconButton`- * in order to prevent the header from visually jumping.- * See: https://linear.app/metabase/issue/CLO-3660- */-export const HeaderCloseButton = styled(IconButtonWrapper)`- height: 36px;- width: 36px;- flex: 0 0 auto;- color: var(--mb-color-text-disabled);-`;diff --git a/frontend/src/metabase/timelines/common/components/ModalHeader/ModalHeader.tsx b/frontend/src/metabase/timelines/common/components/ModalHeader/ModalHeader.tsxindex 0c5f231f192..f5860d594a6 100644--- a/frontend/src/metabase/timelines/common/components/ModalHeader/ModalHeader.tsx+++ b/frontend/src/metabase/timelines/common/components/ModalHeader/ModalHeader.tsx@@ -1,14 +1,9 @@+import cx from "classnames";import type { ReactNode } from "react";import { c } from "ttag";-import { Box, Ellipsified, Flex, Group, Icon } from "metabase/ui";--import {- HeaderBackIcon,- HeaderCloseButton,- HeaderLink,- HeaderMenu,-} from "./ModalHeader.styled";+import CS from "metabase/css/core/index.css";+import { ActionIcon, Box, Ellipsified, Flex, Group, Icon } from "metabase/ui";export interface ModalHeaderProps {title?: ReactNode;@@ -21,18 +16,29 @@ export interface ModalHeaderProps {};}-const ModalHeader = ({+export const ModalHeader = ({title,children,onClose,onGoBack,pathOptions,}: ModalHeaderProps): JSX.Element => {+ const canGoBack = onGoBack !== undefined;+return (<Box p="xxl" pb={0}><Flex align="center">- <HeaderLink onClick={onGoBack}>- {onGoBack && <HeaderBackIcon name="chevronleft" />}+ <Flex+ className={cx(CS.textDefault, {+ [CS.cursorPointer]: canGoBack,+ [CS.textBrandHover]: canGoBack,+ })}+ align="center"+ miw={0}+ mr="auto"+ onClick={onGoBack}+ >+ {onGoBack && <Icon name="chevronleft" mr="sm" />}<EllipsifiedtooltipProps={{ w: "auto" }}fz="1.25rem"@@ -41,12 +47,12 @@ const ModalHeader = ({>{title}</Ellipsified>- </HeaderLink>- {children && <HeaderMenu>{children}</HeaderMenu>}+ </Flex>+ {children && <Box mr="lg">{children}</Box>}{onClose && (- <HeaderCloseButton onClick={onClose}>+ <ActionIcon onClick={onClose}><Icon name="close" />- </HeaderCloseButton>+ </ActionIcon>)}</Flex>{pathOptions?.showPath && (@@ -59,6 +65,3 @@ const ModalHeader = ({</Box>);};--// eslint-disable-next-line import/no-default-export -- deprecated usage-export default ModalHeader;diff --git a/frontend/src/metabase/timelines/common/components/ModalHeader/ModalHeader.unit.spec.tsx b/frontend/src/metabase/timelines/common/components/ModalHeader/ModalHeader.unit.spec.tsxindex c7e23487454..9c787aa78c1 100644--- a/frontend/src/metabase/timelines/common/components/ModalHeader/ModalHeader.unit.spec.tsx+++ b/frontend/src/metabase/timelines/common/components/ModalHeader/ModalHeader.unit.spec.tsx@@ -2,7 +2,7 @@ import userEvent from "@testing-library/user-event";import { render, screen } from "__support__/ui";-import ModalHeader from "./ModalHeader";+import { ModalHeader } from "./ModalHeader";describe("ModalHeader", () => {it("should render title", () => {diff --git a/frontend/src/metabase/timelines/common/components/ModalHeader/index.ts b/frontend/src/metabase/timelines/common/components/ModalHeader/index.tsindex 43fd50fc330..67a633cd15f 100644--- a/frontend/src/metabase/timelines/common/components/ModalHeader/index.ts+++ b/frontend/src/metabase/timelines/common/components/ModalHeader/index.ts@@ -1,2 +1 @@-// eslint-disable-next-line import/no-default-export -- deprecated usage-export { default } from "./ModalHeader";+export { ModalHeader } from "./ModalHeader";diff --git a/frontend/src/metabase/timelines/common/components/MoveEventModal/MoveEventModal.styled.tsx b/frontend/src/metabase/timelines/common/components/MoveEventModal/MoveEventModal.styled.tsxdeleted file mode 100644index 1f7166849a6..00000000000--- a/frontend/src/metabase/timelines/common/components/MoveEventModal/MoveEventModal.styled.tsx+++ /dev/null@@ -1,18 +0,0 @@-// eslint-disable-next-line eslint-js/no-restricted-imports-import styled from "@emotion/styled";--export const ModalRoot = styled.div`- display: flex;- flex-direction: column;- min-height: 573px;- max-height: 90vh;-`;--export const ModalBody = styled.div`- display: flex;- flex-direction: column;- flex: 1 1 auto;- margin: 1rem 0;- padding: 1rem 2rem;- overflow-y: auto;-`;diff --git a/frontend/src/metabase/timelines/common/components/MoveEventModal/MoveEventModal.tsx b/frontend/src/metabase/timelines/common/components/MoveEventModal/MoveEventModal.tsxindex f95ca659092..ad808cce17f 100644--- a/frontend/src/metabase/timelines/common/components/MoveEventModal/MoveEventModal.tsx+++ b/frontend/src/metabase/timelines/common/components/MoveEventModal/MoveEventModal.tsx@@ -2,14 +2,13 @@ import { useCallback, useMemo, useState } from "react";import { t } from "ttag";import { getSortedTimelines } from "metabase/common/utils/timelines";-import { Button } from "metabase/ui";+import CS from "metabase/css/core/index.css";+import { Button, Stack } from "metabase/ui";import type { Collection, Timeline, TimelineEvent } from "metabase-types/api";-import ModalFooter from "../ModalFooter";-import ModalHeader from "../ModalHeader";-import TimelinePicker from "../TimelinePicker";--import { ModalBody, ModalRoot } from "./MoveEventModal.styled";+import { ModalFooter } from "../ModalFooter";+import { ModalHeader } from "../ModalHeader";+import { TimelinePicker } from "../TimelinePicker";export interface MoveEventModalProps {event: TimelineEvent;@@ -24,7 +23,7 @@ export interface MoveEventModalProps {onClose?: () => void;}-const MoveEventModal = ({+export const MoveEventModal = ({event,timelines,collection,@@ -46,24 +45,28 @@ const MoveEventModal = ({}, [event, newTimeline, oldTimeline, onSubmit, onSubmitSuccess]);return (- <ModalRoot>+ <Stack gap={0} mih="36rem" mah="90vh"><ModalHeader title={t`Move ${event.name}`} onClose={onClose} />- <ModalBody>+ <Stack+ className={CS.overflowYAuto}+ gap={0}+ flex="1 1 auto"+ my="lg"+ py="lg"+ px="xxl"+ ><TimelinePickervalue={newTimeline}options={sortedTimelines}onChange={setNewTimeline}/>- </ModalBody>+ </Stack><ModalFooter><Button onClick={onClose}>{t`Cancel`}</Button><Button variant="filled" disabled={!isEnabled} onClick={handleSubmit}>{t`Move`}</Button></ModalFooter>- </ModalRoot>+ </Stack>);};--// eslint-disable-next-line import/no-default-export -- deprecated usage-export default MoveEventModal;diff --git a/frontend/src/metabase/timelines/common/components/MoveEventModal/MoveEventModal.unit.spec.tsx b/frontend/src/metabase/timelines/common/components/MoveEventModal/MoveEventModal.unit.spec.tsxindex 2fc273e58c3..638cddae4ab 100644--- a/frontend/src/metabase/timelines/common/components/MoveEventModal/MoveEventModal.unit.spec.tsx+++ b/frontend/src/metabase/timelines/common/components/MoveEventModal/MoveEventModal.unit.spec.tsx@@ -7,7 +7,7 @@ import {} from "metabase-types/api/mocks";import type { MoveEventModalProps } from "./MoveEventModal";-import MoveEventModal from "./MoveEventModal";+import { MoveEventModal } from "./MoveEventModal";describe("MoveEventModal", () => {it("should move an event to a different timeline", async () => {diff --git a/frontend/src/metabase/timelines/common/components/MoveEventModal/index.ts b/frontend/src/metabase/timelines/common/components/MoveEventModal/index.tsindex 3ae0e604d69..45cf5afa727 100644--- a/frontend/src/metabase/timelines/common/components/MoveEventModal/index.ts+++ b/frontend/src/metabase/timelines/common/components/MoveEventModal/index.ts@@ -1,3 +1,2 @@-// eslint-disable-next-line import/no-default-export -- deprecated usage-export { default } from "./MoveEventModal";+export { MoveEventModal } from "./MoveEventModal";export type { MoveEventModalProps } from "./MoveEventModal";diff --git a/frontend/src/metabase/timelines/common/components/NewTimelineModal/NewTimelineModal.tsx b/frontend/src/metabase/timelines/common/components/NewTimelineModal/NewTimelineModal.tsxindex 964b1e5efff..23784cba904 100644--- a/frontend/src/metabase/timelines/common/components/NewTimelineModal/NewTimelineModal.tsx+++ b/frontend/src/metabase/timelines/common/components/NewTimelineModal/NewTimelineModal.tsx@@ -6,7 +6,7 @@ import { ModalContent } from "metabase/common/components/ModalContent";import { getDefaultTimelineIcon } from "metabase/common/utils/timelines";import type { Collection, TimelineData } from "metabase-types/api";-import TimelineForm from "../TimelineForm";+import { TimelineForm } from "../TimelineForm";export interface NewTimelineModalProps {collection: Collection;diff --git a/frontend/src/metabase/timelines/common/components/TimelineForm/TimelineForm.styled.tsx b/frontend/src/metabase/timelines/common/components/TimelineForm/TimelineForm.styled.tsxdeleted file mode 100644index 9f45c1c5f59..00000000000--- a/frontend/src/metabase/timelines/common/components/TimelineForm/TimelineForm.styled.tsx+++ /dev/null@@ -1,9 +0,0 @@-// eslint-disable-next-line eslint-js/no-restricted-imports-import styled from "@emotion/styled";--export const TimelineFormFooter = styled.div`- display: flex;- align-items: center;- justify-content: flex-end;- gap: 0.5rem;-`;diff --git a/frontend/src/metabase/timelines/common/components/TimelineForm/TimelineForm.tsx b/frontend/src/metabase/timelines/common/components/TimelineForm/TimelineForm.tsxindex 949d1cebc99..4c6fc96d817 100644--- a/frontend/src/metabase/timelines/common/components/TimelineForm/TimelineForm.tsx+++ b/frontend/src/metabase/timelines/common/components/TimelineForm/TimelineForm.tsx@@ -11,14 +11,13 @@ import {FormTextInput,FormTextarea,} from "metabase/forms";-import { Button } from "metabase/ui";+import { Button, Flex } from "metabase/ui";import * as Errors from "metabase/utils/errors";import type { TimelineData } from "metabase-types/api";import FormArchiveButton from "../FormArchiveButton";import { IconField } from "./IconField";-import { TimelineFormFooter } from "./TimelineForm.styled";const TIMELINE_SCHEMA = Yup.object({name: Yup.string().required(Errors.required).max(255, Errors.maxLength),@@ -33,7 +32,7 @@ export interface TimelineFormProps {onCancel?: () => void;}-const TimelineForm = ({+export const TimelineForm = ({initialValues,onSubmit,onArchive,@@ -65,7 +64,7 @@ const TimelineForm = ({nullable/><IconField name="icon" title={t`Default icon`} options={icons} />- <TimelineFormFooter>+ <Flex align="center" justify="flex-end" gap="sm"><FormErrorMessage />{!isNew && (<FormArchiveButton onClick={onArchive}>@@ -80,12 +79,9 @@ const TimelineForm = ({disabled={!dirty}variant="filled"/>- </TimelineFormFooter>+ </Flex></Form>)}</FormProvider>);};--// eslint-disable-next-line import/no-default-export -- deprecated usage-export default TimelineForm;diff --git a/frontend/src/metabase/timelines/common/components/TimelineForm/index.ts b/frontend/src/metabase/timelines/common/components/TimelineForm/index.tsindex 802896bcfbc..9ea67a31185 100644--- a/frontend/src/metabase/timelines/common/components/TimelineForm/index.ts+++ b/frontend/src/metabase/timelines/common/components/TimelineForm/index.ts@@ -1,2 +1 @@-// eslint-disable-next-line import/no-default-export -- deprecated usage-export { default } from "./TimelineForm";+export { TimelineForm } from "./TimelineForm";diff --git a/frontend/src/metabase/timelines/common/components/TimelinePicker/TimelinePicker.module.css b/frontend/src/metabase/timelines/common/components/TimelinePicker/TimelinePicker.module.cssnew file mode 100644index 00000000000..f44f3e71fde--- /dev/null+++ b/frontend/src/metabase/timelines/common/components/TimelinePicker/TimelinePicker.module.css@@ -0,0 +1,43 @@+.iconBorder {+ border: 1px solid var(--mb-color-border-neutral);+ border-radius: 1rem;+}++.icon {+ color: var(--mb-color-text-primary);+}++.title {+ color: var(--mb-color-text-primary);+ word-wrap: break-word;+}++.description {+ color: var(--mb-color-text-secondary);+ word-wrap: break-word;+}++.aside {+ color: var(--mb-color-text-primary);+}++/* Selected and hovered cards share one look; children react to the card state. */+.card:hover,+.selected {+ background-color: var(--mb-color-core-brand);++ .title,+ .description,+ .aside {+ color: var(--mb-color-text-primary-inverse);+ }++ .icon {+ color: var(--mb-color-core-brand);+ }++ .iconBorder {+ border-color: var(--mb-color-background_page-primary);+ background-color: var(--mb-color-background_page-primary);+ }+}diff --git a/frontend/src/metabase/timelines/common/components/TimelinePicker/TimelinePicker.stories.tsx b/frontend/src/metabase/timelines/common/components/TimelinePicker/TimelinePicker.stories.tsxindex afb1f402860..30c1b258f71 100644--- a/frontend/src/metabase/timelines/common/components/TimelinePicker/TimelinePicker.stories.tsx+++ b/frontend/src/metabase/timelines/common/components/TimelinePicker/TimelinePicker.stories.tsx@@ -7,7 +7,7 @@ import {createMockTimeline,} from "metabase-types/api/mocks";-import TimelinePicker, { type TimelinePickerProps } from "./TimelinePicker";+import { TimelinePicker, type TimelinePickerProps } from "./TimelinePicker";export default {title: "App/Timelines/TimelinePicker",diff --git a/frontend/src/metabase/timelines/common/components/TimelinePicker/TimelinePicker.styled.tsx b/frontend/src/metabase/timelines/common/components/TimelinePicker/TimelinePicker.styled.tsxdeleted file mode 100644index e541b1349bc..00000000000--- a/frontend/src/metabase/timelines/common/components/TimelinePicker/TimelinePicker.styled.tsx+++ /dev/null@@ -1,91 +0,0 @@-// eslint-disable-next-line eslint-js/no-restricted-imports-import { css } from "@emotion/react";-// eslint-disable-next-line eslint-js/no-restricted-imports-import styled from "@emotion/styled";--import { Icon } from "metabase/ui";--export const ListRoot = styled.div`- display: block;-`;--export const CardBody = styled.div`- flex: 1 1 auto;- margin: 0 1rem;- min-width: 0;-`;--export const CardTitle = styled.div`- color: var(--mb-color-text-primary);- font-size: 1rem;- font-weight: bold;- margin-bottom: 0.125rem;- word-wrap: break-word;-`;--export const CardDescription = styled.div`- color: var(--mb-color-text-secondary);- font-size: 0.75rem;- word-wrap: break-word;-`;--export const CardIcon = styled(Icon)`- color: var(--mb-color-text-primary);- width: 1rem;- height: 1rem;-`;--export const CardIconContainer = styled.div`- display: flex;- flex: 0 0 auto;- justify-content: center;- align-items: center;- width: 2rem;- height: 2rem;- border: 1px solid var(--mb-color-border-neutral);- border-radius: 1rem;-`;--export const CardAside = styled.div`- flex: 0 0 auto;- color: var(--mb-color-text-primary);- font-size: 0.75rem;-`;--interface CardProps {- isSelected?: boolean;-}--const selectedStyles = css`- background-color: var(--mb-color-core-brand);-- ${CardTitle}, ${CardDescription}, ${CardAside} {- color: var(--mb-color-text-primary-inverse);- }-- ${CardIcon} {- color: var(--mb-color-core-brand);- }-- ${CardIconContainer} {- border-color: var(--mb-color-background_page-primary);- background-color: var(--mb-color-background_page-primary);- }-`;--export const CardRoot = styled.div<CardProps>`- display: flex;- align-items: center;- padding: 1rem;- border-radius: 0.25rem;- cursor: pointer;- ${(props) => props.isSelected && selectedStyles}-- &:hover {- ${selectedStyles}- }-- &:not(:last-child) {- margin-bottom: 0.5rem;- }-`;diff --git a/frontend/src/metabase/timelines/common/components/TimelinePicker/TimelinePicker.tsx b/frontend/src/metabase/timelines/common/components/TimelinePicker/TimelinePicker.tsxindex afc78fb9e5f..411d1f3603c 100644--- a/frontend/src/metabase/timelines/common/components/TimelinePicker/TimelinePicker.tsx+++ b/frontend/src/metabase/timelines/common/components/TimelinePicker/TimelinePicker.tsx@@ -1,19 +1,13 @@+import cx from "classnames";import { useCallback } from "react";import { msgid, ngettext } from "ttag";import { getEventCount } from "metabase/common/utils/timelines";+import CS from "metabase/css/core/index.css";+import { Box, Flex, Icon, Stack } from "metabase/ui";import type { Timeline } from "metabase-types/api";-import {- CardAside,- CardBody,- CardDescription,- CardIcon,- CardIconContainer,- CardRoot,- CardTitle,- ListRoot,-} from "./TimelinePicker.styled";+import S from "./TimelinePicker.module.css";export interface TimelinePickerProps {value?: Timeline;@@ -21,9 +15,13 @@ export interface TimelinePickerProps {onChange?: (value: Timeline) => void;}-const TimelinePicker = ({ value, options, onChange }: TimelinePickerProps) => {+export const TimelinePicker = ({+ value,+ options,+ onChange,+}: TimelinePickerProps) => {return (- <ListRoot>+ <Stack gap="sm">{options.map((option) => (<TimelineCardkey={option.id}@@ -32,7 +30,7 @@ const TimelinePicker = ({ value, options, onChange }: TimelinePickerProps) => {onChange={onChange}/>))}- </ListRoot>+ </Stack>);};@@ -54,24 +52,38 @@ const TimelineCard = ({}, [timeline, onChange]);return (- <CardRoot key={timeline.id} isSelected={isSelected} onClick={handleClick}>- <CardIconContainer>- <CardIcon name={timeline.icon} />- </CardIconContainer>- <CardBody>- <CardTitle>{timeline.name}</CardTitle>- <CardDescription>{timeline.description}</CardDescription>- </CardBody>- <CardAside>+ <Flex+ className={cx(S.card, CS.cursorPointer, { [S.selected]: isSelected })}+ align="center"+ p="lg"+ bdrs="xxs"+ onClick={handleClick}+ >+ <Flex+ className={S.iconBorder}+ flex="0 0 auto"+ justify="center"+ align="center"+ w="2rem"+ h="2rem"+ >+ <Icon className={S.icon} name={timeline.icon} />+ </Flex>+ <Box flex="1 1 auto" mx="lg" miw={0}>+ <Box className={S.title} fz="1rem" fw="bold" mb="xxxs">+ {timeline.name}+ </Box>+ <Box className={S.description} fz="sm">+ {timeline.description}+ </Box>+ </Box>+ <Box className={S.aside} flex="0 0 auto" fz="sm">{ngettext(msgid`${eventCount} event`,`${eventCount} events`,eventCount,)}- </CardAside>- </CardRoot>+ </Box>+ </Flex>);};--// eslint-disable-next-line import/no-default-export -- deprecated usage-export default TimelinePicker;diff --git a/frontend/src/metabase/timelines/common/components/TimelinePicker/index.ts b/frontend/src/metabase/timelines/common/components/TimelinePicker/index.tsindex 63f965eac76..08ecd404f59 100644--- a/frontend/src/metabase/timelines/common/components/TimelinePicker/index.ts+++ b/frontend/src/metabase/timelines/common/components/TimelinePicker/index.ts@@ -1,2 +1 @@-// eslint-disable-next-line import/no-default-export -- deprecated usage-export { default } from "./TimelinePicker";+export { TimelinePicker } from "./TimelinePicker";diff --git a/frontend/src/metabase/timelines/panel/containers/MoveEventModal/MoveEventModal.tsx b/frontend/src/metabase/timelines/panel/containers/MoveEventModal/MoveEventModal.tsxindex cca5a8938cf..e6ec6547cd1 100644--- a/frontend/src/metabase/timelines/panel/containers/MoveEventModal/MoveEventModal.tsx+++ b/frontend/src/metabase/timelines/panel/containers/MoveEventModal/MoveEventModal.tsx@@ -4,7 +4,8 @@ import {useListTimelinesQuery,} from "metabase/api";import { ROOT_COLLECTION } from "metabase/common/collections/constants";-import MoveEventModal, {+import {+ MoveEventModal,type MoveEventModalProps,} from "metabase/timelines/common/components/MoveEventModal";import { useSetTimeline } from "metabase/timelines/common/hooks";