@gravity-ui/chartkit 5.19.2 → 5.20.0

package/build/plugins/yagr/renderer/tooltip/renderTooltip.js

@@ -7,25 +7,9 @@ const calcOption = (d) => {
         })
         : d;
 };
-const getSeriesColorProperty = (args) => {
-    var _a;
-    const { data, userData, row, rowIndex } = args;
-    const userSeries = userData.graphs[rowIndex];
-    const lineColor = (_a = data.yagr.getSeriesById(row.id)) === null || _a === void 0 ? void 0 : _a.lineColor;
-    let seriesColor = row.color;
-    switch (userSeries === null || userSeries === void 0 ? void 0 : userSeries.legendColorKey) {
-        case 'lineColor': {
-            if (lineColor) {
-                seriesColor = lineColor;
-            }
-            break;
-        }
-        case 'color':
-        default: {
-            seriesColor = row.color;
-        }
-    }
-    return seriesColor;
+const getSeriesColorProperty = ({ data, rowId }) => {
+    const series = data.yagr.getSeriesById(rowId);
+    return data.yagr.getSerieLegendColor(series);
 };
 /*
  * Default tooltip renderer.
@@ -62,7 +46,7 @@ export const getRenderTooltip = (userData) => (data) => {
         activeRowAlwaysFirstInTooltip: rows.length > 1,
         tooltipHeader: dateTime({ input: x / timeMultiplier, timeZone }).format('DD MMMM YYYY HH:mm:ss'),
         shared: true,
-        lines: rows.map((row, i) => (Object.assign(Object.assign({}, row), { seriesName: row.name || 'Serie ' + (i + 1), seriesColor: getSeriesColorProperty({ data, userData, row, rowIndex: i }), selectedSeries: row.active, seriesIdx: row.seriesIdx, percentValue: typeof row.transformed === 'number' ? row.transformed.toFixed(1) : '' }))),
+        lines: rows.map((row, i) => (Object.assign(Object.assign({}, row), { seriesName: row.name || 'Serie ' + (i + 1), seriesColor: getSeriesColorProperty({ data, rowId: row.id }), selectedSeries: row.active, seriesIdx: row.seriesIdx, percentValue: typeof row.transformed === 'number' ? row.transformed.toFixed(1) : '' }))),
         withPercent: calcOption(opts.percent),
         hiddenRowsNumber: hiddenRowsNumber,
         hiddenRowsSum,

package/build/plugins/yagr/types.d.ts

@@ -1,4 +1,4 @@
-import type { MinimalValidConfig, RawSerieData, SeriesOptions, YagrConfig } from '@gravity-ui/yagr';
+import type { MinimalValidConfig, RawSerieData, YagrConfig } from '@gravity-ui/yagr';
 import type Yagr from '@gravity-ui/yagr';
 import { ChartKitProps } from 'src/types';
 export type { default as Yagr } from '@gravity-ui/yagr';
@@ -10,19 +10,9 @@ export interface CustomTooltipProps {
 export type YagrWidgetProps = ChartKitProps<'yagr'> & {
     id: string;
 };
-export type YagrSeriesData<T = Omit<SeriesOptions, 'type'>> = RawSerieData<T> & {
-    /**
-     * Determines what data value should be used to get a color for tooltip series. Does not work in case of using custom tooltip rendered via `tooltip` property.
-     * - `lineColor` indicates that lineColor property should be used
-     * - `color` indicates that color property should be used
-     *
-     * @default 'color'
-     */
-    legendColorKey?: 'color' | 'lineColor';
-};
 export type YagrWidgetData = {
     data: {
-        graphs: YagrSeriesData[];
+        graphs: RawSerieData[];
         timeline: number[];
         /**
          * Allow to setup timezone for X axis and tooltip's header.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/chartkit",
-  "version": "5.19.2",
+  "version": "5.20.0",
   "description": "React component used to render charts based on any sources you need",
   "license": "MIT",
   "repository": "git@github.com:gravity-ui/ChartKit.git",
@@ -50,7 +50,7 @@
     "@gravity-ui/charts": "^0.5.0",
     "@gravity-ui/date-utils": "^2.1.0",
     "@gravity-ui/i18n": "^1.0.0",
-    "@gravity-ui/yagr": "^4.4.0",
+    "@gravity-ui/yagr": "^4.5.0",
     "afterframe": "^1.0.2",
     "lodash": "^4.17.21",
     "tslib": "^2.6.2"