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 table info card off Emotion (#83444)

Andrei Chernykha6ed8f0fef67
diff --git a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.module.css b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.module.css
new file mode 100644
index 00000000000..aca32db971d
--- /dev/null
+++ b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.module.css
@@ -0,0 +1,8 @@
+.connectedTable {
+ cursor: pointer;
+
+ &:hover .label,
+ &:focus .label {
+ color: var(--mb-color-core-brand);
+ }
+}
diff --git a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.styled.tsx b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.styled.tsx
deleted file mode 100644
index 09d792f0741..00000000000
--- a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.styled.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-// eslint-disable-next-line eslint-js/no-restricted-imports
-import styled from "@emotion/styled";
-
-import { Link } from "metabase/common/components/Link";
-
-import { TableLabel } from "../TableLabel/TableLabel";
-
-export const InteractiveTableLabel = styled(TableLabel)`
- color: var(--mb-color-text-disabled);
-`;
-
-export const LabelButton = styled.button`
- cursor: pointer;
- text-align: left;
-
- &:hover,
- &:focus {
- ${InteractiveTableLabel} {
- color: var(--mb-color-core-brand);
- }
- }
-`;
-
-export const LabelLink = styled(Link)`
- &:hover,
- &:focus {
- ${InteractiveTableLabel} {
- color: var(--mb-color-core-brand);
- }
- }
-`;
diff --git a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.tsx b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.tsx
index 30421a6e574..daa748ccefd 100644
--- a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.tsx
+++ b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.tsx
@@ -1,17 +1,16 @@
import { useMemo } from "react";
import { t } from "ttag";
+import { Link } from "metabase/common/components/Link";
import { useQuestionFromOptsBuilder } from "metabase/metadata-store";
+import { Box } from "metabase/ui";
import * as Urls from "metabase/urls";
import type { NormalizedTable } from "metabase-types/api";
import { Container, Label, LabelContainer } from "../MetadataInfo.styled";
+import { TableLabel } from "../TableLabel/TableLabel";
-import {
- InteractiveTableLabel,
- LabelButton,
- LabelLink,
-} from "./ConnectedTables.styled";
+import S from "./ConnectedTables.module.css";
export type ConnectedTable = Pick<
NormalizedTable,
@@ -52,9 +51,15 @@ function ConnectedTableButton({
onClick: (table: ConnectedTable) => void;
}) {
return (
- <LabelButton key={table.id} onClick={() => onClick(table)}>
- <InteractiveTableLabel table={table} />
- </LabelButton>
+ <Box
+ component="button"
+ key={table.id}
+ className={S.connectedTable}
+ ta="left"
+ onClick={() => onClick(table)}
+ >
+ <TableLabel className={S.label} table={table} color="text-disabled" />
+ </Box>
);
}
@@ -73,8 +78,8 @@ function ConnectedTableLink({ table }: { table: ConnectedTable }) {
}, [buildQuestion, table.db_id, table.id]);
return (
- <LabelLink to={url}>
- <InteractiveTableLabel table={table} />
- </LabelLink>
+ <Link className={S.connectedTable} to={url}>
+ <TableLabel className={S.label} table={table} color="text-disabled" />
+ </Link>
);
}
diff --git a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.styled.tsx b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.styled.tsx
deleted file mode 100644
index fb6bae434f0..00000000000
--- a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.styled.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-// eslint-disable-next-line eslint-js/no-restricted-imports
-import styled from "@emotion/styled";
-
-import {
- Container,
- InfoContainer as _InfoContainer,
-} from "metabase/common/components/MetadataInfo/MetadataInfo.styled";
-
-export const MetadataContainer = styled(Container)`
- font-size: 0.9em;
- overflow: hidden;
-`;
-
-export const InfoContainer = styled(_InfoContainer)`
- gap: 0.2em;
-`;
diff --git a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.tsx b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.tsx
index 618e6c9da22..da242260e8c 100644
--- a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.tsx
+++ b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.tsx
@@ -1,8 +1,10 @@
import { createSelector } from "@reduxjs/toolkit";
+import cx from "classnames";
import { useEffect, useState } from "react";
import { useAsyncFn } from "react-use";
import { t } from "ttag";
+import CS from "metabase/css/core/index.css";
import {
getShallowTableFieldIds,
getShallowTableForeignKeys,
@@ -14,7 +16,7 @@ import {
fetchTableForeignKeys,
fetchTableMetadata,
} from "metabase/redux/tables";
-import { Loader } from "metabase/ui";
+import { Loader, Stack } from "metabase/ui";
import { isNotNull } from "metabase/utils/types";
import type { NormalizedTable, TableId } from "metabase-types/api";
@@ -23,7 +25,6 @@ import { AbsoluteContainer, Fade } from "../MetadataInfo.styled";
import { ColumnCount } from "./ColumnCount";
import { type ConnectedTable, ConnectedTables } from "./ConnectedTables";
-import { InfoContainer, MetadataContainer } from "./TableInfo.styled";
export type TableInfoProps = {
className?: string;
@@ -129,13 +130,18 @@ export function TableInfoInner({
});
return (
- <InfoContainer className={className}>
+ <Stack
+ className={cx(CS.overflowAuto, className)}
+ pos="relative"
+ gap="xxxs"
+ p="lg"
+ >
{description ? (
<Description>{description}</Description>
) : (
<EmptyDescription>{t`No description`}</EmptyDescription>
)}
- <MetadataContainer>
+ <Stack className={CS.overflowHidden} pos="relative" gap="sm" fz="sm">
<Fade visible={!hasFetchedMetadata}>
<AbsoluteContainer>
<Loader size="md" color="core-brand" />
@@ -152,8 +158,8 @@ export function TableInfoInner({
/>
)}
</Fade>
- </MetadataContainer>
- </InfoContainer>
+ </Stack>
+ </Stack>
);
}
diff --git a/frontend/src/metabase/common/components/MetadataInfo/TableLabel/TableLabel.module.css b/frontend/src/metabase/common/components/MetadataInfo/TableLabel/TableLabel.module.css
new file mode 100644
index 00000000000..c121dfe16e7
--- /dev/null
+++ b/frontend/src/metabase/common/components/MetadataInfo/TableLabel/TableLabel.module.css
@@ -0,0 +1,3 @@
+.icon {
+ transform: translateY(-0.0625rem);
+}
diff --git a/frontend/src/metabase/common/components/MetadataInfo/TableLabel/TableLabel.styled.tsx b/frontend/src/metabase/common/components/MetadataInfo/TableLabel/TableLabel.styled.tsx
deleted file mode 100644
index 2b1592092e5..00000000000
--- a/frontend/src/metabase/common/components/MetadataInfo/TableLabel/TableLabel.styled.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-// eslint-disable-next-line eslint-js/no-restricted-imports
-import styled from "@emotion/styled";
-
-import { RelativeSizeIcon } from "../MetadataInfo.styled";
-
-export const TableIcon = styled(RelativeSizeIcon)`
- transform: translateY(-1px);
-`;
diff --git a/frontend/src/metabase/common/components/MetadataInfo/TableLabel/TableLabel.tsx b/frontend/src/metabase/common/components/MetadataInfo/TableLabel/TableLabel.tsx
index 86297e34b90..138461faf28 100644
--- a/frontend/src/metabase/common/components/MetadataInfo/TableLabel/TableLabel.tsx
+++ b/frontend/src/metabase/common/components/MetadataInfo/TableLabel/TableLabel.tsx
@@ -1,19 +1,24 @@
+import type { ColorName } from "metabase/ui/colors/types";
import type { NormalizedTable } from "metabase-types/api";
-import { Label, LabelContainer } from "../MetadataInfo.styled";
+import {
+ Label,
+ LabelContainer,
+ RelativeSizeIcon,
+} from "../MetadataInfo.styled";
-import { TableIcon } from "./TableLabel.styled";
+import S from "./TableLabel.module.css";
-export function TableLabel({
- className,
- table,
-}: {
+type TableLabelProps = {
className?: string;
table: Pick<NormalizedTable, "display_name">;
-}) {
+ color?: ColorName;
+};
+
+export function TableLabel({ className, table, color }: TableLabelProps) {
return (
- <LabelContainer className={className}>
- <TableIcon name="table" />
+ <LabelContainer className={className} color={color}>
+ <RelativeSizeIcon className={S.icon} name="table" />
<Label>{table.display_name}</Label>
</LabelContainer>
);