@gitlab/ui 126.3.3 → 126.3.4

package/dist/components/charts/shared/tooltip/tooltip.js

@@ -3,7 +3,7 @@ import { uid, debounceByAnimationFrame } from '../../../../utils/utils';
 import GlPopover from '../../../base/popover/popover';
 import { popoverPlacements } from '../../../../utils/constants';
 import { TOOLTIP_LEFT_OFFSET, TOOLTIP_TOP_OFFSET } from '../../../../utils/charts/constants';
-import { getTooltipAxisConfig, getTooltipTitle, getTooltipContent } from '../../../../utils/charts/config';
+import { getTooltipAxisConfig, getTooltipTitle, getTooltipContent, getTooltipParams } from '../../../../utils/charts/config';
 import TooltipDefaultFormat from './tooltip_default_format/tooltip_default_format';
 import __vue_normalize__ from 'vue-runtime-helpers/dist/normalize-component.js';
 
@@ -239,7 +239,7 @@ var script = {
                 const valueAxisName = (_options$valueAxis = options[valueAxis]) === null || _options$valueAxis === void 0 ? void 0 : (_options$valueAxis$ = _options$valueAxis[0]) === null || _options$valueAxis$ === void 0 ? void 0 : _options$valueAxis$.name;
                 this.title = getTooltipTitle(params, titleAxisName, dimensionIndex);
                 this.content = getTooltipContent(params, valueAxisName, metricIndex);
-                this.params = params;
+                this.params = getTooltipParams(params, options);
               }
             }
           }

package/dist/components/charts/stacked_column/stacked_column.js

@@ -1,4 +1,5 @@
 import merge from 'lodash/merge';
+import groupBy from 'lodash/groupBy';
 import { yAxis, generateBarSeries, generateLineSeries, gridWithSecondaryYAxis, grid, defaultChartOptions, dataZoomAdjustments, mergeSeriesToOptions } from '../../../utils/charts/config';
 import { LEGEND_AVERAGE_TEXT, LEGEND_MAX_TEXT, LEGEND_MIN_TEXT, LEGEND_CURRENT_TEXT, LEGEND_LAYOUT_INLINE, LEGEND_LAYOUT_TABLE, CHART_DEFAULT_SERIES_STACK, CHART_DEFAULT_SERIES_SECONDARY_STACK, CHART_TYPE_LINE, HEIGHT_AUTO_CLASSES } from '../../../utils/charts/constants';
 import { colorFromDefaultPalette } from '../../../utils/charts/theme';
@@ -303,16 +304,26 @@ var script = {
         params
       } = _ref5;
       if (!params) return {};
-      const tooltipContentEntries = params.seriesData.toSorted((a, b) => b.seriesIndex - a.seriesIndex) // Invert stacking order so it matches chart (see https://github.com/apache/echarts/issues/14700)
-      .map(_ref6 => {
+
+      // Group by stack and invert order within so it matches `stacked` presentation (see https://github.com/apache/echarts/issues/14700).
+      const seriesDataGroupedByStack = groupBy(params.seriesData, _ref6 => {
+        let {
+          stack,
+          seriesIndex
+        } = _ref6;
+        return stack !== null && stack !== void 0 ? stack : seriesIndex;
+      });
+      const sortedSeriesData = Object.values(seriesDataGroupedByStack).flatMap(seriesDataStack => seriesDataStack.toSorted((a, b) => b.seriesIndex - a.seriesIndex));
+      const tooltipContentEntries = sortedSeriesData.map(_ref7 => {
         let {
           seriesName = '',
           value,
-          borderColor
-        } = _ref6;
+          borderColor,
+          color
+        } = _ref7;
         return [seriesName, {
           value,
-          color: borderColor
+          color: borderColor !== null && borderColor !== void 0 ? borderColor : color
         }];
       });
       return Object.fromEntries(tooltipContentEntries);