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 MetadataInfo components off Emotion (#83816)
Andrei Chernykh9bfabb2cfd53
diff --git a/frontend/src/metabase/common/components/MetadataInfo/InfoIcon/InfoIcon.module.css b/frontend/src/metabase/common/components/MetadataInfo/InfoIcon/InfoIcon.module.cssnew file mode 100644index 00000000000..69626148104--- /dev/null+++ b/frontend/src/metabase/common/components/MetadataInfo/InfoIcon/InfoIcon.module.css@@ -0,0 +1,18 @@+.hoverTarget {+ flex-shrink: 0;+ display: none;+}++.defaultIcon {+ display: block;+}++[aria-expanded="true"] .hoverTarget,+.hoverParent:hover .hoverTarget {+ display: block;+}++[aria-expanded="true"] .defaultIcon,+.hoverParent:hover .defaultIcon {+ display: none;+}diff --git a/frontend/src/metabase/common/components/MetadataInfo/InfoIcon/InfoIcon.styled.tsx b/frontend/src/metabase/common/components/MetadataInfo/InfoIcon/InfoIcon.styled.tsxdeleted file mode 100644index 6bbdbd6493b..00000000000--- a/frontend/src/metabase/common/components/MetadataInfo/InfoIcon/InfoIcon.styled.tsx+++ /dev/null@@ -1,31 +0,0 @@-// eslint-disable-next-line eslint-js/no-restricted-imports-import styled from "@emotion/styled";--import { Icon } from "metabase/ui";--export const PopoverHoverTarget = styled(Icon)`- flex-shrink: 0;- display: none;-- [aria-expanded="true"] & {- display: block;- }-`;--export const PopoverDefaultIcon = styled(Icon)`- display: block;-- [aria-expanded="true"] & {- display: none;- }-`;--export const HoverParent = styled.div`- &:hover ${PopoverHoverTarget} {- display: block;- }-- &:hover ${PopoverDefaultIcon} {- display: none;- }-`;diff --git a/frontend/src/metabase/common/components/MetadataInfo/InfoIcon/InfoIcon.tsx b/frontend/src/metabase/common/components/MetadataInfo/InfoIcon/InfoIcon.tsxnew file mode 100644index 00000000000..ac2789b74ec--- /dev/null+++ b/frontend/src/metabase/common/components/MetadataInfo/InfoIcon/InfoIcon.tsx@@ -0,0 +1,28 @@+import cx from "classnames";+import type { ComponentPropsWithoutRef, ElementType } from "react";++import { Icon, type IconProps } from "metabase/ui";++import S from "./InfoIcon.module.css";++type HoverParentProps<C extends ElementType> = {+ as?: C;+ className?: string;+} & Omit<ComponentPropsWithoutRef<C>, "as" | "className">;++export function HoverParent<C extends ElementType = "div">({+ as,+ className,+ ...props+}: HoverParentProps<C>) {+ const Component: ElementType = as ?? "div";+ return <Component {...props} className={cx(S.hoverParent, className)} />;+}++export const PopoverHoverTarget = ({ className, ...props }: IconProps) => {+ return <Icon className={cx(S.hoverTarget, className)} {...props} />;+};++export const PopoverDefaultIcon = ({ className, ...props }: IconProps) => {+ return <Icon className={cx(S.defaultIcon, className)} {...props} />;+};diff --git a/frontend/src/metabase/common/components/MetadataInfo/InfoIcon/index.tsx b/frontend/src/metabase/common/components/MetadataInfo/InfoIcon/index.tsxindex 7bdf9f0aff3..61ebdeec4de 100644--- a/frontend/src/metabase/common/components/MetadataInfo/InfoIcon/index.tsx+++ b/frontend/src/metabase/common/components/MetadataInfo/InfoIcon/index.tsx@@ -1 +1 @@-export * from "./InfoIcon.styled";+export * from "./InfoIcon";diff --git a/frontend/src/metabase/common/components/MetadataInfo/MetadataInfo.module.css b/frontend/src/metabase/common/components/MetadataInfo/MetadataInfo.module.cssindex ee2d9975938..0f35b02eb07 100644--- a/frontend/src/metabase/common/components/MetadataInfo/MetadataInfo.module.css+++ b/frontend/src/metabase/common/components/MetadataInfo/MetadataInfo.module.css@@ -9,3 +9,28 @@color: var(--mb-color-text-disabled);font-weight: 700;}++.fade {+ transition: opacity 0.25s linear;++ &:empty {+ display: none;+ }+}++.slide {+ transition:+ opacity 0.25s linear,+ transform 0.25s linear;+}++.slideOut {+ transform: translateY(100%);+}++@media (prefers-reduced-motion: reduce) {+ .fade,+ .slide {+ transition-duration: 0s;+ }+}diff --git a/frontend/src/metabase/common/components/MetadataInfo/MetadataInfo.styled.tsx b/frontend/src/metabase/common/components/MetadataInfo/MetadataInfo.styled.tsxdeleted file mode 100644index 9528205820d..00000000000--- a/frontend/src/metabase/common/components/MetadataInfo/MetadataInfo.styled.tsx+++ /dev/null@@ -1,78 +0,0 @@-// eslint-disable-next-line eslint-js/no-restricted-imports-import styled from "@emotion/styled";--import { Icon } from "metabase/ui";-import type { ColorName } from "metabase/ui/colors/types";-import { color } from "metabase/ui/utils/colors";-import { isReducedMotionPreferred } from "metabase/utils/dom";--const TRANSITION_DURATION = () => (isReducedMotionPreferred() ? "0" : "0.25s");--export const Container = styled.div`- position: relative;- display: flex;- flex-direction: column;- gap: 0.8em;- overflow: auto;-`;--export const AbsoluteContainer = styled.div`- position: absolute;- top: 0;- left: 0;- right: 0;- bottom: 0;- display: flex;- justify-content: center;- align-items: center;-`;--export const InfoContainer = styled(Container)`- padding: 1.1em;-`;--export const LabelContainer = styled.div<{ color?: ColorName }>`- display: inline-flex;- align-items: center;- column-gap: 0.3em;- font-size: 1em;- font-weight: normal;- color: ${({ color: _color = "core-brand" }) => color(_color)};- margin-bottom: 0.5rem;-`;--export const Label = styled.span`- font-size: 1em;- line-height: 1em;-`;--export const RelativeSizeIcon = styled(Icon)`- height: 1em;- width: 1em;-`;--type FadeProps = {- visible?: boolean;-};--export const Fade = styled.div<FadeProps>`- width: 100%;- transition: opacity ${TRANSITION_DURATION} linear;- opacity: ${({ visible }) => (visible ? "1" : "0")};-- &:empty {- display: none;- }-`;--export const Table = styled.table`- font-size: 1em;-- th {- font-weight: normal;- }-- td {- font-weight: bold;- }-`;diff --git a/frontend/src/metabase/common/components/MetadataInfo/MetadataInfo.tsx b/frontend/src/metabase/common/components/MetadataInfo/MetadataInfo.tsxindex ee2998d81a7..b470e76f8ae 100644--- a/frontend/src/metabase/common/components/MetadataInfo/MetadataInfo.tsx+++ b/frontend/src/metabase/common/components/MetadataInfo/MetadataInfo.tsx@@ -1,6 +1,14 @@import cx from "classnames";+import type { HTMLAttributes, ReactNode } from "react";-import { Box, type BoxProps } from "metabase/ui";+import {+ Box,+ type BoxProps,+ Flex,+ type FlexProps,+ Text,+ type TextProps,+} from "metabase/ui";import S from "./MetadataInfo.module.css";@@ -19,3 +27,46 @@ export const EmptyDescription = ({<Description className={cx(S.EmptyDescription, className)} {...props} />);};++export const LabelContainer = (props: React.PropsWithChildren<FlexProps>) => {+ return (+ <Flex+ display="inline-flex"+ align="center"+ columnGap="0.3em"+ fw="normal"+ mb="sm"+ {...props}+ />+ );+};++export const Label = (props: React.PropsWithChildren<TextProps>) => {+ return <Text component="span" inherit c="inherit" lh="1em" {...props} />;+};++type FadeProps = BoxProps &+ HTMLAttributes<HTMLDivElement> & {+ visible?: boolean;+ slide?: boolean;+ children?: ReactNode;+ };++export const Fade = ({+ visible = false,+ slide = false,+ className,+ ...props+}: FadeProps) => {+ return (+ <Box+ className={cx(+ S.fade,+ { [S.slide]: slide, [S.slideOut]: slide && !visible },+ className,+ )}+ opacity={visible ? 1 : 0}+ {...props}+ />+ );+};diff --git a/frontend/src/metabase/common/components/MetadataInfo/Popover/Popover.module.css b/frontend/src/metabase/common/components/MetadataInfo/Popover/Popover.module.cssnew file mode 100644index 00000000000..8b741108d85--- /dev/null+++ b/frontend/src/metabase/common/components/MetadataInfo/Popover/Popover.module.css@@ -0,0 +1,4 @@+/* Element-qualified to outrank the theme's hover card dropdown rule regardless of CSS load order */+div.dropdown {+ overflow: visible;+}diff --git a/frontend/src/metabase/common/components/MetadataInfo/Popover/Popover.styled.tsx b/frontend/src/metabase/common/components/MetadataInfo/Popover/Popover.styled.tsxdeleted file mode 100644index d699e200f95..00000000000--- a/frontend/src/metabase/common/components/MetadataInfo/Popover/Popover.styled.tsx+++ /dev/null@@ -1,14 +0,0 @@-// eslint-disable-next-line eslint-js/no-restricted-imports-import styled from "@emotion/styled";--import { HoverCard } from "metabase/ui";--export const WidthBound = styled.div<{ width?: number }>`- font-size: 14px;- min-width: ${(props) => props.width ?? 220}px;- max-width: ${(props) => props.width ?? 300}px;-`;--export const Dropdown = styled(HoverCard.Dropdown)`- overflow: visible;-`;diff --git a/frontend/src/metabase/common/components/MetadataInfo/Popover/Popover.tsx b/frontend/src/metabase/common/components/MetadataInfo/Popover/Popover.tsxindex 1455c465107..54462569b10 100644--- a/frontend/src/metabase/common/components/MetadataInfo/Popover/Popover.tsx+++ b/frontend/src/metabase/common/components/MetadataInfo/Popover/Popover.tsx@@ -1,9 +1,10 @@+import cx from "classnames";import type { MouseEvent, ReactNode } from "react";import { useCallback, useState } from "react";import Animation from "metabase/css/core/animation.module.css";import type { HoverCardProps } from "metabase/ui";-import { HoverCard, useDelayGroup } from "metabase/ui";+import { Box, HoverCard, useDelayGroup } from "metabase/ui";// Initially, the user will have to hover for this long to open the popoverconst POPOVER_SLOW_OPEN_DELAY = 250;@@ -20,7 +21,7 @@ const POPOVER_FAST_OPEN_DELAY = 150;// we don't close immediately but delay by a short amount to avoid flicker.const POPOVER_CLOSE_DELAY = POPOVER_FAST_OPEN_DELAY + 30;-import { Dropdown, WidthBound } from "./Popover.styled";+import S from "./Popover.module.css";const DEFAULT_MIDDLEWARES: HoverCardProps["middlewares"] = {size: true,@@ -75,14 +76,16 @@ export function Popover({middlewares={middlewares}><HoverCard.Target>{children}</HoverCard.Target>- <Dropdown+ <HoverCard.DropdownonClick={stopPropagation}onMouseDown={stopPropagation}onMouseUp={stopPropagation}- className={group.shouldDelay ? Animation.fadeIn : undefined}+ className={cx(S.dropdown, { [Animation.fadeIn]: group.shouldDelay })}>- <WidthBound width={width}>{isOpen && content}</WidthBound>- </Dropdown>+ <Box fz="md" miw={width ?? 220} maw={width ?? 300}>+ {isOpen && content}+ </Box>+ </HoverCard.Dropdown></HoverCard>);}diff --git a/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/DateTimeFingerprint.tsx b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/DateTimeFingerprint.tsxindex 1eb08916d8a..bc202cc1161 100644--- a/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/DateTimeFingerprint.tsx+++ b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/DateTimeFingerprint.tsx@@ -1,10 +1,9 @@import { t } from "ttag";+import CS from "metabase/css/core/index.css";import { formatDateTimeWithUnit } from "metabase/value-formatting";import type * as Lib from "metabase-lib";-import { Table } from "../MetadataInfo.styled";-export type DateTimeFingerprintProps = {className?: string;fingerprintTypeInfo?: Lib.DateTimeFingerprintDisplayInfo | null;@@ -25,23 +24,23 @@ export function DateTimeFingerprint({const formattedLatest = formatDateTimeWithUnit(latest, "minute");return (- <Table className={className}>+ <table className={className}><tbody>{timezone && (<tr>- <th>{t`Timezone`}</th>- <td>{timezone}</td>+ <th className={CS.textNormal}>{t`Timezone`}</th>+ <td className={CS.textBold}>{timezone}</td></tr>)}<tr>- <th>{t`Earliest date`}</th>- <td>{formattedEarliest}</td>+ <th className={CS.textNormal}>{t`Earliest date`}</th>+ <td className={CS.textBold}>{formattedEarliest}</td></tr><tr>- <th>{t`Latest date`}</th>- <td>{formattedLatest}</td>+ <th className={CS.textNormal}>{t`Latest date`}</th>+ <td className={CS.textBold}>{formattedLatest}</td></tr></tbody>- </Table>+ </table>);}diff --git a/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/GlobalFingerprint.module.css b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/GlobalFingerprint.module.cssnew file mode 100644index 00000000000..8c6f6bc60cc--- /dev/null+++ b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/GlobalFingerprint.module.css@@ -0,0 +1,7 @@+.item {+ border-bottom: 1px solid var(--mb-color-border-neutral);++ &:last-child {+ border-bottom: none;+ }+}diff --git a/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/GlobalFingerprint.styled.tsx b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/GlobalFingerprint.styled.tsxdeleted file mode 100644index 07f00f939e6..00000000000--- a/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/GlobalFingerprint.styled.tsx+++ /dev/null@@ -1,62 +0,0 @@-// eslint-disable-next-line eslint-js/no-restricted-imports-import styled from "@emotion/styled";--import { isReducedMotionPreferred } from "metabase/utils/dom";--const TRANSITION_DURATION = () => (isReducedMotionPreferred() ? "0" : "0.25s");--export const Container = styled.div`- font-size: 1em;- position: relative;- display: flex;- flex-direction: column;- gap: 0.6em;- height: auto;- overflow: hidden;-`;--export const NoWrap = styled.div`- white-space: nowrap;- text-overflow: ellipsis;- overflow: hidden;- font-weight: bold;- padding-top: 0.3em 0;- line-height: 1.3em;-`;--export const RelativeContainer = styled.div<{ height?: string }>`- position: relative;- height: ${({ height }) => height || "1em"};- line-height: 1em;-`;--export const Fade = styled.div<{ visible?: boolean }>`- position: absolute;- top: 0;- left: 0;- width: 100%;- transition: opacity ${TRANSITION_DURATION} linear;- opacity: ${({ visible }) => (visible ? "1" : "0")};-`;--export const FadeAndSlide = styled.div<{ visible?: boolean }>`- position: absolute;- width: 100%;- transition:- opacity ${TRANSITION_DURATION} linear,- transform ${TRANSITION_DURATION} linear;- opacity: ${({ visible }) => (visible ? "1" : "0")};- transform: ${({ visible }) =>- visible ? "translateY(0)" : "translateY(100%)"};-`;--export const Li = styled.li`- padding: 0.3em 0;- overflow: hidden;- text-overflow: ellipsis;- border-bottom: 1px solid var(--mb-color-border-neutral);-- &:last-child {- border-bottom: none;- }-`;diff --git a/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/GlobalFingerprint.tsx b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/GlobalFingerprint.tsxindex 9d989774ea0..cad387859a6 100644--- a/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/GlobalFingerprint.tsx+++ b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/GlobalFingerprint.tsx@@ -1,18 +1,15 @@+import cx from "classnames";import { msgid, ngettext, t } from "ttag";import { useGetFieldQuery, useGetFieldValuesQuery } from "metabase/api";-import { Flex, Loader } from "metabase/ui";+import CS from "metabase/css/core/index.css";+import { Box, Flex, Loader, Stack, Text } from "metabase/ui";import { formatNumber } from "metabase/utils/formatting";import type { FieldId, FieldValue } from "metabase-types/api";-import {- Container,- Fade,- FadeAndSlide,- Li,- NoWrap,- RelativeContainer,-} from "./GlobalFingerprint.styled";+import { Fade } from "../MetadataInfo";++import S from "./GlobalFingerprint.module.css";interface GlobalFingerprintProps {className?: string;@@ -43,10 +40,17 @@ export function GlobalFingerprint({const showComponent = showDistinctCount || showFieldValuesBlock;return showComponent ? (- <Container className={className}>+ <Stack className={cx(CS.overflowHidden, className)} pos="relative" gap="sm">{showDistinctCount && (- <RelativeContainer>- <Fade aria-hidden={!isLoading} visible={!isLoading}>+ <Box pos="relative" h="1em" lh="1em">+ <Fade+ pos="absolute"+ top={0}+ left={0}+ w="100%"+ aria-hidden={!isLoading}+ visible={!isLoading}+ >{ngettext(msgid`${formattedDistinctCount} distinct value`,`${formattedDistinctCount} distinct values`,@@ -55,11 +59,15 @@ export function GlobalFingerprint({</Fade>{hasListValues && (<Fade+ pos="absolute"+ top={0}+ left={0}+ w="100%"aria-hidden={!isLoading}visible={isLoading}>{t`Getting distinct values...`}</Fade>)}- </RelativeContainer>+ </Box>)}{showFieldValuesBlock &&(showAllFieldValues ? (@@ -70,7 +78,7 @@ export function GlobalFingerprint({fieldValues={fieldValues}/>))}- </Container>+ </Stack>) : null;}@@ -88,7 +96,16 @@ function ExtendedFieldValuesList({if (value === null) {return null;}- return <Li key={i}>{value.toString()}</Li>;+ return (+ <Box+ component="li"+ key={i}+ className={cx(S.item, CS.overflowHidden, CS.textEllipsis)}+ py="xxs"+ >+ {value.toString()}+ </Box>+ );})}</ul>);@@ -110,15 +127,22 @@ function ShortenedFieldValuesList({.join(", ");return (- <RelativeContainer height={isLoading ? "1.8em" : "1.5em"}>- <Fade visible={isLoading}>+ <Box pos="relative" h={isLoading ? "1.8em" : "1.5em"} lh="1em">+ <Fade pos="absolute" top={0} left={0} w="100%" visible={isLoading}><Flex justify="center"><Loader size={18} color="core-brand" /></Flex></Fade>- <FadeAndSlide visible={!isLoading}>- <NoWrap>{shortenedValuesStr}</NoWrap>- </FadeAndSlide>- </RelativeContainer>+ <Fade pos="absolute" w="100%" slide visible={!isLoading}>+ <Text+ className={cx(CS.textNoWrap, CS.overflowHidden, CS.textEllipsis)}+ inherit+ fw="bold"+ lh="1.3em"+ >+ {shortenedValuesStr}+ </Text>+ </Fade>+ </Box>);}diff --git a/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/NumberFingerprint.tsx b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/NumberFingerprint.tsxindex b4430d696f4..500031fc96c 100644--- a/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/NumberFingerprint.tsx+++ b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/NumberFingerprint.tsx@@ -1,9 +1,8 @@import { t } from "ttag";+import CS from "metabase/css/core/index.css";import type * as Lib from "metabase-lib";-import { Table } from "../MetadataInfo.styled";-export type NumberFingerprintProps = {className?: string;fingerprintTypeInfo?: Lib.NumberFingerprintDisplayInfo | null;@@ -25,22 +24,22 @@ export function NumberFingerprint({const someNumberIsDefined = isAvgNumber || isMinNumber || isMaxNumber;return someNumberIsDefined ? (- <Table className={className}>+ <table className={className}><thead><tr>- {isAvgNumber && <th>{t`Average`}</th>}- {isMinNumber && <th>{t`Min`}</th>}- {isMaxNumber && <th>{t`Max`}</th>}+ {isAvgNumber && <th className={CS.textNormal}>{t`Average`}</th>}+ {isMinNumber && <th className={CS.textNormal}>{t`Min`}</th>}+ {isMaxNumber && <th className={CS.textNormal}>{t`Max`}</th>}</tr></thead><tbody><tr>- {isAvgNumber && <td>{formattedAvg}</td>}- {isMinNumber && <td>{formattedMin}</td>}- {isMaxNumber && <td>{formattedMax}</td>}+ {isAvgNumber && <td className={CS.textBold}>{formattedAvg}</td>}+ {isMinNumber && <td className={CS.textBold}>{formattedMin}</td>}+ {isMaxNumber && <td className={CS.textBold}>{formattedMax}</td>}</tr></tbody>- </Table>+ </table>) : null;}diff --git a/frontend/src/metabase/common/components/MetadataInfo/QueryColumnInfo/QueryColumnInfo.styled.tsx b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnInfo/QueryColumnInfo.styled.tsxdeleted file mode 100644index fd31b21b6e0..00000000000--- a/frontend/src/metabase/common/components/MetadataInfo/QueryColumnInfo/QueryColumnInfo.styled.tsx+++ /dev/null@@ -1,12 +0,0 @@-// eslint-disable-next-line eslint-js/no-restricted-imports-import styled from "@emotion/styled";--import { InfoContainer as _InfoContainer } from "metabase/common/components/MetadataInfo/MetadataInfo.styled";--export const Small = styled.div`- font-size: 0.9em;-`;--export const InfoContainer = styled(_InfoContainer)`- gap: 0.8em;-`;diff --git a/frontend/src/metabase/common/components/MetadataInfo/QueryColumnInfo/QueryColumnInfo.tsx b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnInfo/QueryColumnInfo.tsxindex 0df5e2abeda..8f3e5e67554 100644--- a/frontend/src/metabase/common/components/MetadataInfo/QueryColumnInfo/QueryColumnInfo.tsx+++ b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnInfo/QueryColumnInfo.tsx@@ -1,13 +1,14 @@+import cx from "classnames";import { t } from "ttag";+import CS from "metabase/css/core/index.css";+import { Box, Stack } from "metabase/ui";import * as Lib from "metabase-lib";import { Description, EmptyDescription } from "../MetadataInfo";import { QueryColumnFingerprintInfo } from "../QueryColumnFingerprintInfo";import { SemanticTypeLabel } from "../SemanticTypeLabel";-import { InfoContainer, Small } from "./QueryColumnInfo.styled";-export type QueryColumnInfoProps = {className?: string;query?: Lib.Query;@@ -32,9 +33,15 @@ export function QueryColumnInfo({: {};return (- <InfoContainer className={className} data-testid="column-info">+ <Stack+ className={cx(CS.overflowAuto, className)}+ pos="relative"+ gap="md"+ p="lg"+ data-testid="column-info"+ ><ColumnDescription description={description} />- <Small>+ <Box fz="sm"><SemanticTypeLabel semanticType={semanticType} />{query && showFingerprintInfo && (<QueryColumnFingerprintInfo@@ -45,8 +52,8 @@ export function QueryColumnInfo({showAllFieldValues={showAllFieldValues}/>)}- </Small>- </InfoContainer>+ </Box>+ </Stack>);}diff --git a/frontend/src/metabase/common/components/MetadataInfo/SemanticTypeLabel/SemanticTypeLabel.tsx b/frontend/src/metabase/common/components/MetadataInfo/SemanticTypeLabel/SemanticTypeLabel.tsxindex 62c69a7ec34..70d71c01a42 100644--- a/frontend/src/metabase/common/components/MetadataInfo/SemanticTypeLabel/SemanticTypeLabel.tsx+++ b/frontend/src/metabase/common/components/MetadataInfo/SemanticTypeLabel/SemanticTypeLabel.tsx@@ -4,12 +4,9 @@ import {getSemanticTypeIcon,getSemanticTypeName,} from "metabase/common/utils/fields";+import { Icon } from "metabase/ui";-import {- Label,- LabelContainer,- RelativeSizeIcon,-} from "../MetadataInfo.styled";+import { Label, LabelContainer } from "../MetadataInfo";type SemanticTypeLabelProps = {className?: string;@@ -25,8 +22,8 @@ export function SemanticTypeLabel({getSemanticTypeName(semanticType) || t`No special type`;return (- <LabelContainer className={className}>- <RelativeSizeIcon name={semanticTypeIcon} />+ <LabelContainer className={className} c="core-brand">+ <Icon name={semanticTypeIcon} size={12} /><Label>{semanticTypeName}</Label></LabelContainer>);diff --git a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ColumnCount.tsx b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ColumnCount.tsxindex e7c3c9dd832..95573e8b139 100644--- a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ColumnCount.tsx+++ b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ColumnCount.tsx@@ -1,10 +1,10 @@import { msgid, ngettext } from "ttag";-import { Label, LabelContainer } from "../MetadataInfo.styled";+import { Label, LabelContainer } from "../MetadataInfo";export function ColumnCount({ fieldCount }: { fieldCount: number }) {return (- <LabelContainer color="text-primary">+ <LabelContainer c="text-primary"><Label>{ngettext(msgid`${fieldCount} column`,diff --git a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.module.css b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.module.cssindex aca32db971d..979712fb3ee 100644--- a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.module.css+++ b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.module.css@@ -1,6 +1,10 @@.connectedTable {cursor: pointer;+ .label {+ color: var(--mb-color-text-disabled);+ }+&:hover .label,&:focus .label {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.tsxindex daa748ccefd..cc088130800 100644--- a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.tsx+++ b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.tsx@@ -2,12 +2,13 @@ import { useMemo } from "react";import { t } from "ttag";import { Link } from "metabase/common/components/Link";+import CS from "metabase/css/core/index.css";import { useQuestionFromOptsBuilder } from "metabase/metadata-store";-import { Box } from "metabase/ui";+import { Box, Stack } from "metabase/ui";import * as Urls from "metabase/urls";import type { NormalizedTable } from "metabase-types/api";-import { Container, Label, LabelContainer } from "../MetadataInfo.styled";+import { Label, LabelContainer } from "../MetadataInfo";import { TableLabel } from "../TableLabel/TableLabel";import S from "./ConnectedTables.module.css";@@ -24,8 +25,8 @@ type Props = {export function ConnectedTables({ tables, onConnectedTableClick }: Props) {return tables.length ? (- <Container>- <LabelContainer color="text-primary">+ <Stack className={CS.overflowAuto} pos="relative" gap="sm">+ <LabelContainer c="text-primary"><Label>{t`Connected to these tables`}</Label></LabelContainer>{tables.slice(0, 8).map((fkTable) => {@@ -39,7 +40,7 @@ export function ConnectedTables({ tables, onConnectedTableClick }: Props) {<ConnectedTableLink key={fkTable.id} table={fkTable} />);})}- </Container>+ </Stack>) : null;}@@ -58,7 +59,7 @@ function ConnectedTableButton({ta="left"onClick={() => onClick(table)}>- <TableLabel className={S.label} table={table} color="text-disabled" />+ <TableLabel className={S.label} table={table} /></Box>);}@@ -79,7 +80,7 @@ function ConnectedTableLink({ table }: { table: ConnectedTable }) {return (<Link className={S.connectedTable} to={url}>- <TableLabel className={S.label} table={table} color="text-disabled" />+ <TableLabel className={S.label} table={table} /></Link>);}diff --git a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.tsx b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.tsxindex da242260e8c..d313a9d215d 100644--- a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.tsx+++ b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.tsx@@ -16,12 +16,11 @@ import {fetchTableForeignKeys,fetchTableMetadata,} from "metabase/redux/tables";-import { Loader, Stack } from "metabase/ui";+import { Center, Loader, Stack } from "metabase/ui";import { isNotNull } from "metabase/utils/types";import type { NormalizedTable, TableId } from "metabase-types/api";-import { Description, EmptyDescription } from "../MetadataInfo";-import { AbsoluteContainer, Fade } from "../MetadataInfo.styled";+import { Description, EmptyDescription, Fade } from "../MetadataInfo";import { ColumnCount } from "./ColumnCount";import { type ConnectedTable, ConnectedTables } from "./ConnectedTables";@@ -143,9 +142,9 @@ export function TableInfoInner({)}<Stack className={CS.overflowHidden} pos="relative" gap="sm" fz="sm"><Fade visible={!hasFetchedMetadata}>- <AbsoluteContainer>+ <Center pos="absolute" inset={0}><Loader size="md" color="core-brand" />- </AbsoluteContainer>+ </Center></Fade><Fade visible={hasFetchedMetadata}>{table && <ColumnCount fieldCount={fieldCount} />}diff --git a/frontend/src/metabase/common/components/MetadataInfo/TableLabel/TableLabel.tsx b/frontend/src/metabase/common/components/MetadataInfo/TableLabel/TableLabel.tsxindex 138461faf28..f7c6a340906 100644--- a/frontend/src/metabase/common/components/MetadataInfo/TableLabel/TableLabel.tsx+++ b/frontend/src/metabase/common/components/MetadataInfo/TableLabel/TableLabel.tsx@@ -1,24 +1,23 @@-import type { ColorName } from "metabase/ui/colors/types";+import cx from "classnames";++import CS from "metabase/css/core/index.css";+import { Icon } from "metabase/ui";import type { NormalizedTable } from "metabase-types/api";-import {- Label,- LabelContainer,- RelativeSizeIcon,-} from "../MetadataInfo.styled";+import { Label, LabelContainer } from "../MetadataInfo";import S from "./TableLabel.module.css";type TableLabelProps = {className?: string;table: Pick<NormalizedTable, "display_name">;- color?: ColorName;};-export function TableLabel({ className, table, color }: TableLabelProps) {+export function TableLabel({ className, table }: TableLabelProps) {return (- <LabelContainer className={className} color={color}>- <RelativeSizeIcon className={S.icon} name="table" />+ // A class, not a color prop, so ConnectedTables can recolor the label on hover+ <LabelContainer className={cx(CS.textBrand, className)}>+ <Icon className={S.icon} name="table" w="1em" h="1em" /><Label>{table.display_name}</Label></LabelContainer>);