diff --git a/packages/grafana-ui/src/components/TimeSeries/utils.ts b/packages/grafana-ui/src/components/TimeSeries/utils.ts index bcb779194d7..9d2d373b33d 100644 --- a/packages/grafana-ui/src/components/TimeSeries/utils.ts +++ b/packages/grafana-ui/src/components/TimeSeries/utils.ts @@ -297,7 +297,7 @@ export const preparePlotConfigBuilder: UPlotConfigPrepFn<{ const axisDisplayOptions = { border: { show: customConfig.axisBorderShow || false, - width: 1, + width: 1 / devicePixelRatio, stroke: axisColor || theme.colors.text.primary, }, ticks: { diff --git a/packages/grafana-ui/src/components/uPlot/config/UPlotAxisBuilder.ts b/packages/grafana-ui/src/components/uPlot/config/UPlotAxisBuilder.ts index 22f6f43f0de..f446d8129a0 100644 --- a/packages/grafana-ui/src/components/uPlot/config/UPlotAxisBuilder.ts +++ b/packages/grafana-ui/src/components/uPlot/config/UPlotAxisBuilder.ts @@ -163,7 +163,7 @@ export class UPlotAxisBuilder extends PlotConfigBuilder { ticks: Object.assign( { show: true, - stroke: gridColor, + stroke: border?.show ? color ?? theme.colors.text.primary : gridColor, width: 1 / devicePixelRatio, size: 4, }, diff --git a/public/app/plugins/panel/barchart/utils.ts b/public/app/plugins/panel/barchart/utils.ts index 12ffde2be58..a144caa256a 100644 --- a/public/app/plugins/panel/barchart/utils.ts +++ b/public/app/plugins/panel/barchart/utils.ts @@ -16,6 +16,7 @@ import { } from '@grafana/data'; import { maybeSortFrame } from '@grafana/data/src/transformations/transformers/joinDataFrames'; import { + AxisColorMode, AxisPlacement, GraphTransform, GraphTresholdsStyleMode, @@ -26,6 +27,7 @@ import { VizLegendOptions, } from '@grafana/schema'; import { FIXED_UNIT, measureText, UPlotConfigBuilder, UPlotConfigPrepFn, UPLOT_AXIS_FONT_SIZE } from '@grafana/ui'; +import { AxisProps } from '@grafana/ui/src/components/uPlot/config/UPlotAxisBuilder'; import { getStackingGroups } from '@grafana/ui/src/components/uPlot/utils'; import { findField } from 'app/features/dimensions'; @@ -256,6 +258,7 @@ export const preparePlotConfigBuilder: UPlotConfigPrepFn = ({ max: field.config.max, softMin, softMax, + centeredZero: customConfig.axisCenteredZero, orientation: vizOrientation.yOri, direction: vizOrientation.yDir, distribution: customConfig.scaleDistribution?.type, @@ -276,7 +279,7 @@ export const preparePlotConfigBuilder: UPlotConfigPrepFn = ({ } } - builder.addAxis({ + let axisOpts: AxisProps = { scaleKey, label: customConfig.axisLabel, size: customConfig.axisWidth, @@ -286,7 +289,19 @@ export const preparePlotConfigBuilder: UPlotConfigPrepFn = ({ tickLabelRotation: vizOrientation.xOri === 1 ? xTickLabelRotation * -1 : 0, theme, grid: { show: customConfig.axisGridShow }, - }); + }; + + if (customConfig.axisBorderShow) { + axisOpts.border = { + show: true, + }; + } + + if (customConfig.axisColorMode === AxisColorMode.Series) { + axisOpts.color = seriesColor; + } + + builder.addAxis(axisOpts); } }