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
Migrate the collection timeline modals off Emotion (#84106)
Andrei Chernykh06e68204173f
diff --git a/frontend/src/metabase/timelines/collections/components/EventCard/EventCard.module.css b/frontend/src/metabase/timelines/collections/components/EventCard/EventCard.module.cssnew file mode 100644index 00000000000..420236eb7c0--- /dev/null+++ b/frontend/src/metabase/timelines/collections/components/EventCard/EventCard.module.css@@ -0,0 +1,22 @@+.threadIcon {+ border: 1px solid var(--mb-color-border-neutral);+}++.threadStroke {+ border-left: 1px solid var(--mb-color-border-neutral);+}++.title {+ overflow-wrap: break-word;+}++.titleLink {+ &:hover {+ color: var(--mb-color-core-brand);+ }+}++.description {+ margin-top: var(--mantine-spacing-xxs);+ overflow-wrap: break-word;+}diff --git a/frontend/src/metabase/timelines/collections/components/EventCard/EventCard.styled.tsx b/frontend/src/metabase/timelines/collections/components/EventCard/EventCard.styled.tsxdeleted file mode 100644index 837f69a06ea..00000000000--- a/frontend/src/metabase/timelines/collections/components/EventCard/EventCard.styled.tsx+++ /dev/null@@ -1,89 +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 { Markdown } from "metabase/common/components/Markdown";-import { Icon } from "metabase/ui";--export const CardRoot = styled.div`- display: flex;- align-items: stretch;- min-height: 5rem;-`;--export const CardThread = styled.div`- display: flex;- flex: 0 1 auto;- flex-direction: column;- align-items: center;-`;--export const CardThreadIcon = styled(Icon)`- color: var(--mb-color-core-brand);- width: 1rem;- height: 1rem;-`;--export const CardThreadIconContainer = styled.div`- display: flex;- justify-content: center;- align-items: center;- width: 2rem;- height: 2rem;- border: 1px solid var(--mb-color-border-neutral);- border-radius: 1rem;-`;--export const CardThreadStroke = styled.div`- flex: 1 1 auto;- border-left: 1px solid var(--mb-color-border-neutral);-`;--export const CardBody = styled.div`- flex: 1 1 auto;- padding: 0.25rem 0.75rem 0.5rem;- min-width: 0;-`;--interface CardTitleProps {- to?: string;-}--const cardTitleHoverStyles = css`- &:hover {- color: var(--mb-color-core-brand);- }-`;--export const CardTitle = styled.div<CardTitleProps>`- color: var(--mb-color-text-primary);- font-size: 1rem;- line-height: 1.25rem;- font-weight: bold;- word-wrap: break-word;- ${(props) => props.to && cardTitleHoverStyles};-`;--export const CardDescription = styled(Markdown)`- color: var(--mb-color-text-primary);- margin-top: 0.25rem;- word-wrap: break-word;-`;--export const CardDateInfo = styled.div`- color: var(--mb-color-core-brand);- font-size: 0.75rem;- line-height: 1.5rem;- font-weight: bold;-`;--export const CardCreatorInfo = styled.div`- color: var(--mb-color-text-secondary);- margin-top: 0.25rem;- font-size: 0.75rem;-`;--export const CardAside = styled.div`- flex: 0 0 auto;-`;diff --git a/frontend/src/metabase/timelines/collections/components/EventCard/EventCard.tsx b/frontend/src/metabase/timelines/collections/components/EventCard/EventCard.tsxindex d842973763b..10b01580aad 100644--- a/frontend/src/metabase/timelines/collections/components/EventCard/EventCard.tsx+++ b/frontend/src/metabase/timelines/collections/components/EventCard/EventCard.tsx@@ -1,26 +1,16 @@+import cx from "classnames";import { memo } from "react";import { t } from "ttag";import { ForwardRefLink, Link } from "metabase/common/components/Link";-import { ActionIcon, Icon, Menu } from "metabase/ui";+import { Markdown } from "metabase/common/components/Markdown";+import { ActionIcon, Box, Center, Flex, Icon, Menu, Text } from "metabase/ui";import * as Urls from "metabase/urls";import Settings from "metabase/utils/settings";import { formatDateTimeWithUnit } from "metabase/value-formatting";import type { Timeline, TimelineEvent } from "metabase-types/api";-import {- CardAside,- CardBody,- CardCreatorInfo,- CardDateInfo,- CardDescription,- CardRoot,- CardThread,- CardThreadIcon,- CardThreadIconContainer,- CardThreadStroke,- CardTitle,-} from "./EventCard.styled";+import S from "./EventCard.module.css";export interface EventCardProps {event: TimelineEvent;@@ -42,29 +32,42 @@ const EventCard = ({const editLink = Urls.editEventInCollection(event, timeline);return (- <CardRoot>- <CardThread>- <CardThreadIconContainer>- <CardThreadIcon name={event.icon} />- </CardThreadIconContainer>- <CardThreadStroke />- </CardThread>- <CardBody>- <CardDateInfo>{dateMessage}</CardDateInfo>+ <Flex mih="5rem">+ <Flex direction="column" align="center">+ <Center className={S.threadIcon} w="xxl" h="xxl" bdrs="lg">+ <Icon name={event.icon} c="core-brand" />+ </Center>+ <Box className={S.threadStroke} flex="1 1 auto" />+ </Flex>+ <Box flex="1 1 auto" pt="xxs" px="md" pb="sm" miw={0}>+ <Text c="core-brand" fz="sm" fw="bold">+ {dateMessage}+ </Text>{canEdit ? (- <CardTitle as={Link} to={editLink}>+ <Text+ component={Link}+ className={cx(S.title, S.titleLink)}+ to={editLink}+ fz="1rem"+ lh="1.25rem"+ fw="bold"+ >{event.name}- </CardTitle>+ </Text>) : (- <CardTitle>{event.name}</CardTitle>+ <Text className={S.title} fz="1rem" lh="1.25rem" fw="bold">+ {event.name}+ </Text>)}{event.description && (- <CardDescription>{event.description}</CardDescription>+ <Markdown className={S.description}>{event.description}</Markdown>)}- <CardCreatorInfo data-server-date>{creatorMessage}</CardCreatorInfo>- </CardBody>+ <Text c="text-secondary" mt="xxs" fz="sm" lh="normal" data-server-date>+ {creatorMessage}+ </Text>+ </Box>{menuItems.length > 0 && (- <CardAside>+ <Box flex="0 0 auto"><Menu position="bottom-end" shadow="sm"><Menu.Target><ActionIcon variant="subtle" aria-label={t`Event menu`}>@@ -73,9 +76,9 @@ const EventCard = ({</Menu.Target><Menu.Dropdown>{menuItems}</Menu.Dropdown></Menu>- </CardAside>+ </Box>)}- </CardRoot>+ </Flex>);};diff --git a/frontend/src/metabase/timelines/collections/components/EventList/EventList.module.css b/frontend/src/metabase/timelines/collections/components/EventList/EventList.module.cssnew file mode 100644index 00000000000..9d691afb70a--- /dev/null+++ b/frontend/src/metabase/timelines/collections/components/EventList/EventList.module.css@@ -0,0 +1,3 @@+.thread {+ border-left: 1px dashed var(--mb-color-border-neutral);+}diff --git a/frontend/src/metabase/timelines/collections/components/EventList/EventList.styled.tsx b/frontend/src/metabase/timelines/collections/components/EventList/EventList.styled.tsxdeleted file mode 100644index 802cd5f6bc1..00000000000--- a/frontend/src/metabase/timelines/collections/components/EventList/EventList.styled.tsx+++ /dev/null@@ -1,49 +0,0 @@-// 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: flex;- flex-direction: column;- flex: 1 1 auto;-`;--export const ListFooter = styled.div`- display: flex;- flex-direction: column;- flex: 1 1 auto;- margin-top: 0.5rem;-`;--export const ListThread = styled.div`- height: 100%;- border-left: 1px dashed var(--mb-color-border-neutral);-`;--export const ListThreadContainer = styled.div`- display: flex;- flex-direction: column;- align-items: center;- flex: 1 1 auto;- width: 2rem;- height: 2rem;-`;--export const ListIcon = styled(Icon)`- color: var(--mb-color-text-disabled);- width: 1.5rem;- height: 1.5rem;-`;--export const ListIconText = styled.div`- color: var(--mb-color-text-disabled);- margin-top: 0.375rem;- margin-left: 0.75rem;-`;--export const ListIconContainer = styled.div`- display: flex;- margin-top: 0.5rem;- margin-left: 0.675rem;-`;diff --git a/frontend/src/metabase/timelines/collections/components/EventList/EventList.tsx b/frontend/src/metabase/timelines/collections/components/EventList/EventList.tsxindex 99a02dad7fb..30e25bff486 100644--- a/frontend/src/metabase/timelines/collections/components/EventList/EventList.tsx+++ b/frontend/src/metabase/timelines/collections/components/EventList/EventList.tsx@@ -1,19 +1,12 @@import { memo } from "react";import { t } from "ttag";+import { Box, Flex, Icon, Stack, Text } from "metabase/ui";import type { Timeline, TimelineEvent } from "metabase-types/api";import EventCard from "../EventCard";-import {- ListFooter,- ListIcon,- ListIconContainer,- ListIconText,- ListRoot,- ListThread,- ListThreadContainer,-} from "./EventList.styled";+import S from "./EventList.module.css";export interface EventListProps {events: TimelineEvent[];@@ -29,7 +22,7 @@ const EventList = ({onUnarchive,}: EventListProps): JSX.Element => {return (- <ListRoot data-testid="event-list">+ <Flex direction="column" flex="1 1 auto" data-testid="event-list">{events.map((event) => (<EventCardkey={event.id}@@ -39,16 +32,18 @@ const EventList = ({onUnarchive={onUnarchive}/>))}- <ListFooter>- <ListThreadContainer>- <ListThread />- </ListThreadContainer>- <ListIconContainer>- <ListIcon name="dyno" />- <ListIconText>{t`The Mesozoic era`}</ListIconText>- </ListIconContainer>- </ListFooter>- </ListRoot>+ <Stack gap="sm" flex="1 1 auto" mt="sm">+ <Flex justify="center" flex="1 1 auto" w="xxl" h="xxl">+ <Box className={S.thread} />+ </Flex>+ <Flex gap="md" ml="md">+ <Icon name="dyno" c="text-disabled" size={24} />+ <Text c="text-disabled" mt="xs" lh="normal">+ {t`The Mesozoic era`}+ </Text>+ </Flex>+ </Stack>+ </Flex>);};diff --git a/frontend/src/metabase/timelines/collections/components/LoadingAndErrorWrapper/LoadingAndErrorWrapper.styled.tsx b/frontend/src/metabase/timelines/collections/components/LoadingAndErrorWrapper/LoadingAndErrorWrapper.styled.tsxdeleted file mode 100644index 0db3fd50d3f..00000000000--- a/frontend/src/metabase/timelines/collections/components/LoadingAndErrorWrapper/LoadingAndErrorWrapper.styled.tsx+++ /dev/null@@ -1,10 +0,0 @@-// eslint-disable-next-line eslint-js/no-restricted-imports-import styled from "@emotion/styled";--import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";--export const LoadingAndErrorRoot = styled(LoadingAndErrorWrapper)`- display: flex;- flex-direction: column;- min-height: 565px;-`;diff --git a/frontend/src/metabase/timelines/collections/components/LoadingAndErrorWrapper/LoadingAndErrorWrapper.tsx b/frontend/src/metabase/timelines/collections/components/LoadingAndErrorWrapper/LoadingAndErrorWrapper.tsxindex 35b633c2ed1..58ce6f60d10 100644--- a/frontend/src/metabase/timelines/collections/components/LoadingAndErrorWrapper/LoadingAndErrorWrapper.tsx+++ b/frontend/src/metabase/timelines/collections/components/LoadingAndErrorWrapper/LoadingAndErrorWrapper.tsx@@ -1,3 +1,24 @@-import { LoadingAndErrorRoot } from "./LoadingAndErrorWrapper.styled";+import {+ LoadingAndErrorWrapper as BaseLoadingAndErrorWrapper,+ type LoadingAndErrorWrapperProps as BaseLoadingAndErrorWrapperProps,+} from "metabase/common/components/LoadingAndErrorWrapper";+import { MODAL_MIN_HEIGHT } from "metabase/timelines/common/constants";+import { Flex } from "metabase/ui";++// Rendered as a leaf, and the base wrapper's render-function children would not fit Flex anyway+type LoadingAndErrorWrapperProps = Omit<+ BaseLoadingAndErrorWrapperProps,+ "children"+>;++const LoadingAndErrorWrapper = (props: LoadingAndErrorWrapperProps) => (+ <Flex+ component={BaseLoadingAndErrorWrapper}+ direction="column"+ mih={MODAL_MIN_HEIGHT}+ {...props}+ />+);+// eslint-disable-next-line import/no-default-export -- deprecated usage-export default LoadingAndErrorRoot;+export default LoadingAndErrorWrapper;diff --git a/frontend/src/metabase/timelines/collections/components/TimelineCard/TimelineCard.module.css b/frontend/src/metabase/timelines/collections/components/TimelineCard/TimelineCard.module.cssnew file mode 100644index 00000000000..45b30c3a5d2--- /dev/null+++ b/frontend/src/metabase/timelines/collections/components/TimelineCard/TimelineCard.module.css@@ -0,0 +1,26 @@+.card {+ border: 1px solid var(--mb-color-border-neutral);+}++.cardLink {+ &:hover {+ border-color: var(--mb-color-core-brand);+ }++ &:hover .icon,+ &:hover .title {+ color: var(--mb-color-core-brand);+ }+}++.icon {+ color: var(--mb-color-text-disabled);+}++.title {+ overflow-wrap: break-word;+}++.description {+ overflow-wrap: break-word;+}diff --git a/frontend/src/metabase/timelines/collections/components/TimelineCard/TimelineCard.styled.tsx b/frontend/src/metabase/timelines/collections/components/TimelineCard/TimelineCard.styled.tsxdeleted file mode 100644index 04a97606d60..00000000000--- a/frontend/src/metabase/timelines/collections/components/TimelineCard/TimelineCard.styled.tsx+++ /dev/null@@ -1,76 +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 { Link } from "metabase/common/components/Link";-import { Markdown } from "metabase/common/components/Markdown";-import { Icon } from "metabase/ui";--export const CardIcon = styled(Icon)`- color: var(--mb-color-text-disabled);- width: 1.375rem;- height: 1.375rem;-`;--export const CardBody = styled.span`- display: block;- flex: 1 1 auto;- margin: 0 1.75rem;- min-width: 0;-`;--export const CardTitle = styled.span`- display: block;- color: var(--mb-color-text-primary);- font-weight: bold;- margin-bottom: 0.125rem;- word-wrap: break-word;-`;--export const CardDescription = styled(Markdown)`- display: block;- color: var(--mb-color-text-primary);- word-wrap: break-word;-`;--interface CardCountProps {- isTopAligned?: boolean;-}--export const CardCount = styled.span<CardCountProps>`- display: block;- flex: 0 0 auto;- color: var(--mb-color-text-primary);- align-self: ${(props) => (props.isTopAligned ? "flex-start" : "")};-`;--export const CardMenu = styled.span`- display: block;- flex: 0 0 auto;-`;--const cardRootHoverStyles = css`- &:hover {- border-color: var(--mb-color-core-brand);-- ${CardIcon} {- color: var(--mb-color-core-brand);- }-- ${CardTitle} {- color: var(--mb-color-core-brand);- }- }-`;--export const CardRoot = styled(Link)`- display: flex;- padding: 1.75rem;- align-items: center;- border: 1px solid var(--mb-color-border-neutral);- border-radius: 6px;- cursor: ${(props) => (props.to ? "pointer" : "default")};-- ${(props) => props.to && cardRootHoverStyles}-`;diff --git a/frontend/src/metabase/timelines/collections/components/TimelineCard/TimelineCard.tsx b/frontend/src/metabase/timelines/collections/components/TimelineCard/TimelineCard.tsxindex 654c1b76d59..52d44c8b281 100644--- a/frontend/src/metabase/timelines/collections/components/TimelineCard/TimelineCard.tsx+++ b/frontend/src/metabase/timelines/collections/components/TimelineCard/TimelineCard.tsx@@ -1,24 +1,19 @@+import cx from "classnames";import { memo } from "react";import { msgid, ngettext, t } from "ttag";-import { ForwardRefLink } from "metabase/common/components/Link";+import { ForwardRefLink, Link } from "metabase/common/components/Link";+import { Markdown } from "metabase/common/components/Markdown";import {getEventCount,getTimelineName,} from "metabase/common/utils/timelines";-import { ActionIcon, Icon, Menu } from "metabase/ui";+import CS from "metabase/css/core/index.css";+import { ActionIcon, Box, Flex, Icon, Menu, Text } from "metabase/ui";import * as Urls from "metabase/urls";import type { Timeline } from "metabase-types/api";-import {- CardBody,- CardCount,- CardDescription,- CardIcon,- CardMenu,- CardRoot,- CardTitle,-} from "./TimelineCard.styled";+import S from "./TimelineCard.module.css";export interface TimelineCardProps {timeline: Timeline;@@ -37,16 +32,32 @@ const TimelineCard = ({const hasEventCount = !hasMenuItems && eventCount != null;return (- <CardRoot to={!timeline.archived ? timelineUrl : ""}>- <CardIcon name={timeline.icon} />- <CardBody>- <CardTitle>{getTimelineName(timeline)}</CardTitle>+ <Flex+ component={Link}+ className={cx(S.card, timeline.archived ? CS.cursorDefault : S.cardLink)}+ to={timeline.archived ? "" : timelineUrl}+ align="center"+ p="1.75rem"+ bdrs="xs"+ >+ <Icon className={S.icon} name={timeline.icon} size={22} />+ <Box component="span" flex="1 1 auto" mx="1.75rem" miw={0}>+ <Text+ component="span"+ className={S.title}+ display="block"+ fw="bold"+ mb="xxxs"+ lh="normal"+ >+ {getTimelineName(timeline)}+ </Text>{timeline.description && (- <CardDescription>{timeline.description}</CardDescription>+ <Markdown className={S.description}>{timeline.description}</Markdown>)}- </CardBody>+ </Box>{hasMenuItems && (- <CardMenu>+ <Box component="span" flex="0 0 auto"><Menu position="bottom-end" shadow="sm"><Menu.Target><ActionIcon variant="subtle" aria-label={t`Timeline menu`}>@@ -55,18 +66,23 @@ const TimelineCard = ({</Menu.Target><Menu.Dropdown>{menuItems}</Menu.Dropdown></Menu>- </CardMenu>+ </Box>)}{hasEventCount && (- <CardCount isTopAligned={hasDescription}>+ <Text+ component="span"+ className={hasDescription ? CS.alignSelfStart : undefined}+ flex="0 0 auto"+ lh="normal"+ >{ngettext(msgid`${eventCount} event`,`${eventCount} events`,eventCount,)}- </CardCount>+ </Text>)}- </CardRoot>+ </Flex>);};diff --git a/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.styled.tsx b/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.styled.tsxdeleted file mode 100644index 3646c7fc733..00000000000--- a/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.styled.tsx+++ /dev/null@@ -1,28 +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 ModalToolbar = styled.div`- display: flex;- padding: 1rem 2rem 0;-`;--interface ModalBodyProps {- isTopAligned?: boolean;-}--export const ModalBody = styled.div<ModalBodyProps>`- display: flex;- flex-direction: column;- flex: 1 1 auto;- justify-content: ${(props) => (props.isTopAligned ? "" : "center")};- margin: 1rem 0 0;- padding: 1rem 2rem 2rem;- overflow-y: auto;-`;diff --git a/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.tsx b/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.tsxindex 8e28c1d8b6f..4d5bacaba54 100644--- a/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.tsx+++ b/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.tsx@@ -5,8 +5,10 @@ import _ from "underscore";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 { ActionIcon, Button, Icon, Menu, TextInput } from "metabase/ui";+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";import { SEARCH_DEBOUNCE_DURATION } from "metabase/utils/constants";import { parseTimestamp } from "metabase/utils/time-dayjs";@@ -16,12 +18,6 @@ import EventList from "../EventList";import SearchEmptyState from "../SearchEmptyState";import TimelineEmptyState from "../TimelineEmptyState";-import {- ModalBody,- ModalRoot,- ModalToolbar,-} from "./TimelineDetailsModal.styled";-export interface TimelineDetailsModalProps {timeline: Timeline;isArchive?: boolean;@@ -70,7 +66,7 @@ const TimelineDetailsModal = ({setInputText(e.target.value);return (- <ModalRoot>+ <Flex direction="column" mih={MODAL_MIN_HEIGHT}><ModalHeadertitle={title}onClose={onClose}@@ -88,7 +84,7 @@ const TimelineDetailsModal = ({)}</ModalHeader>{(isNotEmpty || isSearching) && (- <ModalToolbar>+ <Flex pt="lg" px="xxl"><TextInputflex="1 1 auto"value={inputText}@@ -106,9 +102,18 @@ const TimelineDetailsModal = ({ml="lg">{t`Create event`}</Button>)}- </ModalToolbar>+ </Flex>)}- <ModalBody isTopAligned={isNotEmpty}>+ <Flex+ className={CS.overflowYAuto}+ direction="column"+ flex="1 1 auto"+ justify={isNotEmpty ? undefined : "center"}+ mt="lg"+ pt="lg"+ px="xxl"+ pb="xxl"+ >{isNotEmpty ? (<EventListevents={events}@@ -121,8 +126,8 @@ const TimelineDetailsModal = ({) : (<TimelineEmptyState timeline={timeline} />)}- </ModalBody>- </ModalRoot>+ </Flex>+ </Flex>);};diff --git a/frontend/src/metabase/timelines/collections/components/TimelineListModal/TimelineListModal.styled.tsx b/frontend/src/metabase/timelines/collections/components/TimelineListModal/TimelineListModal.styled.tsxdeleted file mode 100644index f324c91c264..00000000000--- a/frontend/src/metabase/timelines/collections/components/TimelineListModal/TimelineListModal.styled.tsx+++ /dev/null@@ -1,23 +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;-`;--interface ModalBodyProps {- isTopAligned?: boolean;-}--export const ModalBody = styled.div<ModalBodyProps>`- display: flex;- flex-direction: column;- flex: 1 1 auto;- justify-content: ${(props) => (props.isTopAligned ? "" : "center")};- margin: 1rem 0 0;- padding: 1rem 2rem 2rem;- overflow-y: auto;-`;diff --git a/frontend/src/metabase/timelines/collections/components/TimelineListModal/TimelineListModal.tsx b/frontend/src/metabase/timelines/collections/components/TimelineListModal/TimelineListModal.tsxindex 69be8ba9dae..c2859094251 100644--- a/frontend/src/metabase/timelines/collections/components/TimelineListModal/TimelineListModal.tsx+++ b/frontend/src/metabase/timelines/collections/components/TimelineListModal/TimelineListModal.tsx@@ -6,8 +6,10 @@ import {getDefaultTimelineName,getSortedTimelines,} from "metabase/common/utils/timelines";+import CS from "metabase/css/core/index.css";import ModalHeader from "metabase/timelines/common/components/ModalHeader";-import { ActionIcon, Icon, Menu } from "metabase/ui";+import { MODAL_MIN_HEIGHT } from "metabase/timelines/common/constants";+import { ActionIcon, Flex, Icon, Menu } from "metabase/ui";import * as Urls from "metabase/urls";import type { Collection, Timeline } from "metabase-types/api";@@ -15,8 +17,6 @@ import SearchEmptyState from "../SearchEmptyState";import TimelineEmptyState from "../TimelineEmptyState";import TimelineList from "../TimelineList";-import { ModalBody, ModalRoot } from "./TimelineListModal.styled";-export interface TimelineListModalProps {timelines: Timeline[];collection: Collection;@@ -53,7 +53,7 @@ const TimelineListModal = ({};return (- <ModalRoot>+ <Flex direction="column" mih={MODAL_MIN_HEIGHT}><ModalHeadertitle={title}onClose={onClose}@@ -71,7 +71,16 @@ const TimelineListModal = ({</Menu>)}</ModalHeader>- <ModalBody isTopAligned={hasTimelines}>+ <Flex+ className={CS.overflowYAuto}+ direction="column"+ flex="1 1 auto"+ justify={hasTimelines ? undefined : "center"}+ mt="lg"+ pt="lg"+ px="xxl"+ pb="xxl"+ >{hasTimelines ? (<TimelineList timelines={sortedTimelines} onUnarchive={onUnarchive} />) : isArchive ? (@@ -79,8 +88,8 @@ const TimelineListModal = ({) : (<TimelineEmptyState collection={collection} />)}- </ModalBody>- </ModalRoot>+ </Flex>+ </Flex>);};diff --git a/frontend/src/metabase/timelines/collections/routes.tsx b/frontend/src/metabase/timelines/collections/routes.tsxindex 28589749ab8..a3bf0fc786c 100644--- a/frontend/src/metabase/timelines/collections/routes.tsx+++ b/frontend/src/metabase/timelines/collections/routes.tsx@@ -1,8 +1,11 @@+import cx from "classnames";+import {type ModalComponent,type ModalRouteOptions,createModalRouteComponent,} from "metabase/common/components/ModalRoute";+import CS from "metabase/css/core/index.css";import type { RouteObject } from "metabase/router";import { NO_ANIMATION_MODAL_PROPS } from "metabase/ui";@@ -13,6 +16,17 @@ import { NO_ANIMATION_MODAL_PROPS } from "metabase/ui";*/const options = { modalProps: NO_ANIMATION_MODAL_PROPS };+/** The list and details modals scroll their own body: the dialog hands its height down, and the body clips rather than scrolls. */+const listOptions = {+ modalProps: {+ ...NO_ANIMATION_MODAL_PROPS,+ classNames: {+ content: cx(CS.flex, CS.flexColumn),+ body: cx(CS.flex, CS.flexColumn, CS.overflowHidden),+ },+ },+};+const timelineIndexModal = () =>import(/* webpackChunkName: "timelines" */ "./containers/TimelineIndexModal"@@ -94,7 +108,7 @@ export function getCollectionTimelineRoutes(): RouteObject[] {children: [{index: true,- lazy: lazyComponent(timelineIndexModal, options),+ lazy: lazyComponent(timelineIndexModal, listOptions),},{path: "new",@@ -106,7 +120,7 @@ export function getCollectionTimelineRoutes(): RouteObject[] {},{path: "archive",- lazy: lazyComponent(timelineListArchiveModal, options),+ lazy: lazyComponent(timelineListArchiveModal, listOptions),},{path: ":timelineId",@@ -114,7 +128,7 @@ export function getCollectionTimelineRoutes(): RouteObject[] {{index: true,lazy: lazyComponent(timelineDetailsModal, {- ...options,+ ...listOptions,closeTo: "../..",}),},@@ -131,7 +145,7 @@ export function getCollectionTimelineRoutes(): RouteObject[] {},{path: "archive",- lazy: lazyComponent(timelineArchiveModal, options),+ lazy: lazyComponent(timelineArchiveModal, listOptions),},{path: "delete",diff --git a/frontend/src/metabase/timelines/common/constants.ts b/frontend/src/metabase/timelines/common/constants.tsnew file mode 100644index 00000000000..dc2f151ebd0--- /dev/null+++ b/frontend/src/metabase/timelines/common/constants.ts@@ -0,0 +1,6 @@+/**+ * 36rem, or Mantine's dialog cap on short viewports.+ * The outer calc stops Mantine's style props from converting the 2 to rem.+ */+export const MODAL_MIN_HEIGHT =+ "calc(min(36rem, 100dvh - 2 * var(--modal-y-offset)))";