Skip to content

Commit 4ee69f9

Browse files
Accept suggestion
1 parent 249ca01 commit 4ee69f9

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

packages/x-charts/src/internals/defaultValueFormatters.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
import { AxisValueFormatterContext, ContinuousScaleName } from '../models/axis';
2-
3-
const numberFormatter = new Intl.NumberFormat(undefined, { maximumSignificantDigits: 2 });
1+
import { AxisValueFormatterContext, ContinuousScaleName, D3ContinuousScale } from '../models/axis';
42

53
/**
64
* Creates a default formatter function for continuous scales (e.g., linear, sqrt, log).
75
* @returns A formatter function for continuous values.
86
*/
9-
export function createScalarFormatter(tickNumber: number) {
7+
export function createScalarFormatter(tickNumber: number, zoomScale: D3ContinuousScale) {
108
return function defaultScalarValueFormatter<S extends ContinuousScaleName = ContinuousScaleName>(
119
value: any,
1210
context: AxisValueFormatterContext<S>,
@@ -15,8 +13,8 @@ export function createScalarFormatter(tickNumber: number) {
1513
return context.scale.tickFormat(tickNumber)(value);
1614
}
1715

18-
if (context.location === 'zoom-slider-tooltip' && typeof value === 'number') {
19-
return numberFormatter.format(value);
16+
if (context.location === 'zoom-slider-tooltip') {
17+
return zoomScale.tickFormat(2)(value);
2018
}
2119

2220
return `${value}`;

packages/x-charts/src/internals/plugins/featurePlugins/useChartCartesianAxis/computeAxisValue.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,14 @@ export function computeAxisValue<T extends ChartSeriesType>({
212212
colorScale: axis.colorMap && getColorScale(axis.colorMap),
213213
valueFormatter:
214214
axis.valueFormatter ??
215-
(createScalarFormatter(tickNumber) as <TScaleName extends ScaleName>(
215+
(createScalarFormatter(
216+
tickNumber,
217+
getScale(
218+
scaleType,
219+
range.map((v) => scale.invert(v)),
220+
range,
221+
),
222+
) as <TScaleName extends ScaleName>(
216223
value: any,
217224
context: AxisValueFormatterContext<TScaleName>,
218225
) => string),

0 commit comments

Comments
 (0)