IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

GraphNG: fix y axis autosizing (#37464)

Browse Source
This commit is contained in:
Leon Sorokin 2021-08-03 08:18:05 -05:00 committed by GitHub
parent 75c8bd26fc
commit 0d2cd90150
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/grafana-ui/src/components/uPlot/config/UPlotAxisBuilder.ts
View File

@ -71,7 +71,6 @@ export class UPlotAxisBuilder extends PlotConfigBuilder<AxisProps, Axis> {
size: this.props.size ?? calculateAxisSize, size: this.props.size ?? calculateAxisSize,
gap, gap,
// @ts-ignore (TODO: remove once uPlot adds this in 1.6.15)
labelGap: 0, labelGap: 0,
grid: { grid: {
@ -94,7 +93,6 @@ export class UPlotAxisBuilder extends PlotConfigBuilder<AxisProps, Axis> {
config.label = label; config.label = label;
config.labelSize = fontSize + labelPad; config.labelSize = fontSize + labelPad;
config.labelFont = font; config.labelFont = font;
// @ts-ignore (TODO: remove once uPlot adds this in 1.6.15)
config.labelGap = labelPad; config.labelGap = labelPad;
} }
@ -146,8 +144,7 @@ function calculateAxisSize(self: uPlot, values: string[], axisIdx: number) {
axisSize += axis!.gap! + fontSize; axisSize += axis!.gap! + fontSize;
} else if (values?.length) { } else if (values?.length) {
let longestValue = values.reduce((acc, value) => (value.length > acc.length ? value : acc), ''); let longestValue = values.reduce((acc, value) => (value.length > acc.length ? value : acc), '');
// @ts-ignore (TODO: remove axis!.labelGap! once uPlot adds this in 1.6.15) axisSize += axis!.gap! + axis!.labelGap! + measureText('0'.repeat(longestValue.length), fontSize).width;
axisSize += axis!.gap! + axis!.labelGap! + measureText(longestValue, fontSize).width;
} }
return Math.ceil(axisSize); return Math.ceil(axisSize);