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 items table off Emotion (#83676)
Andrei Chernykhbd11dd551cfe
diff --git a/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionTable.tsx b/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionTable.tsxindex 7f031f9ac12..48aaf1df7ca 100644--- a/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionTable.tsx+++ b/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionTable.tsx@@ -3,14 +3,14 @@ import { c, t } from "ttag";import { getCollectionName } from "metabase/common/collections/utils";import { DateTime } from "metabase/common/components/DateTime";import { SortableColumnHeader } from "metabase/common/components/ItemsTable/BaseItemsTable";+import { Columns } from "metabase/common/components/ItemsTable/Columns";import {ColumnHeader,ItemCell,TBody,Table,TableColumn,-} from "metabase/common/components/ItemsTable/BaseItemsTable.styled";-import { Columns } from "metabase/common/components/ItemsTable/Columns";+} from "metabase/common/components/ItemsTable/TableElements";import { useGetIcon } from "metabase/hooks/use-icon";import { Ellipsified, FixedSizeIcon, Flex, Tooltip } from "metabase/ui";import type { SortingOptions } from "metabase-types/api/sorting";diff --git a/frontend/src/metabase/admin/components/AdminDataTable/AdminDataTable.unit.spec.tsx b/frontend/src/metabase/admin/components/AdminDataTable/AdminDataTable.unit.spec.tsxindex 6f5fb063e91..cc3ca6eec76 100644--- a/frontend/src/metabase/admin/components/AdminDataTable/AdminDataTable.unit.spec.tsx+++ b/frontend/src/metabase/admin/components/AdminDataTable/AdminDataTable.unit.spec.tsx@@ -112,7 +112,7 @@ describe("AdminDataTable", () => {// the column with a sortKey exposes an interactive control...expect(- screen.getByRole("button", { name: "Sortable" }),+ screen.getByRole("button", { name: /Sortable/ }),).toBeInTheDocument();// ...while the column without one stays a static header, not a button.expect(diff --git a/frontend/src/metabase/browse/metrics/MetricsTable.tsx b/frontend/src/metabase/browse/metrics/MetricsTable.tsxindex df112a639e4..c6cec6b0645 100644--- a/frontend/src/metabase/browse/metrics/MetricsTable.tsx+++ b/frontend/src/metabase/browse/metrics/MetricsTable.tsx@@ -11,14 +11,14 @@ import { getCollectionName } from "metabase/common/collections/utils";import { EllipsifiedCollectionPath } from "metabase/common/components/EllipsifiedPath/EllipsifiedCollectionPath";import { EntityItemName } from "metabase/common/components/EntityItemName";import { SortableColumnHeader } from "metabase/common/components/ItemsTable/BaseItemsTable";+import { Columns } from "metabase/common/components/ItemsTable/Columns";import {ColumnHeader,ItemNameCell,TBody,Table,TableColumn,-} from "metabase/common/components/ItemsTable/BaseItemsTable.styled";-import { Columns } from "metabase/common/components/ItemsTable/Columns";+} from "metabase/common/components/ItemsTable/TableElements";import type { ResponsiveProps } from "metabase/common/components/ItemsTable/utils";import { Link } from "metabase/common/components/Link";import { MarkdownPreview } from "metabase/common/components/MarkdownPreview";@@ -52,30 +52,14 @@ const DEFAULT_SORTING_OPTIONS: SortingOptions<SortColumn> = {sort_direction: "asc",};-export const itemsTableContainerName = "ItemsTableContainer";--const sharedProps = {- containerName: itemsTableContainerName,-};--const nameProps = {- ...sharedProps,-};-const descriptionProps: ResponsiveProps = {- ...sharedProps,hideAtContainerBreakpoint: "md",};const collectionProps: ResponsiveProps = {- ...sharedProps,hideAtContainerBreakpoint: "sm",};-const menuProps = {- ...sharedProps,-};-const DOTMENU_WIDTH = 34;export function MetricsTable({@@ -99,7 +83,7 @@ export function MetricsTable({<col className={BrowseTableS.nameColumn} /><TableColumn {...collectionProps} width={`${collectionWidth}%`} /><TableColumn {...descriptionProps} width={`${descriptionWidth}%`} />- <TableColumn {...menuProps} width={DOTMENU_WIDTH} />+ <TableColumn width={DOTMENU_WIDTH} /><Columns.RightEdge.Col /></colgroup><thead>@@ -108,7 +92,6 @@ export function MetricsTable({name="name"sortingOptions={sortingOptions}onSortingOptionsChange={handleSortingOptionsChange}- {...nameProps}style={{ paddingInlineStart: ".625rem" }}columnHeaderProps={{style: { paddingInlineEnd: ".5rem" },@@ -229,11 +212,7 @@ function preventDefault(event: MouseEvent) {function NameCell({ metric }: { metric?: MetricResult }) {const headingId = `metric-${metric?.id ?? "dummy"}-heading`;return (- <ItemNameCell- data-testid="metric-name"- aria-labelledby={headingId}- {...nameProps}- >+ <ItemNameCell data-testid="metric-name" aria-labelledby={headingId}><Flex align="center" gap="0.5rem" ps="1.4rem" pe="0.5rem">{metric ? (<Linkdiff --git a/frontend/src/metabase/browse/models/ModelsTable.tsx b/frontend/src/metabase/browse/models/ModelsTable.tsxindex 95726dab679..82776a399c7 100644--- a/frontend/src/metabase/browse/models/ModelsTable.tsx+++ b/frontend/src/metabase/browse/models/ModelsTable.tsx@@ -7,13 +7,13 @@ import { EllipsifiedCollectionPath } from "metabase/common/components/Ellipsifieimport { EntityIcon } from "metabase/common/components/EntityIcon";import { EntityItemName } from "metabase/common/components/EntityItemName";import { SortableColumnHeader } from "metabase/common/components/ItemsTable/BaseItemsTable";+import { Columns } from "metabase/common/components/ItemsTable/Columns";import {ItemNameCell,TBody,Table,TableColumn,-} from "metabase/common/components/ItemsTable/BaseItemsTable.styled";-import { Columns } from "metabase/common/components/ItemsTable/Columns";+} from "metabase/common/components/ItemsTable/TableElements";import type { ResponsiveProps } from "metabase/common/components/ItemsTable/utils";import { Link } from "metabase/common/components/Link";import { MarkdownPreview } from "metabase/common/components/MarkdownPreview";@@ -41,16 +41,12 @@ export interface ModelsTableProps {skeleton?: boolean;}-export const itemsTableContainerName = "ItemsTableContainer";-const descriptionProps: ResponsiveProps = {hideAtContainerBreakpoint: "sm",- containerName: itemsTableContainerName,};const collectionProps: ResponsiveProps = {hideAtContainerBreakpoint: "xs",- containerName: itemsTableContainerName,};const DEFAULT_SORTING_OPTIONS: SortingOptions<SortColumn> = {diff --git a/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable.styled.tsx b/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable.styled.tsxdeleted file mode 100644index 71253656b63..00000000000--- a/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable.styled.tsx+++ /dev/null@@ -1,192 +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 cx from "classnames";-import {- type HTMLAttributes,- type TableHTMLAttributes,- forwardRef,-} from "react";--import { IconButtonWrapper } from "metabase/common/components/IconButtonWrapper";-import { Link } from "metabase/common/components/Link";-import AdminS from "metabase/css/admin.module.css";-import type { IconProps, TextProps } from "metabase/ui";-import { FixedSizeIcon, Text } from "metabase/ui";--import type { ResponsiveProps } from "./utils";-import { getContainerQuery } from "./utils";--export const Table = styled((props: TableHTMLAttributes<HTMLTableElement>) => (- <table {...props} className={cx(props.className, AdminS.ContentTable)} />-))`- background-color: var(--mb-color-background_page-primary);- table-layout: fixed;- border-collapse: unset;- border-radius: 0.5rem;- overflow: hidden;-- thead {- th {- border-top: 1px solid var(--mb-color-border-neutral);-- &:first-of-type {- border-start-start-radius: 8px;- border-inline-start: 1px solid var(--mb-color-border-neutral);- }-- &:last-child {- border-start-end-radius: 8px;- border-inline-end: 1px solid var(--mb-color-border-neutral);- }- }- }-`;--export const hideResponsively = ({- hideAtContainerBreakpoint,- containerName,-}: ResponsiveProps) => css`- ${getContainerQuery({- hideAtContainerBreakpoint,- containerName,- })}-`;--export const ColumnHeader = styled.th<ResponsiveProps>`- th& {- padding: 0.75em 1em 0.75em;- }-- font-weight: bold;- color: var(--mb-color-text-secondary);- ${hideResponsively}-`;--export const BulkSelectWrapper = styled(IconButtonWrapper)`- padding-inline: 12px;- width: 3em;-`;--export const ItemCell = styled.td<ResponsiveProps>`- padding: 0.25em 0 0.25em 1em !important;- ${hideResponsively}-`;--export const TableColumn = styled.col<ResponsiveProps>`- ${hideResponsively}-`;--const itemLinkStyle = css`- display: flex;- grid-gap: 0.5rem;- align-items: center;-- &:hover {- color: var(--mb-color-core-brand);- }-`;--export const ItemButton = styled(Text)<- TextProps & HTMLAttributes<HTMLDivElement>->(itemLinkStyle);--export const ItemLink = styled(Link)(itemLinkStyle);--export const ItemNameCell = styled.td`- padding: 0 !important;-- & > * {- padding: 1em;- }-- &:hover {- & > * {- color: var(--mb-color-core-brand);- }-- cursor: pointer;- }-`;--export const SortingIcon = styled(- forwardRef<SVGSVGElement, IconProps>(function SortingIcon(props, ref) {- return <FixedSizeIcon {...props} size={props.size ?? 8} ref={ref} />;- }),-)`- margin-inline-start: 4px;-`;--export const DescriptionIcon = styled(FixedSizeIcon)`- color: var(--mb-color-text-secondary);-`;--export const SortingControlContainer = styled.div<{- isActive: boolean;- isSortable?: boolean;-}>`- display: flex;- align-items: center;- color: ${({ isActive }) => isActive && "var(--mb-color-text-primary)"};-- ${({ isSortable = true }) =>- isSortable ? `cursor: pointer; user-select: none;` : ""}-- .Icon {- visibility: ${(props) => (props.isActive ? "visible" : "hidden")};- }-- &:hover {- color: var(--mb-color-text-primary);-- .Icon {- visibility: visible;- }- }-`;--export const RowActionsContainer = styled.div`- display: flex;- gap: 0.5rem;- justify-content: flex-end;-- span {- display: flex;- align-items: center;- }-`;--export const TBody = styled.tbody`- td {- border: none;- background-color: transparent;- border-top: 1px solid var(--mb-color-border-neutral);-- &:first-of-type {- border-inline-start: 1px solid var(--mb-color-border-neutral);- }-- &:last-child {- border-inline-end: 1px solid var(--mb-color-border-neutral);- }- }-- tr {- background-color: transparent;- }-- tr:last-child {- td {- border-bottom: 1px solid var(--mb-color-border-neutral);-- &:last-child {- border-end-end-radius: 8px;- }-- &:first-of-type {- border-end-start-radius: 8px;- }- }- }-`;diff --git a/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.module.css b/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.module.cssnew file mode 100644index 00000000000..121086253db--- /dev/null+++ b/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.module.css@@ -0,0 +1,13 @@+.sortable {+ cursor: pointer;+ user-select: none;+}++.sortingIcon {+ visibility: hidden;+}++.active .sortingIcon,+.sortingControl:hover .sortingIcon {+ visibility: visible;+}diff --git a/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.tsx b/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.tsxindex aed254539ec..358c98b894f 100644--- a/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.tsx+++ b/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.tsx@@ -1,3 +1,4 @@+import cx from "classnames";import type { HTMLAttributes, PropsWithChildren } from "react";import { useMemo } from "react";@@ -14,6 +15,7 @@ import { BaseItemsTableBody } from "metabase/common/components/ItemsTable/BaseItimport type { ItemRendererProps } from "metabase/common/components/ItemsTable/DefaultItemRenderer";import { DefaultItemRenderer } from "metabase/common/components/ItemsTable/DefaultItemRenderer";import { canSelectItems } from "metabase/common/components/ItemsTable/utils";+import { FixedSizeIcon, Flex } from "metabase/ui";import type {Bookmark,Collection,@@ -24,15 +26,12 @@ import type {SortingOptions,} from "metabase-types/api";-import {- ColumnHeader,- SortingControlContainer,- SortingIcon,- Table,-} from "../BaseItemsTable.styled";import { Columns } from "../Columns";+import { ColumnHeader, Table } from "../TableElements";import type { ResponsiveProps } from "../utils";+import S from "./BaseItemsTable.module.css";+export type SortableColumnHeaderProps<SortColumn extends string> = {name?: SortColumn;sortingOptions?: SortingOptions<SortColumn>;@@ -48,8 +47,8 @@ export const SortableColumnHeader = <SortColumn extends string>({onSortingOptionsChange,children,hideAtContainerBreakpoint,- containerName,columnHeaderProps,+ className,...props}: SortableColumnHeaderProps<SortColumn> & ResponsiveProps) => {const isSortable = !!onSortingOptionsChange && !!name;@@ -76,23 +75,29 @@ export const SortableColumnHeader = <SortColumn extends string>({return (<ColumnHeaderhideAtContainerBreakpoint={hideAtContainerBreakpoint}- containerName={containerName}{...columnHeaderProps}>- <SortingControlContainer+ <Flex{...props}- isActive={isSortingThisColumn}+ className={cx(+ S.sortingControl,+ { [S.sortable]: isSortable, [S.active]: isSortingThisColumn },+ className,+ )}+ align="center"onClick={onSortingControlClick}role="button"- isSortable={isSortable}>{children}{isSortable && (- <SortingIcon+ <FixedSizeIcon+ className={S.sortingIcon}name={direction === "asc" ? "chevronup" : "chevrondown"}+ size={8}+ ms="xxs"/>)}- </SortingControlContainer>+ </Flex></ColumnHeader>);};diff --git a/frontend/src/metabase/common/components/ItemsTable/BaseItemsTableBody/BaseItemsTableBody.tsx b/frontend/src/metabase/common/components/ItemsTable/BaseItemsTableBody/BaseItemsTableBody.tsxindex 54e001c1513..b9e8926111f 100644--- a/frontend/src/metabase/common/components/ItemsTable/BaseItemsTableBody/BaseItemsTableBody.tsx+++ b/frontend/src/metabase/common/components/ItemsTable/BaseItemsTableBody/BaseItemsTableBody.tsx@@ -8,7 +8,7 @@ import { useSelector } from "metabase/redux";import { getIsDndAvailable } from "metabase/selectors/app";import type { CollectionItem } from "metabase-types/api";-import { TBody } from "../BaseItemsTable.styled";+import { TBody } from "../TableElements";export const BaseItemsTableBody = ({items,diff --git a/frontend/src/metabase/common/components/ItemsTable/Columns.module.css b/frontend/src/metabase/common/components/ItemsTable/Columns.module.cssnew file mode 100644index 00000000000..be9000f2a70--- /dev/null+++ b/frontend/src/metabase/common/components/ItemsTable/Columns.module.css@@ -0,0 +1,15 @@+.bulkSelect {+ width: 3em;+ padding-inline: 0.75rem;+}++.itemLink {+ display: flex;+ gap: 0.5rem;+ align-items: center;+}++.rowActions span {+ display: flex;+ align-items: center;+}diff --git a/frontend/src/metabase/common/components/ItemsTable/Columns.tsx b/frontend/src/metabase/common/components/ItemsTable/Columns.tsxindex 6dfe45af457..5207c18a30e 100644--- a/frontend/src/metabase/common/components/ItemsTable/Columns.tsx+++ b/frontend/src/metabase/common/components/ItemsTable/Columns.tsx@@ -5,12 +5,22 @@ import type { ActionMenuProps } from "metabase/common/collections/components/Actimport { ActionMenu } from "metabase/common/collections/components/ActionMenu";import { DateTime } from "metabase/common/components/DateTime";import { EntityItemName } from "metabase/common/components/EntityItemName";+import { IconButtonWrapper } from "metabase/common/components/IconButtonWrapper";+import { Link } from "metabase/common/components/Link";import { Markdown } from "metabase/common/components/Markdown";import { useTranslateContent } from "metabase/content-translation/hooks";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";import { ArchiveButton } from "metabase/embedding/components/ArchiveButton";import { PLUGIN_MODERATION } from "metabase/plugins";-import { Checkbox, Ellipsified, type IconProps, Tooltip } from "metabase/ui";+import {+ Checkbox,+ Ellipsified,+ FixedSizeIcon,+ Flex,+ type IconProps,+ Text,+ Tooltip,+} from "metabase/ui";import { modelToUrl } from "metabase/urls";import { isTouchDevice } from "metabase/utils/browser";import { isPlainKey } from "metabase/utils/keyboard";@@ -21,20 +31,16 @@ import type {SearchResult,} from "metabase-types/api";+import type { SortableColumnHeaderProps } from "./BaseItemsTable/BaseItemsTable";+import { SortableColumnHeader } from "./BaseItemsTable/BaseItemsTable";+import S from "./Columns.module.css";+import { EntityIconCheckBox } from "./EntityIconCheckBox";import {- BulkSelectWrapper,ColumnHeader,- DescriptionIcon,- ItemButton,ItemCell,- ItemLink,ItemNameCell,- RowActionsContainer,TableColumn,-} from "./BaseItemsTable.styled";-import type { SortableColumnHeaderProps } from "./BaseItemsTable/BaseItemsTable";-import { SortableColumnHeader } from "./BaseItemsTable/BaseItemsTable";-import { EntityIconCheckBox } from "./EntityIconCheckBox";+} from "./TableElements";type HeaderProps = Omit<SortableColumnHeaderProps<ListCollectionItemsSortColumn>,@@ -50,17 +56,22 @@ const ItemLinkComponent = ({onClick?: (item: CollectionItem) => void;}>) => {if (isEmbeddingSdk()) {- return <ItemButton onClick={() => onClick?.(item)}>{children}</ItemButton>;+ return (+ <Text className={S.itemLink} onClick={() => onClick?.(item)}>+ {children}+ </Text>+ );}return (- <ItemLink+ <Link+ className={S.itemLink}draggable={item.model !== "collection"}to={modelToUrl(item)}onClick={() => onClick?.(item)}>{children}- </ItemLink>+ </Link>);};@@ -79,7 +90,7 @@ export const Columns = {onSelectNone?: () => void;}) => (<ColumnHeader>- <BulkSelectWrapper>+ <IconButtonWrapper className={S.bulkSelect}><Checkboxchecked={!!selectedItems?.length}indeterminate={!!selectedItems?.length && !!hasUnselected}@@ -96,7 +107,7 @@ export const Columns = {}}aria-label={t`Select all items`}/>- </BulkSelectWrapper>+ </IconButtonWrapper></ColumnHeader>),Cell: ({@@ -188,9 +199,10 @@ export const Columns = {status={item.moderated_status}/>{item.description && includeDescription && (- <DescriptionIcon+ <FixedSizeIconname="info"size={16}+ c="text-secondary"tooltip={<Markdowndark@@ -217,12 +229,7 @@ export const Columns = {},},Description: {- Col: () => (- <TableColumn- hideAtContainerBreakpoint="sm"- containerName="ItemsTableContainer"- />- ),+ Col: () => <TableColumn hideAtContainerBreakpoint="sm" />,Header: ({ sortingOptions, onSortingOptionsChange }: HeaderProps) => (<SortableColumnHeadername="description"@@ -252,11 +259,7 @@ export const Columns = {},LastEditedBy: {Col: () => (- <TableColumn- style={{ width: "140px" }}- hideAtContainerBreakpoint="sm"- containerName="ItemsTableContainer"- />+ <TableColumn style={{ width: "140px" }} hideAtContainerBreakpoint="sm" />),Header: ({sortingOptions,@@ -270,7 +273,6 @@ export const Columns = {sortingOptions={sortingOptions}onSortingOptionsChange={onSortingOptionsChange}hideAtContainerBreakpoint="sm"- containerName="ItemsTableContainer">{isTrashed? c("Precedes the name of a user").t`Deleted by`@@ -291,7 +293,6 @@ export const Columns = {<ItemCelldata-testid={`${testIdPrefix}-last-edited-by`}hideAtContainerBreakpoint="sm"- containerName="ItemsTableContainer"><Ellipsified>{lastEditedBy}</Ellipsified></ItemCell>@@ -300,11 +301,7 @@ export const Columns = {},LastEditedAt: {Col: () => (- <TableColumn- style={{ width: "140px" }}- hideAtContainerBreakpoint="md"- containerName="ItemsTableContainer"- />+ <TableColumn style={{ width: "140px" }} hideAtContainerBreakpoint="md" />),Header: ({sortingOptions,@@ -318,7 +315,6 @@ export const Columns = {sortingOptions={sortingOptions}onSortingOptionsChange={onSortingOptionsChange}hideAtContainerBreakpoint="md"- containerName="ItemsTableContainer">{isTrashed? c("Time which the item was deleted").t`Deleted at`@@ -338,7 +334,6 @@ export const Columns = {data-testid={`${testIdPrefix}-last-edited-at`}data-server-datehideAtContainerBreakpoint="md"- containerName="ItemsTableContainer">{lastEditInfo && (<Tooltip label={<DateTime value={lastEditInfo.timestamp} />}>@@ -355,9 +350,14 @@ export const Columns = {Cell: (props: ActionMenuProps) => {return (<ItemCell>- <RowActionsContainer data-ignore-row-selection>+ <Flex+ className={S.rowActions}+ gap="sm"+ justify="flex-end"+ data-ignore-row-selection+ ><ActionMenu {...props} />- </RowActionsContainer>+ </Flex></ItemCell>);},@@ -368,9 +368,9 @@ export const Columns = {Cell: ({ item }: { item: CollectionItem }) => {return (<ItemCell>- <RowActionsContainer>+ <Flex className={S.rowActions} gap="sm" justify="flex-end"><ArchiveButton item={item} />- </RowActionsContainer>+ </Flex></ItemCell>);},diff --git a/frontend/src/metabase/common/components/ItemsTable/ItemsTable.styled.tsx b/frontend/src/metabase/common/components/ItemsTable/ItemsTable.styled.tsxdeleted file mode 100644index 2670be2f330..00000000000--- a/frontend/src/metabase/common/components/ItemsTable/ItemsTable.styled.tsx+++ /dev/null@@ -1,11 +0,0 @@-// eslint-disable-next-line eslint-js/no-restricted-imports-import styled from "@emotion/styled";--export const ItemsTableRoot = styled.div`- display: flex;- position: relative;- justify-content: center;- align-items: center;- margin: 1rem;- padding: 4rem;-`;diff --git a/frontend/src/metabase/common/components/ItemsTable/ItemsTable.tsx b/frontend/src/metabase/common/components/ItemsTable/ItemsTable.tsxindex 5e851b8570e..41875c84983 100644--- a/frontend/src/metabase/common/components/ItemsTable/ItemsTable.tsx+++ b/frontend/src/metabase/common/components/ItemsTable/ItemsTable.tsx@@ -3,12 +3,12 @@ import cx from "classnames";import PinDropZone from "metabase/common/collections/components/PinDropZone";import type { ItemRendererProps } from "metabase/common/components/ItemsTable/DefaultItemRenderer";import CS from "metabase/css/core/index.css";+import { Flex } from "metabase/ui";import type { CollectionItem } from "metabase-types/api";import type { BaseItemsTableProps } from "./BaseItemsTable";import { BaseItemsTable } from "./BaseItemsTable";import S from "./ItemsTable.module.css";-import { ItemsTableRoot } from "./ItemsTable.styled";const Item = ({item,@@ -35,9 +35,9 @@ export const ItemsTable = ({} & BaseItemsTableProps) => {if (items.length === 0) {return (- <ItemsTableRoot>+ <Flex pos="relative" justify="center" align="center" m="lg" p="4rem"><PinDropZone variant="unpin" />- </ItemsTableRoot>+ </Flex>);}diff --git a/frontend/src/metabase/common/components/ItemsTable/TableElements.module.css b/frontend/src/metabase/common/components/ItemsTable/TableElements.module.cssnew file mode 100644index 00000000000..d7204134ad0--- /dev/null+++ b/frontend/src/metabase/common/components/ItemsTable/TableElements.module.css@@ -0,0 +1,96 @@+/* Element-qualified so it outranks the admin ContentTable rules and a caller's own table class */+table.table {+ table-layout: fixed;+ border-collapse: unset;+ border-radius: 0.5rem;+ overflow: hidden;+ background-color: var(--mb-color-background_page-primary);+}++.table thead th {+ border-top: 1px solid var(--mb-color-border-neutral);++ &:first-of-type {+ border-start-start-radius: 0.5rem;+ border-inline-start: 1px solid var(--mb-color-border-neutral);+ }++ &:last-child {+ border-start-end-radius: 0.5rem;+ border-inline-end: 1px solid var(--mb-color-border-neutral);+ }+}++.body td {+ border: none;+ border-top: 1px solid var(--mb-color-border-neutral);+ background-color: transparent;++ &:first-of-type {+ border-inline-start: 1px solid var(--mb-color-border-neutral);+ }++ &:last-child {+ border-inline-end: 1px solid var(--mb-color-border-neutral);+ }+}++.body tr {+ background-color: transparent;+}++.body tr:last-child td {+ border-bottom: 1px solid var(--mb-color-border-neutral);++ &:last-child {+ border-end-end-radius: 0.5rem;+ }++ &:first-of-type {+ border-end-start-radius: 0.5rem;+ }+}++/* Two classes deep so it outranks the admin ContentTable header padding */+.table .columnHeader {+ padding: 0.75em 1em;+}++.itemCell {+ padding: 0.25em 0 0.25em 1em !important;+}++.itemNameCell {+ padding: 0 !important;++ &:hover {+ cursor: pointer;++ & > * {+ color: var(--mb-color-core-brand);+ }+ }+}++/* Element-qualified so it outranks the padding reset on Mantine Text, the cell's child in the SDK */+td.itemNameCell > * {+ padding: 1em;+}++.hideAtXs {+ @container ItemsTableContainer (max-width: 23em) {+ display: none;+ }+}++.hideAtSm {+ @container ItemsTableContainer (max-width: 40em) {+ display: none;+ }+}++.hideAtMd {+ @container ItemsTableContainer (max-width: 60em) {+ display: none;+ }+}diff --git a/frontend/src/metabase/common/components/ItemsTable/TableElements.tsx b/frontend/src/metabase/common/components/ItemsTable/TableElements.tsxnew file mode 100644index 00000000000..d14001c2aa2--- /dev/null+++ b/frontend/src/metabase/common/components/ItemsTable/TableElements.tsx@@ -0,0 +1,101 @@+import cx from "classnames";+import type {+ ColHTMLAttributes,+ HTMLAttributes,+ TableHTMLAttributes,+ TdHTMLAttributes,+ ThHTMLAttributes,+} from "react";++import AdminS from "metabase/css/admin.module.css";++import S from "./TableElements.module.css";+import type { ContainerBreakpointName, ResponsiveProps } from "./utils";++const HIDE_AT_CLASS_NAMES: Record<ContainerBreakpointName, string> = {+ xs: S.hideAtXs,+ sm: S.hideAtSm,+ md: S.hideAtMd,+};++function getHideAtClassName(breakpoint: ContainerBreakpointName | undefined) {+ if (!breakpoint) {+ return undefined;+ }+ return HIDE_AT_CLASS_NAMES[breakpoint];+}++type TableProps = TableHTMLAttributes<HTMLTableElement>;++export function Table({ className, ...props }: TableProps) {+ return (+ <table {...props} className={cx(AdminS.ContentTable, S.table, className)} />+ );+}++type TBodyProps = HTMLAttributes<HTMLTableSectionElement>;++export function TBody({ className, ...props }: TBodyProps) {+ return <tbody {...props} className={cx(S.body, className)} />;+}++type ColumnHeaderProps = ThHTMLAttributes<HTMLTableCellElement> &+ ResponsiveProps;++export function ColumnHeader({+ hideAtContainerBreakpoint,+ className,+ ...props+}: ColumnHeaderProps) {+ return (+ <th+ {...props}+ className={cx(+ S.columnHeader,+ getHideAtClassName(hideAtContainerBreakpoint),+ className,+ )}+ />+ );+}++type ItemCellProps = TdHTMLAttributes<HTMLTableCellElement> & ResponsiveProps;++export function ItemCell({+ hideAtContainerBreakpoint,+ className,+ ...props+}: ItemCellProps) {+ return (+ <td+ {...props}+ className={cx(+ S.itemCell,+ getHideAtClassName(hideAtContainerBreakpoint),+ className,+ )}+ />+ );+}++type ItemNameCellProps = TdHTMLAttributes<HTMLTableCellElement>;++export function ItemNameCell({ className, ...props }: ItemNameCellProps) {+ return <td {...props} className={cx(S.itemNameCell, className)} />;+}++type TableColumnProps = ColHTMLAttributes<HTMLTableColElement> &+ ResponsiveProps;++export function TableColumn({+ hideAtContainerBreakpoint,+ className,+ ...props+}: TableColumnProps) {+ return (+ <col+ {...props}+ className={cx(getHideAtClassName(hideAtContainerBreakpoint), className)}+ />+ );+}diff --git a/frontend/src/metabase/common/components/ItemsTable/utils.ts b/frontend/src/metabase/common/components/ItemsTable/utils.tsindex a9da2f4e2fd..d560e08f8d1 100644--- a/frontend/src/metabase/common/components/ItemsTable/utils.ts+++ b/frontend/src/metabase/common/components/ItemsTable/utils.ts@@ -8,22 +8,19 @@ import type {} from "metabase/common/collections/types";import { isRootTrashCollection } from "metabase/common/collections/utils";import { PLUGIN_LIBRARY } from "metabase/plugins";-import { type BreakpointName, breakpoints } from "metabase/ui/theme";+import type { BreakpointName } from "metabase/ui/theme";import type { Collection } from "metabase-types/api";+export type ContainerBreakpointName = Extract<+ BreakpointName,+ "xs" | "sm" | "md"+>;+export interface ResponsiveProps {/** The element will be hidden when the container's width is below this breakpoint */- hideAtContainerBreakpoint?: BreakpointName;- containerName?: string;+ hideAtContainerBreakpoint?: ContainerBreakpointName;}-export const getContainerQuery = (props: ResponsiveProps) =>- props.hideAtContainerBreakpoint- ? `@container ${props.containerName || ""} (max-width: ${- breakpoints[props.hideAtContainerBreakpoint]- }) { display: none; }`- : "";-export const getVisibleColumnsMap = (visibleColumns: CollectionContentTableColumn[],) =>