Skip to content

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

Clean up `metabase/utils/text-measurer` (#72619)

Romeo Van Snick2b9a4b6f9e42
diff --git a/frontend/src/metabase/common/components/Schedule/AutoWidthSelect.tsx b/frontend/src/metabase/common/components/Schedule/AutoWidthSelect.tsx
index f33b2e9d42c..69265da3fec 100644
--- a/frontend/src/metabase/common/components/Schedule/AutoWidthSelect.tsx
+++ b/frontend/src/metabase/common/components/Schedule/AutoWidthSelect.tsx
@@ -3,8 +3,8 @@ import { useMemo } from "react";
import { getSetting } from "metabase/selectors/settings";
import type { SelectProps } from "metabase/ui";
import { Select } from "metabase/ui";
+import type { FontStyle } from "metabase/utils/measure-text";
import { useSelector } from "metabase/utils/redux";
-import type { FontStyle } from "metabase/visualizations/shared/types/measure-text";
import { getLongestSelectLabel, measureTextWidthSafely } from "./utils";
diff --git a/frontend/src/metabase/common/components/Schedule/utils.tsx b/frontend/src/metabase/common/components/Schedule/utils.tsx
index db3c66fbeac..c9ae31e2103 100644
--- a/frontend/src/metabase/common/components/Schedule/utils.tsx
+++ b/frontend/src/metabase/common/components/Schedule/utils.tsx
@@ -3,8 +3,8 @@ import { match } from "ts-pattern";
import _ from "underscore";
import type { SelectProps } from "metabase/ui";
+import type { FontStyle } from "metabase/utils/measure-text";
import { measureTextWidth } from "metabase/utils/measure-text";
-import type { FontStyle } from "metabase/visualizations/shared/types/measure-text";
import type { ScheduleSettings } from "metabase-types/api";
import { defaultDay, defaultHour } from "./constants";
diff --git a/frontend/src/metabase/static-viz/components/FunnelChart/utils/funnel.ts b/frontend/src/metabase/static-viz/components/FunnelChart/utils/funnel.ts
index c47e596b6f9..046c1206553 100644
--- a/frontend/src/metabase/static-viz/components/FunnelChart/utils/funnel.ts
+++ b/frontend/src/metabase/static-viz/components/FunnelChart/utils/funnel.ts
@@ -3,9 +3,9 @@ import type { PolygonProps } from "@visx/shape/lib/shapes/Polygon";
import { CHAR_SIZES_FONT_WEIGHT } from "metabase/static-viz/constants/char-sizes";
import { formatNumber, formatPercent } from "metabase/static-viz/lib/numbers";
import { measureTextWidth } from "metabase/static-viz/lib/text";
+import type { TextWidthMeasurer } from "metabase/utils/measure-text";
import { isNotNull } from "metabase/utils/types";
import { truncateText } from "metabase/visualizations/lib/text";
-import type { TextWidthMeasurer } from "metabase/visualizations/shared/types/measure-text";
import type { FunnelDatum, FunnelSettings, FunnelStep, Step } from "../types";
diff --git a/frontend/src/metabase/static-viz/components/RowChart/RowChart.tsx b/frontend/src/metabase/static-viz/components/RowChart/RowChart.tsx
index df86f220cae..6a3649198de 100644
--- a/frontend/src/metabase/static-viz/components/RowChart/RowChart.tsx
+++ b/frontend/src/metabase/static-viz/components/RowChart/RowChart.tsx
@@ -2,14 +2,11 @@ import { Group } from "@visx/group";
import type { StaticChartProps } from "metabase/static-viz/components/StaticVisualization";
import { measureTextWidth } from "metabase/static-viz/lib/text";
+import type { FontStyle, TextWidthMeasurer } from "metabase/utils/measure-text";
import { extractRemappedColumns } from "metabase/visualizations";
import { getChartGoal } from "metabase/visualizations/lib/settings/goal";
import { getStackOffset } from "metabase/visualizations/lib/settings/stacking";
import { RowChart } from "metabase/visualizations/shared/components/RowChart";
-import type {
- FontStyle,
- TextWidthMeasurer,
-} from "metabase/visualizations/shared/types/measure-text";
import {
getGroupedDataset,
trimData,
diff --git a/frontend/src/metabase/utils/measure-text.ts b/frontend/src/metabase/utils/measure-text.ts
index 66f4c6e93f7..bb8a94593d2 100644
--- a/frontend/src/metabase/utils/measure-text.ts
+++ b/frontend/src/metabase/utils/measure-text.ts
@@ -1,9 +1,27 @@
import _ from "underscore";
-import type {
- FontStyle,
- TextMeasurer,
-} from "metabase/visualizations/shared/types/measure-text";
+export type FontStyle = {
+ size: string | number;
+ family: string;
+ weight: string | number;
+};
+
+export interface TextSize {
+ width: number;
+ height: number;
+}
+
+export type TextWidthMeasurer = (
+ text: string,
+ style: FontStyle,
+) => TextSize["width"];
+
+export type TextHeightMeasurer = (
+ text: string,
+ style: FontStyle,
+) => TextSize["height"];
+
+export type TextMeasurer = (text: string, style: FontStyle) => TextSize;
let canvas: HTMLCanvasElement | null = null;
diff --git a/frontend/src/metabase/visualizations/components/ScalarValue/utils.unit.spec.ts b/frontend/src/metabase/visualizations/components/ScalarValue/utils.unit.spec.ts
index e4a3235840c..240516093fd 100644
--- a/frontend/src/metabase/visualizations/components/ScalarValue/utils.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/components/ScalarValue/utils.unit.spec.ts
@@ -1,5 +1,5 @@
+import type { FontStyle } from "metabase/utils/measure-text";
import * as measureText from "metabase/utils/measure-text";
-import type { FontStyle } from "metabase/visualizations/shared/types/measure-text";
import { findSize } from "./utils";
diff --git a/frontend/src/metabase/visualizations/lib/text.ts b/frontend/src/metabase/visualizations/lib/text.ts
index ddf8d81f654..02fb762b7e8 100644
--- a/frontend/src/metabase/visualizations/lib/text.ts
+++ b/frontend/src/metabase/visualizations/lib/text.ts
@@ -1,7 +1,4 @@
-import type {
- FontStyle,
- TextWidthMeasurer,
-} from "../shared/types/measure-text";
+import type { FontStyle, TextWidthMeasurer } from "metabase/utils/measure-text";
export const CHAR_ELLIPSES = "…";
diff --git a/frontend/src/metabase/visualizations/lib/text.unit.spec.ts b/frontend/src/metabase/visualizations/lib/text.unit.spec.ts
index a108b41e5c4..d6bae9efc9f 100644
--- a/frontend/src/metabase/visualizations/lib/text.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/lib/text.unit.spec.ts
@@ -1,7 +1,8 @@
import { measureTextWidth as measureStatic } from "metabase/static-viz/lib/text";
-import { measureTextWidth as measureDynamic } from "metabase/utils/measure-text";
-
-import type { TextWidthMeasurer } from "../shared/types/measure-text";
+import {
+ type TextWidthMeasurer,
+ measureTextWidth as measureDynamic,
+} from "metabase/utils/measure-text";
import { truncateText } from "./text";
diff --git a/frontend/src/metabase/visualizations/shared/components/RowChart/RowChart.tsx b/frontend/src/metabase/visualizations/shared/components/RowChart/RowChart.tsx
index 3bb4ac6007f..098ff490976 100644
--- a/frontend/src/metabase/visualizations/shared/components/RowChart/RowChart.tsx
+++ b/frontend/src/metabase/visualizations/shared/components/RowChart/RowChart.tsx
@@ -1,9 +1,9 @@
import type { NumberValue } from "d3-scale";
import { useMemo } from "react";
+import type { TextWidthMeasurer } from "metabase/utils/measure-text";
import type { HoveredData } from "metabase/visualizations/shared/types/events";
import type { ChartTicksFormatters } from "metabase/visualizations/shared/types/format";
-import type { TextWidthMeasurer } from "metabase/visualizations/shared/types/measure-text";
import type { SeriesInfo } from "../../types/data";
import type { ContinuousScaleType, Range } from "../../types/scale";
diff --git a/frontend/src/metabase/visualizations/shared/components/RowChart/utils/layout.ts b/frontend/src/metabase/visualizations/shared/components/RowChart/utils/layout.ts
index 18ffe94466b..f53b30093de 100644
--- a/frontend/src/metabase/visualizations/shared/components/RowChart/utils/layout.ts
+++ b/frontend/src/metabase/visualizations/shared/components/RowChart/utils/layout.ts
@@ -1,7 +1,7 @@
import type { ScaleContinuousNumeric } from "d3-scale";
+import type { TextWidthMeasurer } from "metabase/utils/measure-text";
import type { Margin } from "metabase/visualizations/shared/types/layout";
-import type { TextWidthMeasurer } from "metabase/visualizations/shared/types/measure-text";
import type { ChartGoal } from "metabase/visualizations/shared/types/settings";
import type {
ChartFont,
diff --git a/frontend/src/metabase/visualizations/shared/components/RowChart/utils/scale.ts b/frontend/src/metabase/visualizations/shared/components/RowChart/utils/scale.ts
index c2999fa2739..d90c337b4ea 100644
--- a/frontend/src/metabase/visualizations/shared/components/RowChart/utils/scale.ts
+++ b/frontend/src/metabase/visualizations/shared/components/RowChart/utils/scale.ts
@@ -2,8 +2,8 @@ import type { ContinuousDomain } from "@visx/scale";
import { scaleBand, scaleLinear, scaleLog, scalePower } from "@visx/scale";
import type { ScaleContinuousNumeric } from "d3-scale";
+import type { TextWidthMeasurer } from "metabase/utils/measure-text";
import type { ValueFormatter } from "metabase/visualizations/shared/types/format";
-import type { TextWidthMeasurer } from "metabase/visualizations/shared/types/measure-text";
import type {
ContinuousScaleType,
Range,
diff --git a/frontend/src/metabase/visualizations/shared/components/RowChart/utils/ticks.ts b/frontend/src/metabase/visualizations/shared/components/RowChart/utils/ticks.ts
index 301faa9fee8..bcf82440069 100644
--- a/frontend/src/metabase/visualizations/shared/components/RowChart/utils/ticks.ts
+++ b/frontend/src/metabase/visualizations/shared/components/RowChart/utils/ticks.ts
@@ -1,8 +1,8 @@
import type { ScaleContinuousNumeric } from "d3-scale";
import _ from "underscore";
+import type { TextWidthMeasurer } from "metabase/utils/measure-text";
import type { ValueFormatter } from "metabase/visualizations/shared/types/format";
-import type { TextWidthMeasurer } from "metabase/visualizations/shared/types/measure-text";
import type { ContinuousScaleType } from "metabase/visualizations/shared/types/scale";
import type { ChartFont } from "metabase/visualizations/shared/types/style";
diff --git a/frontend/src/metabase/visualizations/shared/components/RowChartView/RowChartView.tsx b/frontend/src/metabase/visualizations/shared/components/RowChartView/RowChartView.tsx
index 1700b2c5fd0..30f8977d493 100644
--- a/frontend/src/metabase/visualizations/shared/components/RowChartView/RowChartView.tsx
+++ b/frontend/src/metabase/visualizations/shared/components/RowChartView/RowChartView.tsx
@@ -9,10 +9,10 @@ import { Text } from "@visx/text";
import type { ScaleBand, ScaleContinuousNumeric } from "d3-scale";
import * as React from "react";
+import type { TextWidthMeasurer } from "metabase/utils/measure-text";
import { truncateText } from "metabase/visualizations/lib/text";
import type { HoveredData } from "metabase/visualizations/shared/types/events";
import type { Margin } from "metabase/visualizations/shared/types/layout";
-import type { TextWidthMeasurer } from "metabase/visualizations/shared/types/measure-text";
import type { SeriesInfo } from "../../types/data";
import type { BarData, RowChartTheme, SeriesData } from "../RowChart/types";
diff --git a/frontend/src/metabase/visualizations/shared/types/measure-text.ts b/frontend/src/metabase/visualizations/shared/types/measure-text.ts
deleted file mode 100644
index 721f6714be0..00000000000
--- a/frontend/src/metabase/visualizations/shared/types/measure-text.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-export type FontStyle = {
- size: string | number;
- family: string;
- weight: string | number;
-};
-
-export interface TextSize {
- width: number;
- height: number;
-}
-
-export type TextWidthMeasurer = (
- text: string,
- style: FontStyle,
-) => TextSize["width"];
-
-export type TextHeightMeasurer = (
- text: string,
- style: FontStyle,
-) => TextSize["height"];
-
-export type TextMeasurer = (text: string, style: FontStyle) => TextSize;
diff --git a/frontend/src/metabase/visualizations/types/visualization.ts b/frontend/src/metabase/visualizations/types/visualization.ts
index 80bbaefbb0a..92a71c67cc4 100644
--- a/frontend/src/metabase/visualizations/types/visualization.ts
+++ b/frontend/src/metabase/visualizations/types/visualization.ts
@@ -7,7 +7,7 @@ import type { OptionsType } from "metabase/utils/formatting/types";
import type {
TextHeightMeasurer,
TextWidthMeasurer,
-} from "metabase/visualizations/shared/types/measure-text";
+} from "metabase/utils/measure-text";
import type {
ClickActionModeGetter,
ClickActionsMode,
diff --git a/frontend/src/metabase/visualizations/visualizations/RowChart/RowChart.tsx b/frontend/src/metabase/visualizations/visualizations/RowChart/RowChart.tsx
index 6eaffe2d54a..270394bb0b6 100644
--- a/frontend/src/metabase/visualizations/visualizations/RowChart/RowChart.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/RowChart/RowChart.tsx
@@ -3,6 +3,7 @@ import { t } from "ttag";
import { ExplicitSize } from "metabase/common/components/ExplicitSize";
import CS from "metabase/css/core/index.css";
+import type { FontStyle } from "metabase/utils/measure-text";
import { measureTextWidth } from "metabase/utils/measure-text";
import { extractRemappedColumns } from "metabase/visualizations";
import {
@@ -29,7 +30,6 @@ import type {
SeriesInfo,
} from "metabase/visualizations/shared/types/data";
import type { HoveredData } from "metabase/visualizations/shared/types/events";
-import type { FontStyle } from "metabase/visualizations/shared/types/measure-text";
import {
getGroupedDataset,
getSeries,
diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/utils.unit.spec.ts b/frontend/src/metabase/visualizations/visualizations/SmartScalar/utils.unit.spec.ts
index c180eb2ed86..7cb9dfe03ea 100644
--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/utils.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/utils.unit.spec.ts
@@ -1,6 +1,6 @@
import { DateTimeColumn, NumberColumn } from "__support__/visualizations";
+import type { FontStyle } from "metabase/utils/measure-text";
import * as measureText from "metabase/utils/measure-text";
-import type { FontStyle } from "metabase/visualizations/shared/types/measure-text";
import type {
DatasetColumn,
DateTimeAbsoluteUnit,