diff --git a/devenv/dev-dashboards/datasource-testdata/new_features_in_v74.json b/devenv/dev-dashboards/datasource-testdata/new_features_in_v74.json index ba4191924cf..3e8af852650 100644 --- a/devenv/dev-dashboards/datasource-testdata/new_features_in_v74.json +++ b/devenv/dev-dashboards/datasource-testdata/new_features_in_v74.json @@ -1991,7 +1991,7 @@ "axisLabel": "", "axisPlacement": "auto", "drawStyle": "line", - "fillOpacity": 29, + "fillOpacity": 0, "gradientMode": { "label": "None", "value": "none" diff --git a/devenv/dev-dashboards/panel-graph/graph-ng.json b/devenv/dev-dashboards/panel-graph/graph-ng.json index 2f84a3d6860..c2c39ca6659 100644 --- a/devenv/dev-dashboards/panel-graph/graph-ng.json +++ b/devenv/dev-dashboards/panel-graph/graph-ng.json @@ -1346,7 +1346,7 @@ "axisPlacement": "auto", "drawStyle": "line", "fillGradient": "hue", - "fillOpacity": 25, + "fillOpacity": 0, "hideFrom": { "graph": false, "legend": false, diff --git a/packages/grafana-ui/src/components/TimeSeries/utils.ts b/packages/grafana-ui/src/components/TimeSeries/utils.ts index 531e4312f02..500c357a5ad 100644 --- a/packages/grafana-ui/src/components/TimeSeries/utils.ts +++ b/packages/grafana-ui/src/components/TimeSeries/utils.ts @@ -307,7 +307,6 @@ export const preparePlotConfigBuilder: UPlotConfigPrepFn<{ sync: DashboardCursor } if (stackingGroups.size !== 0) { - builder.setStacking(true); for (const [_, seriesIds] of stackingGroups.entries()) { const seriesIdxs = orderIdsByCalcs({ ids: seriesIds, legend, frame }); for (let j = seriesIdxs.length - 1; j > 0; j--) { diff --git a/packages/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.test.ts b/packages/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.test.ts index f409f93e483..9d432d46cde 100644 --- a/packages/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.test.ts +++ b/packages/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.test.ts @@ -548,7 +548,6 @@ describe('UPlotConfigBuilder', () => { describe('Stacking', () => { it('allows stacking config', () => { const builder = new UPlotConfigBuilder(); - builder.setStacking(); builder.addSeries({ drawStyle: GraphDrawStyle.Line, scaleKey: 'scale-x', diff --git a/packages/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.ts b/packages/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.ts index f67f97b1575..b62fcf9bfe8 100644 --- a/packages/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.ts +++ b/packages/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.ts @@ -40,7 +40,6 @@ export class UPlotConfigBuilder { private scales: UPlotScaleBuilder[] = []; private bands: Band[] = []; private cursor: Cursor | undefined; - private isStacking = false; private select: uPlot.Select | undefined; private hasLeftAxis = false; private hooks: Hooks.Arrays = {}; @@ -122,10 +121,6 @@ export class UPlotConfigBuilder { this.select = select; } - setStacking(enabled = true) { - this.isStacking = enabled; - } - addSeries(props: SeriesProps) { this.series.push(new UPlotSeriesBuilder(props)); } @@ -224,24 +219,8 @@ export class UPlotConfigBuilder { config.tzDate = this.tzDate; config.padding = this.padding; - if (this.isStacking) { - // Let uPlot handle bands and fills + if (this.bands.length) { config.bands = this.bands; - } else { - // When fillBelowTo option enabled, handle series bands fill manually - if (this.bands?.length) { - config.bands = this.bands; - const killFill = new Set(); - for (const b of config.bands) { - killFill.add(b.series[1]); - } - - for (let i = 1; i < config.series.length; i++) { - if (killFill.has(i)) { - config.series[i].fill = undefined; - } - } - } } return config; diff --git a/public/app/plugins/panel/barchart/utils.ts b/public/app/plugins/panel/barchart/utils.ts index a3ffd2448a9..a3f0cf22360 100644 --- a/public/app/plugins/panel/barchart/utils.ts +++ b/public/app/plugins/panel/barchart/utils.ts @@ -213,7 +213,6 @@ export const preparePlotConfigBuilder: UPlotConfigPrepFn = ({ } if (stackingGroups.size !== 0) { - builder.setStacking(true); for (const [_, seriesIds] of stackingGroups.entries()) { const seriesIdxs = orderIdsByCalcs({ ids: seriesIds, legend, frame }); for (let j = seriesIdxs.length - 1; j > 0; j--) {