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
UXW-46 In Safari Scalar is truncated like a string rather than a number (#67207)
github-actions[bot]04d68a6a41e1
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.pngindex 68e4dedb21e..edcda06d510 100644Binary 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 differdiff --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.pngindex 20051a0f736..1e43f4030b5 100644Binary 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 differdiff --git a/.loki/reference/chrome_laptop_viz_BarChart_Default.png b/.loki/reference/chrome_laptop_viz_BarChart_Default.pngnew file mode 100644index 00000000000..6e7a4c4d8bdBinary files /dev/null and b/.loki/reference/chrome_laptop_viz_BarChart_Default.png differdiff --git a/.loki/reference/chrome_laptop_viz_SmartScalar_Default.png b/.loki/reference/chrome_laptop_viz_SmartScalar_Default.pngindex 805bb992045..de13986bab3 100644Binary files a/.loki/reference/chrome_laptop_viz_SmartScalar_Default.png and b/.loki/reference/chrome_laptop_viz_SmartScalar_Default.png differdiff --git a/e2e/test/scenarios/dashboard-cards/dashboard-card-reproductions.cy.spec.js b/e2e/test/scenarios/dashboard-cards/dashboard-card-reproductions.cy.spec.jsindex c7e8e2fe480..0218f59ef53 100644--- a/e2e/test/scenarios/dashboard-cards/dashboard-card-reproductions.cy.spec.js+++ b/e2e/test/scenarios/dashboard-cards/dashboard-card-reproductions.cy.spec.js@@ -775,7 +775,7 @@ describe("issue 29304", () => {// This extra 1ms is crucial, without this the test would fail.cy.tick(WAIT_TIME + 1);- const expectedWidth = 130;+ const expectedWidth = 109;cy.findByTestId("scalar-value").should(([$scalarValue]) => {expect($scalarValue.offsetWidth).to.be.closeTo(expectedWidth,@@ -800,7 +800,7 @@ describe("issue 29304", () => {// This extra 1ms is crucial, without this the test would fail.cy.tick(WAIT_TIME + 1);- const expectedWidth = 47;+ const expectedWidth = 61;cy.findByTestId("scalar-value").should(([$scalarValue]) => {expect($scalarValue.offsetWidth).to.be.closeTo(expectedWidth,diff --git a/frontend/src/metabase/visualizations/components/ScalarValue/ScalarValue.tsx b/frontend/src/metabase/visualizations/components/ScalarValue/ScalarValue.tsxindex 3f267396e51..09d3b16e8a4 100644--- a/frontend/src/metabase/visualizations/components/ScalarValue/ScalarValue.tsx+++ b/frontend/src/metabase/visualizations/components/ScalarValue/ScalarValue.tsx@@ -49,7 +49,7 @@ export const ScalarValue = ({targetWidth: width,fontFamily: fontFamily ?? "Lato",fontWeight: 700,- unit: "rem",+ unit: "em",step: 0.2,min: 1,max: gridSizediff --git a/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.styled.tsx b/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.styled.tsxdeleted file mode 100644index e9f14862f05..00000000000--- a/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.styled.tsx+++ /dev/null@@ -1,28 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import { css } from "@emotion/react";-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import { Ellipsified } from "metabase/common/components/Ellipsified";--interface ScalarContainerProps {- isClickable: boolean;-}--export const ScalarContainer = styled(Ellipsified, {- shouldForwardProp: (prop) => prop !== "isClickable",-})<ScalarContainerProps>`- padding: 0 var(--mantine-spacing-sm);- max-width: 100%;- box-sizing: border-box;-- ${({ isClickable }) =>- isClickable &&- css`- cursor: pointer;-- &:hover {- color: var(--mb-color-brand);- }- `}-`;diff --git a/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.tsx b/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.tsxindex a399989f455..1d5f049dc74 100644--- a/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.tsx+++ b/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.tsx@@ -23,7 +23,7 @@ import type {import { BarChart } from "metabase/visualizations/visualizations/BarChart";import type { DatasetColumn, DatasetData } from "metabase-types/api/dataset";-import { ScalarContainer } from "./Scalar.styled";+import { ScalarValueContainer } from "./ScalarValueContainer";import { scalarToBarTransform } from "./scalars-bar-transform";const PADDING = 32;@@ -206,9 +206,8 @@ export class Scalar extends Component<return (<ScalarWrapper>- <ScalarContainer+ <ScalarValueContainerclassName={DashboardS.fullscreenNormalText}- data-testid="scalar-container"tooltip={fullScalarValue}alwaysShowTooltip={fullScalarValue !== displayValue}isClickable={isClickable}@@ -223,7 +222,7 @@ export class Scalar extends Component<width={Math.max(width - PADDING, 0)}/></span>- </ScalarContainer>+ </ScalarValueContainer></ScalarWrapper>);}diff --git a/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.unit.spec.tsx b/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.unit.spec.tsxindex d7dd9cfcfbb..eff8c1da31d 100644--- a/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.unit.spec.tsx+++ b/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.unit.spec.tsx@@ -65,4 +65,22 @@ describe("Scalar", () => {);expect(screen.getByText("null")).toBeInTheDocument();});++ it("should not apply text-overflow ellipsis to the container", () => {+ render(+ <Scalar+ {...mockedProps}+ series={series(1234567)}+ rawSeries={series(1234567)}+ settings={settings}+ visualizationIsClickable={() => false}+ width={230}+ />,+ );+ const container = screen.getByTestId("scalar-container");+ const styles = window.getComputedStyle(container);+ // The container should not have text-overflow: ellipsis+ // as the ScalarValue component handles sizing to fit+ expect(styles.textOverflow).not.toBe("ellipsis");+ });});diff --git a/frontend/src/metabase/visualizations/visualizations/Scalar/ScalarValueContainer.module.css b/frontend/src/metabase/visualizations/visualizations/Scalar/ScalarValueContainer.module.cssnew file mode 100644index 00000000000..bb3427a1ccb--- /dev/null+++ b/frontend/src/metabase/visualizations/visualizations/Scalar/ScalarValueContainer.module.css@@ -0,0 +1,13 @@+.container {+ padding: 0 var(--mantine-spacing-sm);+ max-width: 100%;+ box-sizing: border-box;+}++.clickable {+ cursor: pointer;++ &:hover {+ color: var(--mb-color-brand);+ }+}diff --git a/frontend/src/metabase/visualizations/visualizations/Scalar/ScalarValueContainer.tsx b/frontend/src/metabase/visualizations/visualizations/Scalar/ScalarValueContainer.tsxnew file mode 100644index 00000000000..a32a6d005ec--- /dev/null+++ b/frontend/src/metabase/visualizations/visualizations/Scalar/ScalarValueContainer.tsx@@ -0,0 +1,33 @@+import cx from "classnames";+import type { ReactNode } from "react";++import { Ellipsified } from "metabase/common/components/Ellipsified";++import S from "./ScalarValueContainer.module.css";++interface ScalarContainerWrapperProps {+ tooltip?: ReactNode;+ alwaysShowTooltip?: boolean;+ isClickable: boolean;+ children?: ReactNode;+ className?: string;+}++export const ScalarValueContainer = ({+ tooltip,+ alwaysShowTooltip,+ children,+ isClickable,+ className,+}: ScalarContainerWrapperProps) => {+ return (+ <Ellipsified+ className={cx(className, S.container, isClickable && S.clickable)}+ tooltip={tooltip}+ alwaysShowTooltip={alwaysShowTooltip}+ data-testid="scalar-container"+ >+ {children}+ </Ellipsified>+ );+};diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SmartScalar.tsx b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SmartScalar.tsxindex 8720ea573ed..8df524c36c3 100644--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SmartScalar.tsx+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SmartScalar.tsx@@ -22,7 +22,7 @@ import type {VisualizationProps,} from "metabase/visualizations/types";-import { ScalarContainer } from "../Scalar/Scalar.styled";+import { ScalarValueContainer } from "../Scalar/ScalarValueContainer";import { PreviousValueComparison } from "./PreviousValueComparison";import { ScalarPeriod } from "./ScalarPeriod";@@ -113,9 +113,8 @@ export function SmartScalar({return (<ScalarWrapper>- <ScalarContainer+ <ScalarValueContainerclassName={DashboardS.fullscreenNormalText}- data-testid="scalar-container"tooltip={fullScalarValue}alwaysShowTooltip={fullScalarValue !== displayValue}isClickable={isClickable}@@ -130,7 +129,7 @@ export function SmartScalar({width={getValueWidth(width)}/></span>- </ScalarContainer>+ </ScalarValueContainer>{isPeriodVisible(innerHeight) && <ScalarPeriod period={display.date} />}{comparisonsCount === 1 && (