Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Don't clip Unicode subscript descenders in single-line Ellipsified (#74104)

Andrei Chernykh14686fa70316
diff --git a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedQuestionView_Smart_Scalar_Dark_Theme.png b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedQuestionView_Smart_Scalar_Dark_Theme.png
index 93aea9c535b..0c821cbe323 100644
Binary files a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedQuestionView_Smart_Scalar_Dark_Theme.png and b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedQuestionView_Smart_Scalar_Dark_Theme.png differ
diff --git a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedQuestionView_Smart_Scalar_Light_Theme.png b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedQuestionView_Smart_Scalar_Light_Theme.png
index 9fa98b5fa9d..6eb4ea49945 100644
Binary files a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedQuestionView_Smart_Scalar_Light_Theme.png and b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedQuestionView_Smart_Scalar_Light_Theme.png differ
diff --git a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedQuestionView_Smart_Scalar_Unicode_Subscript.png b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedQuestionView_Smart_Scalar_Unicode_Subscript.png
new file mode 100644
index 00000000000..ec2d7849353
Binary files /dev/null and b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedQuestionView_Smart_Scalar_Unicode_Subscript.png differ
diff --git a/.loki/reference/chrome_laptop_viz_Scalar_With_Formatting_And_Hover.png b/.loki/reference/chrome_laptop_viz_Scalar_With_Formatting_And_Hover.png
index 32b1ea38e7f..91f6d299bb9 100644
Binary files a/.loki/reference/chrome_laptop_viz_Scalar_With_Formatting_And_Hover.png and b/.loki/reference/chrome_laptop_viz_Scalar_With_Formatting_And_Hover.png differ
diff --git a/.loki/reference/chrome_laptop_viz_SmartScalar_Default.png b/.loki/reference/chrome_laptop_viz_SmartScalar_Default.png
index 805bb992045..63c93f9b70c 100644
Binary files a/.loki/reference/chrome_laptop_viz_SmartScalar_Default.png and b/.loki/reference/chrome_laptop_viz_SmartScalar_Default.png differ
diff --git a/.loki/reference/chrome_laptop_viz_SmartScalar_Embedding_Theme.png b/.loki/reference/chrome_laptop_viz_SmartScalar_Embedding_Theme.png
index a4b6e30931a..c9a635bfcae 100644
Binary files a/.loki/reference/chrome_laptop_viz_SmartScalar_Embedding_Theme.png and b/.loki/reference/chrome_laptop_viz_SmartScalar_Embedding_Theme.png differ
diff --git a/e2e/support/helpers/e2e-ui-elements-overflow-helpers.js b/e2e/support/helpers/e2e-ui-elements-overflow-helpers.js
index 1809c80e9e5..034afdbee37 100644
--- a/e2e/support/helpers/e2e-ui-elements-overflow-helpers.js
+++ b/e2e/support/helpers/e2e-ui-elements-overflow-helpers.js
@@ -57,8 +57,12 @@ export const assertIsNotEllipsified = (element) => {
};
export const isEllipsified = (element) => {
+ // Skip axes that don't clip; `overflow-y: visible` elements report scrollHeight > clientHeight without being truncated.
+ const { overflowX, overflowY } = window.getComputedStyle(element);
+ const verticalClips = overflowY !== "visible";
+ const horizontalClips = overflowX !== "visible";
return (
- element.scrollHeight > element.clientHeight ||
- element.scrollWidth > element.clientWidth
+ (verticalClips && element.scrollHeight > element.clientHeight) ||
+ (horizontalClips && element.scrollWidth > element.clientWidth)
);
};
diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView.stories.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView.stories.tsx
index 0298972959a..db3eae7ac3e 100644
--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView.stories.tsx
+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView.stories.tsx
@@ -285,6 +285,26 @@ export const SmartScalarDarkTheme = {
},
};
+// Regression guard for metabase#72443: `₂` subscript descender used to clip at the value's line-box edge.
+export const SmartScalarUnicodeSubscript = {
+ render: Template,
+
+ args: {
+ ...SmartScalarLightTheme.args,
+ card: createMockCard({
+ id: getNextId(),
+ display: "smartscalar",
+ visualization_settings: {
+ "graph.dimensions": ["timestamp"],
+ "graph.metrics": ["count"],
+ column_settings: {
+ '["name","Count"]': { suffix: "tCO₂e" },
+ },
+ },
+ }),
+ },
+};
+
export const SmartScalarLightThemeTooltip = {
parameters: {
loki: { skip: true },
diff --git a/frontend/src/metabase/ui/components/data-display/Ellipsified/Ellipsified.tsx b/frontend/src/metabase/ui/components/data-display/Ellipsified/Ellipsified.tsx
index 465e3db6037..0a55fa8c306 100644
--- a/frontend/src/metabase/ui/components/data-display/Ellipsified/Ellipsified.tsx
+++ b/frontend/src/metabase/ui/components/data-display/Ellipsified/Ellipsified.tsx
@@ -23,16 +23,29 @@ export const Ellipsified = ({
tooltipProps,
...textProps
}: EllipsifiedProps) => {
+ const isSingleLine = lines === 1;
const canSkipTooltipRendering = !showTooltip && !alwaysShowTooltip;
+ // Single-line truncate clips only horizontally, so vertical overflow isn't truncation.
const { isTruncated, ref } = useIsTruncated<HTMLDivElement>({
disabled: canSkipTooltipRendering,
- ignoreHeightTruncation,
+ ignoreHeightTruncation: ignoreHeightTruncation || isSingleLine,
});
const isEnabled =
(showTooltip && (isTruncated || alwaysShowTooltip)) || false;
- const truncatedProps: Partial<TextProps> =
- lines > 1 ? { lineClamp: lines } : { truncate: true };
+ const truncatedProps: Partial<TextProps> = isSingleLine
+ ? { truncate: true }
+ : { lineClamp: lines };
+
+ // Override Mantine's `overflow: hidden` so deep descenders (e.g. `₂` in `tCO₂e`) render past the line box without growing it (metabase#72443).
+ // `min-width: 0` keeps flex-layout shrink-to-fit working; `overflow: hidden` gets it implicitly but `overflow: clip` doesn't.
+ const overflowStyle = isSingleLine
+ ? {
+ overflowX: "clip" as const,
+ overflowY: "visible" as const,
+ minWidth: 0,
+ }
+ : undefined;
return (
<Tooltip
@@ -49,6 +62,7 @@ export const Ellipsified = ({
lh="inherit"
{...truncatedProps}
{...textProps}
+ style={{ ...overflowStyle, ...textProps.style }}
>
{children}
</Text>
diff --git a/frontend/src/metabase/visualizations/components/ScalarValue/ScalarValue.module.css b/frontend/src/metabase/visualizations/components/ScalarValue/ScalarValue.module.css
new file mode 100644
index 00000000000..134e70cc9bf
--- /dev/null
+++ b/frontend/src/metabase/visualizations/components/ScalarValue/ScalarValue.module.css
@@ -0,0 +1,12 @@
+.value {
+ display: inline;
+ color: var(--scalar-value-color, inherit);
+}
+
+.hoverable {
+ cursor: pointer;
+}
+
+.hoverable:hover {
+ color: var(--mb-color-brand);
+}
diff --git a/frontend/src/metabase/visualizations/components/ScalarValue/ScalarValue.styled.tsx b/frontend/src/metabase/visualizations/components/ScalarValue/ScalarValue.styled.tsx
deleted file mode 100644
index 713bedaa276..00000000000
--- a/frontend/src/metabase/visualizations/components/ScalarValue/ScalarValue.styled.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import styled from "@emotion/styled";
-
-export const ScalarRoot = styled.div`
- position: relative;
- display: flex;
- flex: 1;
- flex-direction: column;
- flex-wrap: wrap;
- justify-content: center;
- align-items: center;
- width: 100%;
- height: 100%;
-`;
-
-interface ScalarValueWrapperProps {
- fontSize?: string | number;
- lineHeight?: string;
- disableHover?: boolean;
-}
-
-export const ScalarValueWrapper = styled.h1<ScalarValueWrapperProps>`
- display: inline;
- font-size: ${(props) => props.fontSize};
- line-height: ${(props) => props.lineHeight ?? "var(--mantine-line-height)"};
- cursor: ${(props) => (props.disableHover ? "auto" : "pointer")};
- color: ${({ color }) => color};
-
- &:hover {
- color: ${({ disableHover }) =>
- disableHover ? undefined : "var(--mb-color-brand)"};
- }
-`;
diff --git a/frontend/src/metabase/visualizations/components/ScalarValue/ScalarValue.tsx b/frontend/src/metabase/visualizations/components/ScalarValue/ScalarValue.tsx
index 6bb484b6da6..3fd5dc0604b 100644
--- a/frontend/src/metabase/visualizations/components/ScalarValue/ScalarValue.tsx
+++ b/frontend/src/metabase/visualizations/components/ScalarValue/ScalarValue.tsx
@@ -2,19 +2,31 @@
* Shared component for Scalar and SmartScalar to make sure our number presentation stays in sync
*/
import cx from "classnames";
-import { type PropsWithChildren, useMemo } from "react";
+import { type CSSProperties, type PropsWithChildren, useMemo } from "react";
import { t } from "ttag";
import DashboardS from "metabase/css/dashboard.module.css";
import QueryBuilderS from "metabase/css/query_builder.module.css";
-import { useMantineTheme } from "metabase/ui";
+import { Box, Flex, useMantineTheme } from "metabase/ui";
import type { VisualizationGridSize } from "metabase/visualizations/types";
-import { ScalarRoot, ScalarValueWrapper } from "./ScalarValue.styled";
+import S from "./ScalarValue.module.css";
import { findSize, getMaxFontSize } from "./utils";
export const ScalarWrapper = ({ children }: PropsWithChildren) => (
- <ScalarRoot data-testid="scalar-root">{children}</ScalarRoot>
+ <Flex
+ pos="relative"
+ direction="column"
+ wrap="wrap"
+ justify="center"
+ align="center"
+ flex={1}
+ w="100%"
+ h="100%"
+ data-testid="scalar-root"
+ >
+ {children}
+ </Flex>
);
interface ScalarValueProps {
@@ -71,15 +83,21 @@ export const ScalarValue = ({
]);
return (
- <ScalarValueWrapper
- className={cx(DashboardS.ScalarValue, QueryBuilderS.ScalarValue)}
- fontSize={fontSize}
- lineHeight={numberTheme?.value?.lineHeight}
+ <Box
+ component="h1"
+ className={cx(
+ DashboardS.ScalarValue,
+ QueryBuilderS.ScalarValue,
+ S.value,
+ !disableHover && S.hoverable,
+ )}
+ fz={fontSize}
+ lh={numberTheme?.value?.lineHeight}
data-testid="scalar-value"
- color={color}
- disableHover={disableHover}
+ // Route color through a CSS variable so `S.hoverable:hover` can override (inline `style` would beat the class on specificity).
+ style={{ "--scalar-value-color": color } as CSSProperties}
>
{value ?? t`null`}
- </ScalarValueWrapper>
+ </Box>
);
};
diff --git a/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.unit.spec.tsx b/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.unit.spec.tsx
index 0c9e53e8db7..cb7079f8d8a 100644
--- a/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.unit.spec.tsx
@@ -92,6 +92,22 @@ describe("Scalar", () => {
// as the ScalarValue component handles sizing to fit
expect(styles.textOverflow).not.toBe("ellipsis");
});
+
+ it("lets Unicode subscript descenders render past the line box (metabase#72443)", () => {
+ render(
+ <Scalar
+ {...mockedProps}
+ series={series(344)}
+ rawSeries={series(344)}
+ settings={settings}
+ visualizationIsClickable={() => false}
+ width={230}
+ />,
+ );
+ expect(screen.getByTestId("scalar-container")).toHaveStyle({
+ overflowY: "visible",
+ });
+ });
});
describe("scalar viz settings", () => {
diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/PreviousValueComparison.module.css b/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/PreviousValueComparison.module.css
new file mode 100644
index 00000000000..d9dd9b21247
--- /dev/null
+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/PreviousValueComparison.module.css
@@ -0,0 +1,5 @@
+.variationIcon {
+ display: flex;
+ align-items: center;
+ flex: 0 0 auto;
+}
diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/PreviousValueComparison.styled.tsx b/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/PreviousValueComparison.styled.tsx
deleted file mode 100644
index 29b6f5c872f..00000000000
--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/PreviousValueComparison.styled.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import styled from "@emotion/styled";
-
-import { Ellipsified, Icon } from "metabase/ui";
-
-export const VariationIcon = styled(Icon)`
- display: flex;
- align-items: center;
- flex: 0 0 auto;
- margin-right: var(--mantine-spacing-sm);
-`;
-
-export const VariationValue = styled(Ellipsified)`
- font-weight: 900;
-`;
diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/VariationPercent.tsx b/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/VariationPercent.tsx
index c9287c2cb1a..29a0bb9663a 100644
--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/VariationPercent.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/VariationPercent.tsx
@@ -1,14 +1,11 @@
import type { ReactNode } from "react";
-import { Flex } from "metabase/ui";
+import { Ellipsified, Flex, Icon } from "metabase/ui";
import type { ColorName } from "metabase/ui/colors/types";
import type { ComparisonResult } from "../compute";
-import {
- VariationIcon,
- VariationValue,
-} from "./PreviousValueComparison.styled";
+import S from "./PreviousValueComparison.module.css";
interface Props {
children: ReactNode;
@@ -28,10 +25,17 @@ export const VariationPercent = ({
return (
<Flex align="center" maw="100%" style={{ color: changeColor ?? color }}>
{changeArrowIconName && (
- <VariationIcon name={changeArrowIconName} size={iconSize} />
+ <Icon
+ name={changeArrowIconName}
+ size={iconSize}
+ mr="sm"
+ className={S.variationIcon}
+ />
)}
- <VariationValue showTooltip={false}>{children}</VariationValue>
+ <Ellipsified fw={900} showTooltip={false}>
+ {children}
+ </Ellipsified>
</Flex>
);
};