From 65d4f00c8cdca85033ab8f17f7e27eb3f5e9598b Mon Sep 17 00:00:00 2001 From: Nick Grachev Date: Wed, 11 Nov 2026 11:58:38 +0300 Subject: [PATCH 1/2] feat(Yagr): add prepared point labels --- src/plugins/yagr/__stories__/Yagr.stories.tsx | 46 ++++ ...lot-boundaries-in-dar-1-chromium-linux.png | Bin 0 -> 8839 bytes ...stacked-column-labels-1-chromium-linux.png | Bin 0 -> 7680 bytes ...gative-stacked-column-1-chromium-linux.png | Bin 0 -> 5187 bytes .../labels/__tests__/label.visual.test.tsx | 246 ++++++++++++++++++ .../labels/__tests__/renderLabel.test.ts | 231 ++++++++++++++++ src/plugins/yagr/renderer/labels/index.ts | 1 + .../yagr/renderer/labels/renderLabels.ts | 116 +++++++++ src/plugins/yagr/renderer/utils.ts | 3 + src/plugins/yagr/types.ts | 7 +- vitest.config.ts | 2 +- 11 files changed, 650 insertions(+), 2 deletions(-) create mode 100644 src/plugins/yagr/renderer/labels/__screenshots__/label.visual.test.tsx-screenshots/Yagr-canvas-labels-integration-line-labels-at-plot-boundaries-in-dar-1-chromium-linux.png create mode 100644 src/plugins/yagr/renderer/labels/__screenshots__/label.visual.test.tsx-screenshots/Yagr-canvas-labels-integration-normalized-stacked-column-labels-1-chromium-linux.png create mode 100644 src/plugins/yagr/renderer/labels/__screenshots__/label.visual.test.tsx-screenshots/Yagr-canvas-labels-integration-positive-and-negative-stacked-column-1-chromium-linux.png create mode 100644 src/plugins/yagr/renderer/labels/__tests__/label.visual.test.tsx create mode 100644 src/plugins/yagr/renderer/labels/__tests__/renderLabel.test.ts create mode 100644 src/plugins/yagr/renderer/labels/index.ts create mode 100644 src/plugins/yagr/renderer/labels/renderLabels.ts diff --git a/src/plugins/yagr/__stories__/Yagr.stories.tsx b/src/plugins/yagr/__stories__/Yagr.stories.tsx index 45eff450..6d7fce89 100644 --- a/src/plugins/yagr/__stories__/Yagr.stories.tsx +++ b/src/plugins/yagr/__stories__/Yagr.stories.tsx @@ -9,6 +9,7 @@ import {CustomTooltipProps, TooltipHandlerData, YagrPlugin} from '../'; import {ChartKit} from '../../../components/ChartKit'; import {settings} from '../../../libs'; import type {ChartKitRef} from '../../../types'; +import type {YagrWidgetData} from '../types'; import {getNewConfig, line10, line10WithGrafanaStyle} from './mocks/line10'; @@ -159,3 +160,48 @@ export const Area: Story = { ); }, }; + +const POINT_LABELS_DATA: YagrWidgetData = { + data: { + timeline: [Date.UTC(2026, 0, 1), Date.UTC(2026, 0, 2)], + graphs: [{id: 'revenue', name: 'Revenue', data: [10, 20], pointLabels: ['Plan', 'Actual']}], + }, + libraryConfig: { + chart: {series: {type: 'line'}}, + scales: {y: {min: 0, max: 40}}, + }, +}; + +export const PreparedLabels: Story = { + name: 'Prepared labels', + render: () => { + const [labels, setLabels] = React.useState(['Plan', 'Actual']); + const [showLabels, setShowLabels] = React.useState(true); + settings.set({plugins: [YagrPlugin]}); + + const data: YagrWidgetData = { + ...POINT_LABELS_DATA, + data: { + ...POINT_LABELS_DATA.data, + graphs: POINT_LABELS_DATA.data.graphs.map((graph) => ({ + ...graph, + pointLabels: showLabels ? labels : undefined, + })), + }, + }; + + return ( +
+
+ +
+ + +
+ ); + }, +}; diff --git a/src/plugins/yagr/renderer/labels/__screenshots__/label.visual.test.tsx-screenshots/Yagr-canvas-labels-integration-line-labels-at-plot-boundaries-in-dar-1-chromium-linux.png b/src/plugins/yagr/renderer/labels/__screenshots__/label.visual.test.tsx-screenshots/Yagr-canvas-labels-integration-line-labels-at-plot-boundaries-in-dar-1-chromium-linux.png new file mode 100644 index 0000000000000000000000000000000000000000..706f2ed35357d4367042059221bb5f07f55f7946 GIT binary patch literal 8839 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 acsAei+E4MR+rU4VoKsiUhLzm1eEM%_DLiKY literal 0 HcmV?d00001 diff --git a/src/plugins/yagr/renderer/labels/__screenshots__/label.visual.test.tsx-screenshots/Yagr-canvas-labels-integration-normalized-stacked-column-labels-1-chromium-linux.png b/src/plugins/yagr/renderer/labels/__screenshots__/label.visual.test.tsx-screenshots/Yagr-canvas-labels-integration-normalized-stacked-column-labels-1-chromium-linux.png new file mode 100644 index 0000000000000000000000000000000000000000..bc9e31ca3c4e4175867b10e5244379b0275ce7e3 GIT binary patch literal 7680 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 literal 0 HcmV?d00001 diff --git a/src/plugins/yagr/renderer/labels/__screenshots__/label.visual.test.tsx-screenshots/Yagr-canvas-labels-integration-positive-and-negative-stacked-column-1-chromium-linux.png b/src/plugins/yagr/renderer/labels/__screenshots__/label.visual.test.tsx-screenshots/Yagr-canvas-labels-integration-positive-and-negative-stacked-column-1-chromium-linux.png new file mode 100644 index 0000000000000000000000000000000000000000..be01fb099098b08280469d953e8f772a2f6c40d8 GIT binary patch literal 5187 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 value === second.data[index]) + ); +} + +describe('Yagr canvas labels integration', () => { + beforeAll(async () => { + await import('../../YagrWidget.js'); + }); + + beforeEach(() => { + settings.set({plugins: [YagrPlugin]}); + }); + + afterEach(() => { + vi.restoreAllMocks(); + }); + + test.each(SCREENSHOT_CASES)('$name', async ({theme, data}) => { + let chart: Yagr | undefined; + const chartData: YagrWidgetData = { + ...data, + libraryConfig: { + ...data.libraryConfig, + chart: {...data.libraryConfig.chart, size: {width: 360, height: 240}}, + axes: {x: {values: (_u, values) => values.map(String)}}, + }, + }; + const screen = await render( +
+ { + chart = widget ?? undefined; + }} + /> +
, + {providers: {theme}}, + ); + + await expect.poll(() => chart?.uplot.data[0]).toEqual(data.data.timeline); + await document.fonts.ready; + chart?.redraw(); + + await expect(screen.getByTestId('label-chart')).toMatchScreenshot(); + }); + + test('updates values and labels, removes and re-enables labels on the real widget', async () => { + const fillText = vi.spyOn(CanvasRenderingContext2D.prototype, 'fillText'); + const drawnTexts = () => fillText.mock.calls.map(([text]) => text); + let chart: Yagr | undefined; + const onChartLoad = ({widget}: {widget?: Yagr | null}) => { + chart = widget ?? undefined; + }; + const widget = (data: YagrWidgetData) => ( +
+ +
+ ); + const screen = await render(widget(DATA)); + await expect.poll(() => chart).toBeDefined(); + await expect.poll(drawnTexts).toContain('Plan'); + + const updated: YagrWidgetData = { + ...DATA, + data: { + timeline: [1, 2, 3], + graphs: [{data: [30, null, 0], pointLabels: ['Updated', 'Gap', 'Zero']}], + }, + }; + fillText.mockClear(); + await screen.rerender(widget(updated)); + await expect.poll(drawnTexts).toContain('Updated'); + expect(drawnTexts()).toContain('Zero'); + expect(drawnTexts()).not.toContain('Plan'); + expect(drawnTexts()).not.toContain('Gap'); + expect(chart?.uplot.data[1]).toEqual([30, null, 0]); + + const withoutLabels: YagrWidgetData = { + ...updated, + data: {...updated.data, graphs: [{data: [30, null, 0]}]}, + }; + fillText.mockClear(); + await screen.rerender(widget(withoutLabels)); + await expect.poll(() => fillText.mock.calls.length).toBeGreaterThan(0); + expect(drawnTexts()).not.toContain('Updated'); + expect(drawnTexts()).not.toContain('Zero'); + + fillText.mockClear(); + await screen.rerender(widget(updated)); + await expect.poll(drawnTexts).toContain('Updated'); + }); + + test('exports the current canvas with labels and after labels are removed', async () => { + let chart: Yagr | undefined; + await render( +
+ { + chart = widget ?? undefined; + }} + /> +
, + ); + await expect.poll(() => chart).toBeDefined(); + if (!chart) { + throw new Error('Yagr widget was not loaded'); + } + + const widget = chart; + const readCanvas = () => { + const {ctx} = widget.uplot; + return ctx.getImageData(0, 0, ctx.canvas.width, ctx.canvas.height); + }; + const withLabels = await readPng(widget); + expect(hasSamePixels(withLabels, readCanvas())).toBe(true); + + widget.setConfig({series: [{data: [10, 20, 30]}]}); + await expect + .poll(async () => hasSamePixels(await readPng(widget), readCanvas())) + .toBe(true); + + const withoutLabels = await readPng(widget); + expect(hasSamePixels(withLabels, withoutLabels)).toBe(false); + }); +}); diff --git a/src/plugins/yagr/renderer/labels/__tests__/renderLabel.test.ts b/src/plugins/yagr/renderer/labels/__tests__/renderLabel.test.ts new file mode 100644 index 00000000..8a0cc10e --- /dev/null +++ b/src/plugins/yagr/renderer/labels/__tests__/renderLabel.test.ts @@ -0,0 +1,231 @@ +import type {Yagr, YagrConfig} from '../../../types.js'; +import {getLabelHooks} from '../index.js'; + +function createYagrChart() { + const ctx = { + canvas: {width: 800}, + font: '', + save: vi.fn(), + restore: vi.fn(), + beginPath: vi.fn(), + rect: vi.fn(), + clip: vi.fn(), + fillText: vi.fn(), + measureText: vi.fn(() => ({width: 40})), + }; + const root = {}; + const sourceData: (number | null)[] = [20]; + const series = { + id: 'a', + show: true, + scale: 'y', + type: 'line', + $c: sourceData, + pointLabels: ['Prepared'], + }; + const uplot = { + ctx, + root, + width: 400, + bbox: {left: 20, top: 20, width: 760, height: 480}, + series: [{}, series], + data: [[1], [30]], + valToPos: vi.fn((value, scale) => (scale === 'x' ? value * 200 : value * 2)), + } as unknown as Yagr['uplot']; + const existingDraw = vi.fn(); + const originalHooks: YagrConfig['hooks'] = {draw: [existingDraw]}; + const hooks = getLabelHooks(originalHooks); + const chart = { + config: { + scales: {y: {stacking: true}}, + }, + }; + const handleProcessed = hooks.processed?.[0]; + const draw = hooks.draw?.[1]; + if (!handleProcessed || !draw) { + throw new Error('Expected Yagr label handlers'); + } + + handleProcessed({ + chart: chart as unknown as Yagr, + meta: {processTime: 0}, + }); + + return { + ctx, + uplot, + series, + chart, + hooks, + originalHooks, + existingDraw, + draw, + }; +} + +describe('Yagr point labels', () => { + beforeEach(() => { + vi.stubGlobal('getComputedStyle', () => ({ + fontFamily: 'Arial', + color: 'black', + getPropertyValue: () => '', + })); + }); + + afterEach(() => { + vi.unstubAllGlobals(); + }); + + test('preserves caller hooks without changing their arrays', () => { + const {hooks, originalHooks, existingDraw} = createYagrChart(); + + expect(originalHooks.draw).toEqual([existingDraw]); + expect(originalHooks.processed).toBeUndefined(); + expect(hooks.draw).toContain(existingDraw); + }); + + test('draws prepared plain text only for visible series, including zero values', () => { + const {ctx, uplot, series, draw} = createYagrChart(); + series.$c = [0]; + series.pointLabels = ['Plan **0**']; + + draw(uplot); + expect(ctx.fillText).toHaveBeenCalledWith('Plan **0**', 200, 52); + + series.show = false; + ctx.fillText.mockClear(); + draw(uplot); + expect(ctx.fillText).not.toHaveBeenCalled(); + + series.show = true; + uplot.series[1].showInGraph = false; + draw(uplot); + expect(ctx.fillText).not.toHaveBeenCalled(); + }); + + const columnCases = [ + { + name: 'positive stack', + value: 20, + coordinate: 30, + stacking: true, + normalized: undefined, + expectedY: 332, + }, + { + name: 'negative stack', + value: -20, + coordinate: -30, + stacking: true, + normalized: undefined, + expectedY: 412, + }, + { + name: 'negative column', + value: -20, + coordinate: -20, + stacking: false, + normalized: undefined, + expectedY: 392, + }, + { + name: 'percentage stack', + value: 20, + coordinate: 100, + stacking: true, + normalized: 66, + expectedY: 192, + }, + ]; + + test.each(columnCases)( + 'positions the label above the $name segment', + ({value, coordinate, stacking, normalized, expectedY}) => { + const {ctx, uplot, series, chart, draw} = createYagrChart(); + series.$c = [value]; + series.pointLabels = ['20']; + chart.config.scales.y.stacking = stacking; + uplot.series[1].type = 'column'; + uplot.series[1].normalizedData = normalized === undefined ? undefined : [normalized]; + uplot.data[1][0] = coordinate; + vi.mocked(uplot.valToPos).mockImplementation((v, scale) => + scale === 'x' ? v * 200 : 400 - v * 2, + ); + + draw(uplot); + + expect(ctx.fillText).toHaveBeenCalledWith('20', 200, expectedY); + }, + ); + + test('skips missing source values and coordinates even in stacked series', () => { + const {ctx, uplot, series, draw} = createYagrChart(); + series.$c = [null]; + draw(uplot); + expect(ctx.fillText).not.toHaveBeenCalled(); + + series.$c = [0]; + uplot.data[1][0] = null; + draw(uplot); + expect(ctx.fillText).not.toHaveBeenCalled(); + }); + + test('keeps constant column labels inside the plot at the upper scale boundary', () => { + const {ctx, uplot, series, draw} = createYagrChart(); + series.$c = [50, 50]; + series.pointLabels = ['50', '50']; + uplot.series[1].type = 'column'; + uplot.data[0] = [1, 2]; + uplot.data[1] = [50, 50]; + vi.mocked(uplot.valToPos).mockImplementation((value, scale) => + scale === 'x' ? value * 200 : 220 - value * 4, + ); + + draw(uplot); + + expect(ctx.font).toBe('500 24px Arial'); + expect(ctx.fillText.mock.calls).toEqual([ + ['50', 200, 44], + ['50', 400, 44], + ]); + }); + + test('keeps labels within the left, right and bottom plot boundaries', () => { + const {ctx, uplot, series, draw} = createYagrChart(); + series.$c = [20, 20, 20]; + series.pointLabels = ['20', '20', '20']; + uplot.data[0] = [20, 780, 400]; + uplot.data[1] = [200, 200, 500]; + vi.mocked(uplot.valToPos).mockImplementation((value) => value); + + draw(uplot); + + expect(ctx.fillText.mock.calls).toEqual([ + ['20', 40, 192], + ['20', 760, 192], + ['20', 400, 492], + ]); + }); + + test('does not move labels of points outside the plot into view', () => { + const {ctx, uplot, series, draw} = createYagrChart(); + series.$c = [20, 20, 20, 20]; + series.pointLabels = ['20', '20', '20', '20']; + uplot.data[0] = [19, 781, 400, 400]; + uplot.data[1] = [200, 200, 19, 501]; + vi.mocked(uplot.valToPos).mockImplementation((value) => value); + + draw(uplot); + + expect(ctx.fillText).not.toHaveBeenCalled(); + }); + + test('hides labels wider than the plot', () => { + const {ctx, uplot, draw} = createYagrChart(); + ctx.measureText.mockReturnValue({width: 800}); + + draw(uplot); + + expect(ctx.fillText).not.toHaveBeenCalled(); + }); +}); diff --git a/src/plugins/yagr/renderer/labels/index.ts b/src/plugins/yagr/renderer/labels/index.ts new file mode 100644 index 00000000..e022d776 --- /dev/null +++ b/src/plugins/yagr/renderer/labels/index.ts @@ -0,0 +1 @@ +export {getLabelHooks} from './renderLabels'; diff --git a/src/plugins/yagr/renderer/labels/renderLabels.ts b/src/plugins/yagr/renderer/labels/renderLabels.ts new file mode 100644 index 00000000..114ed5b1 --- /dev/null +++ b/src/plugins/yagr/renderer/labels/renderLabels.ts @@ -0,0 +1,116 @@ +import type {Yagr, YagrConfig, YagrSeriesPointLabels} from '../../types'; + +const LABEL_OFFSET = 4; +const LABEL_FONT_SIZE = 12; +const LABEL_FONT_WEIGHT = 500; + +function renderLabels(u: Yagr['uplot'], chart: Yagr) { + const chartSeries: (Yagr['uplot']['series'][number] & YagrSeriesPointLabels)[] = u.series; + if (!chartSeries.some((series) => series.pointLabels?.length)) { + return; + } + + const {ctx, bbox} = u; + const pixelRatio = ctx.canvas.width / u.width; + const style = getComputedStyle(u.root); + const labelHeight = LABEL_FONT_SIZE * pixelRatio; + const offset = LABEL_OFFSET * pixelRatio; + const plotRight = bbox.left + bbox.width; + const plotBottom = bbox.top + bbox.height; + + ctx.save(); + try { + ctx.beginPath(); + ctx.rect(bbox.left, bbox.top, bbox.width, bbox.height); + ctx.clip(); + ctx.font = `${LABEL_FONT_WEIGHT} ${labelHeight}px ${style.fontFamily}`; + ctx.fillStyle = style.getPropertyValue('--g-color-text-primary') || style.color; + ctx.textAlign = 'center'; + ctx.textBaseline = 'bottom'; + + chartSeries.forEach((series, seriesIndex) => { + if ( + !seriesIndex || + !series.show || + series.showInGraph === false || + !series.pointLabels + ) { + return; + } + + const scale = series.scale || 'y'; + const stacking = chart.config.scales?.[scale]?.stacking; + series.pointLabels.forEach((label, pointIndex) => { + const value = series.$c[pointIndex]; + const coordinate = u.data[seriesIndex][pointIndex]; + if ( + label === null || + label === '' || + typeof value !== 'number' || + !Number.isFinite(value) || + coordinate === null || + coordinate === undefined || + !Number.isFinite(coordinate) + ) { + return; + } + + const x = u.valToPos(u.data[0][pointIndex], 'x', true); + let y = u.valToPos(coordinate, scale, true); + if (series.type === 'column') { + const segmentValue = series.normalizedData?.[pointIndex] ?? value; + const base = stacking ? coordinate - segmentValue : 0; + y = Math.min(y, u.valToPos(base, scale, true)); + } + + if ( + !Number.isFinite(x) || + !Number.isFinite(y) || + x < bbox.left || + x > plotRight || + y < bbox.top || + y > plotBottom + ) { + return; + } + + const labelWidth = ctx.measureText(label).width; + if (labelWidth > bbox.width || labelHeight > bbox.height) { + return; + } + + const halfWidth = labelWidth / 2; + const labelX = Math.max(bbox.left + halfWidth, Math.min(x, plotRight - halfWidth)); + const labelY = Math.max(bbox.top + labelHeight, Math.min(y - offset, plotBottom)); + + ctx.fillText(label, labelX, labelY); + }); + }); + } finally { + ctx.restore(); + } +} + +export function getLabelHooks(existingHooks: YagrConfig['hooks'] = {}) { + let chart: Yagr | undefined; + const hooks: YagrConfig['hooks'] = {...existingHooks}; + + hooks.processed = [ + ...(hooks.processed || []), + (event) => { + chart = event.chart; + }, + ]; + + hooks.draw = [ + ...(hooks.draw || []), + (u) => { + if (chart) { + chart.canvas = u.ctx.canvas; + renderLabels(u, chart); + } + }, + ]; + + return hooks; +} diff --git a/src/plugins/yagr/renderer/utils.ts b/src/plugins/yagr/renderer/utils.ts index 5532d890..77629c51 100644 --- a/src/plugins/yagr/renderer/utils.ts +++ b/src/plugins/yagr/renderer/utils.ts @@ -5,6 +5,7 @@ import {settings} from '../../../libs'; import {merge} from '../../../utils/merge'; import type {MinimalValidConfig, Yagr, YagrChartOptions, YagrTheme, YagrWidgetData} from '../types'; +import {getLabelHooks} from './labels'; import {getRenderTooltip} from './tooltip'; const TOOLTIP_HEADER_CLASS_NAME = '_tooltip-header'; @@ -211,5 +212,7 @@ export const shapeYagrConfig = (args: ShapeYagrConfigArgs): MinimalValidConfig = }; } + config.hooks = getLabelHooks(config.hooks); + return config; }; diff --git a/src/plugins/yagr/types.ts b/src/plugins/yagr/types.ts index 9842b39f..4a0df259 100644 --- a/src/plugins/yagr/types.ts +++ b/src/plugins/yagr/types.ts @@ -19,9 +19,14 @@ export type YagrWidgetProps = ChartKitProps<'yagr'> & { id: string; }; +export type YagrSeriesPointLabels = { + /** Prepared plain-text labels in timeline order. Empty, null, and missing entries hide a label. */ + pointLabels?: (string | null)[]; +}; + export type YagrWidgetData = { data: { - graphs: RawSerieData[]; + graphs: (RawSerieData & YagrSeriesPointLabels)[]; timeline: number[]; /** * Allow to setup timezone for X axis and tooltip's header. diff --git a/vitest.config.ts b/vitest.config.ts index 28ca981a..530a0bf0 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -17,7 +17,7 @@ export default defineConfig({ browser: { enabled: true, headless: true, - provider: playwright({}), + provider: playwright({contextOptions: {locale: 'en-US'}}), instances: [ { browser: 'chromium', From f06bcfae49dda835c207df240d94a27bb2883a5b Mon Sep 17 00:00:00 2001 From: Nick Grachev Date: Fri, 13 Nov 2026 17:24:19 +0300 Subject: [PATCH 2/2] feat(Yagr): add configurable line data labels --- ...int-labels-by-default-1-chromium-linux.png | Bin 0 -> 4743 bytes ...ls-at-plot-boundaries-1-chromium-linux.png | Bin 0 -> 4496 bytes src/plugins/yagr/__stories__/Yagr.stories.tsx | 45 +-- src/plugins/yagr/__stories__/mocks/labels.ts | 16 + .../yagr/__tests__/data-labels.test.ts | 308 ++++++++++++++++++ .../yagr/__tests__/labels.visual.test.tsx | 295 +++++++++++++++++ src/plugins/yagr/__tests__/utils.test.ts | 114 ++++++- .../plugins/YagrDataLabelsPlugin/index.ts | 147 +++++++++ ...lot-boundaries-in-dar-1-chromium-linux.png | Bin 8839 -> 0 bytes ...stacked-column-labels-1-chromium-linux.png | Bin 7680 -> 0 bytes ...gative-stacked-column-1-chromium-linux.png | Bin 5187 -> 0 bytes .../labels/__tests__/label.visual.test.tsx | 246 -------------- .../labels/__tests__/renderLabel.test.ts | 231 ------------- src/plugins/yagr/renderer/labels/index.ts | 1 - .../yagr/renderer/labels/renderLabels.ts | 116 ------- src/plugins/yagr/renderer/utils.ts | 105 +++++- src/plugins/yagr/types.ts | 41 ++- 17 files changed, 1028 insertions(+), 637 deletions(-) create mode 100644 src/plugins/yagr/__screenshots__/labels.visual.test.tsx-screenshots/Yagr-canvas-labels-integration-hides-overlapping-point-labels-by-default-1-chromium-linux.png create mode 100644 src/plugins/yagr/__screenshots__/labels.visual.test.tsx-screenshots/Yagr-canvas-labels-integration-renders-normalized-line-labels-at-plot-boundaries-1-chromium-linux.png create mode 100644 src/plugins/yagr/__stories__/mocks/labels.ts create mode 100644 src/plugins/yagr/__tests__/data-labels.test.ts create mode 100644 src/plugins/yagr/__tests__/labels.visual.test.tsx create mode 100644 src/plugins/yagr/plugins/YagrDataLabelsPlugin/index.ts delete mode 100644 src/plugins/yagr/renderer/labels/__screenshots__/label.visual.test.tsx-screenshots/Yagr-canvas-labels-integration-line-labels-at-plot-boundaries-in-dar-1-chromium-linux.png delete mode 100644 src/plugins/yagr/renderer/labels/__screenshots__/label.visual.test.tsx-screenshots/Yagr-canvas-labels-integration-normalized-stacked-column-labels-1-chromium-linux.png delete mode 100644 src/plugins/yagr/renderer/labels/__screenshots__/label.visual.test.tsx-screenshots/Yagr-canvas-labels-integration-positive-and-negative-stacked-column-1-chromium-linux.png delete mode 100644 src/plugins/yagr/renderer/labels/__tests__/label.visual.test.tsx delete mode 100644 src/plugins/yagr/renderer/labels/__tests__/renderLabel.test.ts delete mode 100644 src/plugins/yagr/renderer/labels/index.ts delete mode 100644 src/plugins/yagr/renderer/labels/renderLabels.ts diff --git a/src/plugins/yagr/__screenshots__/labels.visual.test.tsx-screenshots/Yagr-canvas-labels-integration-hides-overlapping-point-labels-by-default-1-chromium-linux.png b/src/plugins/yagr/__screenshots__/labels.visual.test.tsx-screenshots/Yagr-canvas-labels-integration-hides-overlapping-point-labels-by-default-1-chromium-linux.png new file mode 100644 index 0000000000000000000000000000000000000000..add3e947ded7b74e2cc2b55c43a611b337faafde GIT binary patch literal 4743 zcmd6rXH-+^y2n99iV#3Viqrs61R?~5h!GTnfJ9JG6lq4IQBmmwp@@YN`p}7vAfpi( zL8(#{5Ktf#QIXz+geKAgN{92rnYHdYcjnx6&-rrBm#pMnJA1$HQ~v+ovqO)W8w&|Y z3vh9937MMUExEY3FTwXIzK!syk-lod#kJYo6o2r9H}`mj^VLsY+%?m4lfDMe=!0HC z?DR|n0kW#Y;$l*=qXI^)TUwS_H`or`~rp4OvQr@F{#h9?c#m4WH(qE?64&w2d=S4(C)uizF zH%B&#isr;}mPmhIV#QV&tWFD?|AMXPE_P=K1R1`X{b)uiC@gGlZ9Q!5>A5EqzfM$? zb_2avP)I1}Vx#nnYhBfMHuCabzIKhCk-^{Qxz}Sv3K_!}XPVx;;o$44>wRTMU0t=13yBO;vNjokTwq}lgM)*F1T#cU zl&sPgf$8O$Cil4sd)Q6;D~fi%OLAi3)-PjY{6U5u9v<)8+iOXJ-yT6a2A{Q+dT_Y+QlU}cYL|S90RB8eo>72?PD)ltuKe%KkN4$D9qRqiK zva|Ed=Fkl`XZZ$iCGcc+g%=z>eWjL zk#O+7#Y=C#92OoUKRGXMU(8$QhgPfcghIdNHFoiX+q>t3DnDfW8RcQpavfbkcj~)eBXUsW%J-NNeRY^FkhWUo+ipR4?|9g`6qk@uTK924VSQ&HVzkL&0%sT7L z+r@8Vj4RI0=~-EknP0wKfwXcmVCRPQ{jP47sIDj%?LOA3;ov*I$NHHaqqde0;9vUY}!QI@2exR%R%`^Y8k&}WTZWP8vaM~ z7ZV0nSC*FNYYZM|XaC&u(hH((lHR;ULP9(3$rEZ>nLbFwVlkmovPw8${*YzHmVo&x z`P12FxqokK4=*om=U&_qGc(E%jm&8$Py_E2W04JnS`r426h+0Er^ER|=$5MZi>MqsXi2RM(V4-cb z^oI}Ew|Pp*$_`crZOU{kPw{iQbm{EqN4g*a;kG>Q8XO$lo<|mrv&p|C+PBzRxI;~i zd0c;G)+$Qg!2H@Z4bFx}-~lrGed156SA*t(9RGrKy-h$>J+puLbCZEYObz5E^zcKH z_|~m%5RF)da@nN&ME73(`OoXG_r5ZvQ1&{md^wfzYqR%}-Sc)Ao6x9oH7y7Fcl>SfAM)HUFTO?TxClvE-k5QXk4fY7Rt1LnK;(=e5QJvbGCDz zzFpg3q;Bs62;|IgleV5-U2B$YMrI~UqI{mm=6TuT&c20rUZ-ze|3PBaxmHE+Z3$JTgK?X)9 zC&{bJ3m|Ro^HW5bn*PBg$00Mv#m&Z1GHK=Isk~C>Ymd+^p)NuyD-C=7=j_23_xbH|6tp5M=~Q;1shcrNHjHR20H6O$2rt5fS0?wOvbZ z-@cCg%VG;2utn6CEnBkvmwti@IIMU7B2+QlE*mu7{Jx$M7>KyIIPNMOKRz+h^5n_4 zjJWMm+qRv@z(Yup(a}ndc4%ZY5l;MSejuC#*M+m$ZZb7QLn2YpW^STKsoqt_&DB0B z(*@h`{=G;lJufdVCr9hXVsk1c4Za_}rxRl#BqXG6UlO00n~MQwX>56Vim_8&U3qMx z=Ot-x)FCwVVdm}I>vF4WYG}~!>SyvfdIi701v2x( zJA|J?QS^BAak>SVWV$I}HLlow*wWg%nh6OWekTjQ1v}$kSy|~Wa=n8`RI%}4><4edC72XB3AEjV+}v1g^1Gi;+So9rrZl6gBoA4m;uJTB zPCaP6r#k~_OeyU32`_MJizT3bh(XRd9?sU96xab%{;9J2esURVkh%eOAchF(DD~BS zHpVVW)Ud4{?<%BxYdOVa9iM@D(hCcdc(WWz?>hT2w{^etidHg?a{2N}mE%0n_c6OR zl9vN&^GKM`$tCb*4DHPyCJQ=hb>Yt_`h!l38*ah@nI&lCf{vbE*jNdb)ePl8+57`y z>jmfG=u!Xcer)A`8=>snB&DSK+jGu8vQ*859RXj$5OF7eN1{Kj#;}eZJ9YqY)kfZbR+LVsH>4V*dgyTgRxB(m zjPEwr4+f8(s^FD>-_gNH+3zbN8nf(1dqdMEV*^%kzH<|Fuw3<~8NS;$`Duh;6Xi-0 zr0<}}RQ8FTLA3-)Ny!7seHfacMWsqeZ?6N|;Z-eoHK#V!tTP|b=|PK&KG49B{@pq{ z7^$Y2DO|K2un!6K_sk1b3&3^e%$eluYh5~tX!|4f_OgwQjUaxY{$QxTGd@_qHq9Gn zj*|m+NGmJ%!;OY_cHRYANgVGiP~Oas%Ky`}6D*^@z!C%AWrT^VdB6YsSpm>U z2J3S3@ne*akI%^XxDkg56+FIfMPOGwCvs&`Xl`A7(z8L;~iA~B@BQ&Qx7e0^c28YL&+{_CMrlLz8DFmMjFMO<8T1HdNCA)KizNfnA*fiL-I28oJC z5>WTe#WrvYo6#+)4S`N=&lF>w3!VFhOp6E=PzIO&e<+FJQBhI(t6)Fg@qZ3~n(M)& zk=mf~kaSRs?Zjm6lwn1T7_RA%av!dVX)5_ohIuq)%LZ;J=L*THGXEtJMv_&!xodwV z&qQCjg^>}D<5FjvX0-x4KO!>HmCZ8UxN&2V`!K>R2~AH+<8Je$*ahQ!mc|Pg*h%FP zCi?cJJ_+By|MY#LryiJfbaHYSI7pvy2bAW*+Ug1jCPzX}6tO-)14v0q ze(qaa)kQ9VxG&93rUUI~f?v3U1L9L2*VP@_siww|-nNYingf=H5l2&YJGH9g*&15} zj$2w9w!(;CM8Ea90lDhJ=7QGQp_Nk6huF0ABO6 z%@!O!4}E*?YIhM#@uLr;^^tt*dT%UULuJ|($HK#u*!h`YiqQtE$*F70!yKfsu`$KT zk$2j$AHit3vNWd@>%2|(I*C~wNoB<`v0vMB?yQCUlNU7q_|E2I0Jr)&-r$b$yb*Z8 P#ARw^j(=u&_V(WZg1gju literal 0 HcmV?d00001 diff --git a/src/plugins/yagr/__screenshots__/labels.visual.test.tsx-screenshots/Yagr-canvas-labels-integration-renders-normalized-line-labels-at-plot-boundaries-1-chromium-linux.png b/src/plugins/yagr/__screenshots__/labels.visual.test.tsx-screenshots/Yagr-canvas-labels-integration-renders-normalized-line-labels-at-plot-boundaries-1-chromium-linux.png new file mode 100644 index 0000000000000000000000000000000000000000..b1bb29bfd501d178368a7e335d91927c95826120 GIT binary patch literal 4496 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 d;|nJDkFmZhH#_^jhn1O} { - const [labels, setLabels] = React.useState(['Plan', 'Actual']); - const [showLabels, setShowLabels] = React.useState(true); + const [enabled, setEnabled] = React.useState(true); + const [padding, setPadding] = React.useState(5); settings.set({plugins: [YagrPlugin]}); const data: YagrWidgetData = { - ...POINT_LABELS_DATA, + ...LABELED_DATA, data: { - ...POINT_LABELS_DATA.data, - graphs: POINT_LABELS_DATA.data.graphs.map((graph) => ({ + ...LABELED_DATA.data, + graphs: LABELED_DATA.data.graphs.map((graph) => ({ ...graph, - pointLabels: showLabels ? labels : undefined, + dataLabels: {enabled, padding}, })), }, }; @@ -193,14 +182,16 @@ export const PreparedLabels: Story = { return (
- +
- - + + + +
); }, diff --git a/src/plugins/yagr/__stories__/mocks/labels.ts b/src/plugins/yagr/__stories__/mocks/labels.ts new file mode 100644 index 00000000..21022831 --- /dev/null +++ b/src/plugins/yagr/__stories__/mocks/labels.ts @@ -0,0 +1,16 @@ +import type {YagrWidgetData} from '../../types'; + +export const LABELED_DATA: YagrWidgetData = { + data: { + timeline: [Date.UTC(2026, 0, 1), Date.UTC(2026, 0, 2), Date.UTC(2026, 0, 3)], + graphs: [ + { + id: 'revenue', + name: 'Revenue', + type: 'line', + _data: [{value: 10, label: 'Plan'}, {value: 20}, {value: 15, label: ''}], + }, + ], + }, + libraryConfig: {scales: {y: {min: 0, max: 40}}}, +}; diff --git a/src/plugins/yagr/__tests__/data-labels.test.ts b/src/plugins/yagr/__tests__/data-labels.test.ts new file mode 100644 index 00000000..53a47d7e --- /dev/null +++ b/src/plugins/yagr/__tests__/data-labels.test.ts @@ -0,0 +1,308 @@ +import {YagrDataLabelsPlugin as createDataLabelsPlugin} from '../plugins/YagrDataLabelsPlugin'; +import {shapeYagrConfig} from '../renderer/utils'; +import type {Yagr, YagrGraph, YagrWidgetData} from '../types'; + +function createChartMock( + graphs: YagrGraph[] = [ + {id: 'a', _data: [{value: 20, label: 'Plan'}], dataLabels: {enabled: true}}, + ], + libraryConfig: YagrWidgetData['libraryConfig'] = {}, +) { + const config = shapeYagrConfig({data: {timeline: [1], graphs}, libraryConfig, theme: 'light'}); + const ctx = { + canvas: {width: 800}, + font: '', + fillStyle: '', + textAlign: '', + textBaseline: '', + save: vi.fn(), + restore: vi.fn(), + beginPath: vi.fn(), + rect: vi.fn(), + clip: vi.fn(), + fillText: vi.fn(), + measureText: vi.fn(() => ({ + width: 40, + actualBoundingBoxAscent: 18, + actualBoundingBoxDescent: 2, + })), + }; + const u = { + ctx, + width: 400, + bbox: {left: 20, top: 20, width: 760, height: 480}, + series: [{}, ...config.series.map((series) => ({id: series.id, show: true, scale: 'y'}))], + data: [[1], ...graphs.map(() => [30])], + valToPos: vi.fn((value, scale) => (scale === 'x' ? value * 200 : value * 2)), + } as unknown as Yagr['uplot']; + const chart = { + config, + root: {}, + utils: {colors: {parse: vi.fn(() => 'rgb(1, 2, 3)')}}, + } as unknown as Yagr; + const hooks = createDataLabelsPlugin(chart).uplot.hooks.draw; + const hook = Array.isArray(hooks) ? hooks[0] : hooks; + if (typeof hook !== 'function') throw new Error('Missing draw hook'); + + return {ctx, u, chart, draw: () => hook(u)}; +} + +describe('YagrDataLabelsPlugin', () => { + beforeEach(() => vi.stubGlobal('getComputedStyle', () => ({fontFamily: 'Arial'}))); + afterEach(() => vi.unstubAllGlobals()); + + const pixelRatioCases = [ + {ratio: 1, font: 'bold 11px Arial', labelY: 55}, + {ratio: 1.5, font: 'bold 16.5px Arial', labelY: 52.5}, + {ratio: 2, font: 'bold 22px Arial', labelY: 50}, + ]; + + test.each(pixelRatioCases)( + 'draws source text at prepared coordinates with pixel ratio $ratio', + ({ratio, font, labelY}) => { + const {ctx, u, draw} = createChartMock(); + ctx.canvas.width = 400 * ratio; + draw(); + + expect(ctx.fillText).toHaveBeenCalledWith('Plan', 200, labelY); + expect(u.valToPos).toHaveBeenCalledWith(30, 'y', true); + expect(ctx.font).toBe(font); + expect(ctx.fillStyle).toBe('rgb(1, 2, 3)'); + }, + ); + + const disabledCases: YagrGraph[] = [ + {_data: [{value: 20, label: 'Plan'}]}, + {_data: [{value: 20, label: 'Plan'}], dataLabels: {enabled: false}}, + {data: [20], type: 'column', dataLabels: {enabled: true}}, + {data: [20], type: 'area', dataLabels: {enabled: true}}, + {data: [20], type: 'dots', dataLabels: {enabled: true}}, + ]; + test.each(disabledCases)('ignores disabled labels and non-line types: %j', (graph) => { + const {ctx, draw} = createChartMock([{...graph, id: 'a'}]); + draw(); + expect(ctx.fillText).not.toHaveBeenCalled(); + }); + + test('resolves the common type with a per-series override', () => { + const graph: YagrGraph = {id: 'a', data: [20], dataLabels: {enabled: true}}; + const hidden = createChartMock([graph], {chart: {series: {type: 'column'}}}); + hidden.draw(); + expect(hidden.ctx.fillText).not.toHaveBeenCalled(); + + const visible = createChartMock([{...graph, type: 'line'}], { + chart: {series: {type: 'column'}}, + }); + visible.draw(); + expect(visible.ctx.fillText).toHaveBeenCalledWith('20', 200, 50); + }); + + test('uses the effective uPlot series type', () => { + const {u, ctx, draw} = createChartMock(); + u.series[1].type = 'column'; + draw(); + expect(ctx.fillText).not.toHaveBeenCalled(); + }); + + test('handles default text, empty text, null values and zero', () => { + const graph: YagrGraph = { + id: 'a', + _data: [ + {value: 10, label: 'Plan'}, + {value: 20}, + {value: 15, label: ''}, + {value: null, label: 'Missing'}, + {value: 0, label: null}, + ], + dataLabels: {enabled: true}, + }; + const {u, ctx, draw} = createChartMock([graph]); + u.data[0] = [1, 1.5, 2, 2.5, 3]; + u.data[1] = [30, 30, 30, 30, 30]; + draw(); + expect(ctx.fillText.mock.calls.map(([text]) => text)).toEqual(['Plan', '20', '0']); + }); + + const pointOverlapCases = [ + {allowOverlap: undefined, expected: ['Upper', 'Left']}, + {allowOverlap: true, expected: ['Lower', 'Right', 'Upper', 'Left']}, + ]; + + test.each(pointOverlapCases)( + 'filters labels by y then x unless overlap is allowed: $allowOverlap', + ({allowOverlap, expected}) => { + const graph: YagrGraph = { + id: 'a', + _data: [ + {value: 1, label: 'Lower'}, + {value: 1, label: 'Right'}, + {value: 1, label: 'Upper'}, + {value: 1, label: 'Left'}, + ], + dataLabels: {enabled: true, allowOverlap}, + }; + const {ctx, u, draw} = createChartMock([graph]); + u.data[0] = [200, 220, 200, 200]; + u.data[1] = [212, 200, 180, 200]; + vi.mocked(u.valToPos).mockImplementation((value) => value); + + draw(); + expect(ctx.fillText.mock.calls.map(([text]) => text)).toEqual(expected); + + ctx.fillText.mockClear(); + draw(); + expect(ctx.fillText.mock.calls.map(([text]) => text)).toEqual(expected); + }, + ); + + const overlappingSeries: YagrGraph[] = [ + { + id: 'first', + _data: [{value: 1, label: 'First'}, {value: null}, {value: null}], + }, + { + id: 'middle', + _data: [{value: null}, {value: 1, label: 'Middle'}, {value: null}], + }, + { + id: 'last', + _data: [{value: null}, {value: null}, {value: 1, label: 'Last'}], + }, + ]; + const seriesOverlapCases = [ + {allowOverlap: undefined, expected: ['Last', 'First']}, + {allowOverlap: true, expected: ['Last', 'Middle']}, + ]; + + test.each(seriesOverlapCases)( + 'prioritizes later series and keeps allowed overlaps as obstacles: $allowOverlap', + ({allowOverlap, expected}) => { + const graphs = overlappingSeries.map((graph) => ({ + ...graph, + dataLabels: { + enabled: true, + allowOverlap: graph.id === 'middle' ? allowOverlap : undefined, + }, + })); + const {ctx, u, draw} = createChartMock(graphs); + u.data[0] = [1, 1.1, 1.2]; + u.data[1] = [30, null, null]; + u.data[2] = [null, 30, null]; + u.data[3] = [null, null, 30]; + draw(); + expect(ctx.fillText.mock.calls.map(([text]) => text)).toEqual(expected); + }, + ); + + test('keeps padding above the actual text bounds with a negative descent', () => { + const {ctx, u, draw} = createChartMock(); + ctx.measureText.mockReturnValue({ + width: 40, + actualBoundingBoxAscent: 20, + actualBoundingBoxDescent: -4, + }); + vi.mocked(u.valToPos).mockImplementation((_value, scale) => + scale === 'x' ? 200 : u.bbox.top, + ); + draw(); + expect(ctx.fillText).toHaveBeenCalledWith('Plan', 200, 50); + }); + + test('reads replacement config by id on every draw, including padding zero', () => { + const {ctx, draw, chart} = createChartMock(); + draw(); + const replacement = shapeYagrConfig({ + data: { + timeline: [1], + graphs: [ + { + id: 'a', + _data: [{value: 4, label: 'Updated'}], + dataLabels: {enabled: true, padding: 0}, + }, + ], + }, + libraryConfig: {}, + theme: 'light', + }); + chart.config.series = replacement.series; + ctx.fillText.mockClear(); + draw(); + expect(ctx.fillText).toHaveBeenCalledWith('Updated', 200, 60); + }); + + test('resolves series by id with independent padding when uPlot order differs', () => { + const graphs: YagrGraph[] = [ + {id: 'a', data: [20], dataLabels: {enabled: true, padding: 0}}, + {id: 'b', data: [10], dataLabels: {enabled: true, padding: 8}}, + ]; + const {ctx, u, draw} = createChartMock(graphs); + [u.series[1], u.series[2]] = [u.series[2], u.series[1]]; + u.data[1] = [150]; + u.data[2] = [100]; + draw(); + expect(ctx.fillText.mock.calls).toEqual([ + ['10', 200, 284], + ['20', 200, 200], + ]); + }); + + test('skips hidden series and missing prepared values', () => { + const {ctx, u, draw} = createChartMock(); + u.series[1].show = false; + draw(); + u.series[1].show = true; + u.series[1].showInGraph = false; + draw(); + u.series[1].showInGraph = true; + u.data[1][0] = null; + draw(); + u.data[1][0] = NaN; + draw(); + expect(ctx.fillText).not.toHaveBeenCalled(); + }); + + test('moves text inside boundaries and skips points outside the viewport', () => { + const {ctx, u, chart, draw} = createChartMock(); + const graph: YagrGraph = { + id: 'a', + data: [1, 1, 1, 1, 1, 1, 1, 1], + dataLabels: {enabled: true}, + }; + chart.config.series = shapeYagrConfig({ + data: {timeline: [], graphs: [graph]}, + libraryConfig: {}, + theme: 'light', + }).series; + u.data[0] = [20, 780, 400, 400, 19, 781, 400, 400]; + u.data[1] = [200, 200, 20, 500, 200, 200, 19, 501]; + vi.mocked(u.valToPos).mockImplementation((value) => value); + draw(); + expect(ctx.fillText.mock.calls).toEqual([ + ['1', 400, 48], + ['1', 40, 190], + ['1', 760, 190], + ['1', 400, 490], + ]); + }); + + test('centers labels wider than the plot', () => { + const {ctx, draw} = createChartMock(); + ctx.measureText.mockReturnValue({ + width: 800, + actualBoundingBoxAscent: 18, + actualBoundingBoxDescent: 2, + }); + draw(); + expect(ctx.fillText).toHaveBeenCalledWith('Plan', 400, 50); + }); + + test('restores the canvas state if drawing fails', () => { + const {ctx, draw} = createChartMock(); + ctx.fillText.mockImplementation(() => { + throw new Error('Drawing failed'); + }); + expect(draw).toThrow('Drawing failed'); + expect(ctx.restore).toHaveBeenCalledOnce(); + }); +}); diff --git a/src/plugins/yagr/__tests__/labels.visual.test.tsx b/src/plugins/yagr/__tests__/labels.visual.test.tsx new file mode 100644 index 00000000..466a4795 --- /dev/null +++ b/src/plugins/yagr/__tests__/labels.visual.test.tsx @@ -0,0 +1,295 @@ +import React from 'react'; + +import {vi} from 'vitest'; + +import {render} from '../../../../test-utils/utils.js'; +import {ChartKit} from '../../../components/ChartKit.js'; +import {settings} from '../../../libs/index.js'; +import {YagrPlugin} from '../index.js'; +import type {Yagr, YagrWidgetData} from '../types.js'; + +const DATA: YagrWidgetData = { + data: { + timeline: [1, 2, 3], + graphs: [ + { + id: 'values', + type: 'line', + _data: [ + {value: 10, label: 'Plan'}, + {value: 20, label: 'Actual'}, + {value: 30, label: 'Total'}, + ], + dataLabels: {enabled: true}, + }, + ], + }, + libraryConfig: { + chart: {size: {width: 600, height: 300}}, + scales: {y: {min: 0, max: 50}}, + }, +}; + +const NORMALIZED_LABELS_DATA: YagrWidgetData = { + data: { + timeline: [1, 2], + graphs: [ + {id: 'a', data: [10, 10], dataLabels: {enabled: true}}, + {id: 'b', data: [30, 30], dataLabels: {enabled: true}}, + ], + }, + libraryConfig: { + chart: {size: {width: 360, height: 240}}, + axes: {x: {values: (_u, values) => values.map(String)}}, + scales: {y: {stacking: true, normalize: true, min: 0, max: 100}}, + }, +}; + +const OVERLAPPING_LABELS_DATA: YagrWidgetData = { + data: { + timeline: [1, 1.8, 2, 2.2, 3], + graphs: [ + { + id: 'values', + _data: [ + {value: 25, label: ''}, + {value: 25, label: 'Point A'}, + {value: 25, label: 'Point B'}, + {value: 25, label: 'Point C'}, + {value: 25, label: ''}, + ], + dataLabels: {enabled: true}, + }, + ], + }, + libraryConfig: { + chart: {size: {width: 360, height: 240}}, + axes: {x: {values: (_u, values) => values.map(String)}}, + scales: {y: {min: 0, max: 50}}, + }, +}; + +async function readPng(chart: Yagr) { + const image = new Image(); + image.src = chart.toDataUrl(); + await image.decode(); + + const canvas = document.createElement('canvas'); + canvas.width = image.width; + canvas.height = image.height; + const ctx = canvas.getContext('2d'); + if (!ctx) { + throw new Error('Canvas context is unavailable'); + } + + ctx.drawImage(image, 0, 0); + return ctx.getImageData(0, 0, canvas.width, canvas.height); +} + +function hasSamePixels(first: ImageData, second: ImageData) { + return ( + first.width === second.width && + first.height === second.height && + first.data.every((value, index) => value === second.data[index]) + ); +} + +describe('Yagr canvas labels integration', () => { + beforeEach(() => { + settings.set({plugins: [YagrPlugin]}); + }); + + afterEach(() => { + vi.restoreAllMocks(); + }); + + test('renders normalized line labels at plot boundaries', async () => { + let chart: Yagr | undefined; + const screen = await render( +
+ { + chart = widget ?? undefined; + }} + /> +
, + {providers: {theme: 'dark'}}, + ); + await expect.poll(() => chart?.uplot.data[0]).toEqual(NORMALIZED_LABELS_DATA.data.timeline); + await document.fonts.ready; + chart?.redraw(); + + await expect(screen.getByTestId('label-chart')).toMatchScreenshot(); + }); + + test('hides overlapping point labels by default', async () => { + let chart: Yagr | undefined; + const screen = await render( +
+ { + chart = widget ?? undefined; + }} + /> +
, + ); + await expect + .poll(() => chart?.uplot.data[0]) + .toEqual(OVERLAPPING_LABELS_DATA.data.timeline); + await document.fonts.ready; + chart?.redraw(); + + await expect(screen.getByTestId('label-chart')).toMatchScreenshot(); + }); + + test('updates visibility, scale and size through widget props', async () => { + const fillText = vi.spyOn(CanvasRenderingContext2D.prototype, 'fillText'); + const adaptiveData: YagrWidgetData = { + ...DATA, + libraryConfig: {...DATA.libraryConfig, chart: {size: {adaptive: true}}}, + }; + let chart: Yagr | undefined; + const renderWidget = (data: YagrWidgetData, width = 600) => ( +
+ { + chart = widget ?? undefined; + }} + /> +
+ ); + const screen = await render(renderWidget(adaptiveData)); + await expect.poll(() => chart).toBeDefined(); + const labels = () => + fillText.mock.calls.filter(([text]) => ['Plan', 'Actual', 'Total'].includes(text)); + + const hidden: YagrWidgetData = { + ...adaptiveData, + data: { + ...adaptiveData.data, + graphs: adaptiveData.data.graphs.map((graph) => ({...graph, show: false})), + }, + }; + fillText.mockClear(); + await screen.rerender(renderWidget(hidden)); + await expect.poll(() => chart?.uplot.series[1].show).toBe(false); + expect(labels()).toEqual([]); + + fillText.mockClear(); + await screen.rerender(renderWidget(adaptiveData)); + await expect.poll(() => labels().map(([text]) => text)).toContain('Plan'); + + const limitedRange: YagrWidgetData = { + ...adaptiveData, + libraryConfig: { + ...adaptiveData.libraryConfig, + scales: {...adaptiveData.libraryConfig.scales, y: {min: 15, max: 25}}, + }, + }; + fillText.mockClear(); + await screen.rerender(renderWidget(limitedRange)); + await expect.poll(() => labels().length).toBeGreaterThan(0); + expect([...new Set(labels().map(([text]) => text))]).toEqual(['Actual']); + + const previousX = labels()[0][1]; + fillText.mockClear(); + await screen.rerender(renderWidget(limitedRange, 400)); + await expect.poll(() => labels().at(-1)?.[1]).toBeLessThan(previousX); + }); + + test('exports updated labels and removes them without changing values', async () => { + const fillText = vi.spyOn(CanvasRenderingContext2D.prototype, 'fillText'); + let chart: Yagr | undefined; + const screen = await render( +
+ { + chart = widget ?? undefined; + }} + /> +
, + ); + await expect.poll(() => chart).toBeDefined(); + if (!chart) { + throw new Error('Yagr widget was not loaded'); + } + + const widget = chart; + const readCanvas = () => { + const {ctx} = widget.uplot; + return ctx.getImageData(0, 0, ctx.canvas.width, ctx.canvas.height); + }; + const original = await readPng(widget); + expect(hasSamePixels(original, readCanvas())).toBe(true); + + const updated: YagrWidgetData = { + ...DATA, + data: { + ...DATA.data, + graphs: [ + { + id: 'values', + type: 'line', + _data: [ + {value: 15, label: 'Plan'}, + {value: 25, label: 'Updated'}, + {value: 35, label: 'Total'}, + ], + dataLabels: {enabled: true}, + }, + ], + }, + }; + const renderWidget = (data: YagrWidgetData) => ( +
+ +
+ ); + + fillText.mockClear(); + await screen.rerender(renderWidget(updated)); + await expect + .poll(() => + fillText.mock.calls.some( + ([text], index) => + text === 'Updated' && fillText.mock.contexts[index] === widget.uplot.ctx, + ), + ) + .toBe(true); + expect(widget.uplot.data[1]).toEqual([15, 25, 35]); + await expect + .poll(async () => hasSamePixels(await readPng(widget), readCanvas())) + .toBe(true); + + const withUpdatedLabels = await readPng(widget); + expect(hasSamePixels(original, withUpdatedLabels)).toBe(false); + + const withoutLabels: YagrWidgetData = { + ...updated, + data: { + ...updated.data, + graphs: updated.data.graphs.map((graph) => ({ + ...graph, + dataLabels: {enabled: false}, + })), + }, + }; + fillText.mockClear(); + await screen.rerender(renderWidget(withoutLabels)); + await expect.poll(() => fillText.mock.calls.length).toBeGreaterThan(0); + expect(widget.uplot.data[1]).toEqual([15, 25, 35]); + expect(fillText.mock.calls.map(([text]) => text)).not.toContain('Updated'); + await expect + .poll(async () => hasSamePixels(await readPng(widget), readCanvas())) + .toBe(true); + expect(hasSamePixels(withUpdatedLabels, await readPng(widget))).toBe(false); + }); +}); diff --git a/src/plugins/yagr/__tests__/utils.test.ts b/src/plugins/yagr/__tests__/utils.test.ts index 4f92274e..05fbddbd 100644 --- a/src/plugins/yagr/__tests__/utils.test.ts +++ b/src/plugins/yagr/__tests__/utils.test.ts @@ -1,7 +1,7 @@ import type {YagrChartOptions} from '@gravity-ui/yagr'; import {getUplotTimezoneAligner, shapeYagrConfig} from '../renderer/utils'; -import type {MinimalValidConfig, YagrWidgetData} from '../types'; +import type {MinimalValidConfig, YagrGraph, YagrWidgetData} from '../types'; const DATA: YagrWidgetData['data'] = { timeline: [1], @@ -44,6 +44,118 @@ describe('plugins/yagr/utils', () => { }); }); + describe('data labels preparation', () => { + const cases: { + name: string; + graph: YagrGraph; + expected: (number | string | null)[]; + }[] = [ + { + name: 'legacy values', + graph: {data: [10, '020', null, 0]}, + expected: [10, '020', null, 0], + }, + { + name: 'labeled points', + graph: { + _data: [ + {value: 10, label: 'Plan'}, + {value: '020'}, + {value: 15, label: ''}, + {value: 0, label: null}, + {value: null, label: 'Missing'}, + ], + }, + expected: [10, '020', 15, 0, null], + }, + {name: 'empty values', graph: {data: []}, expected: []}, + {name: 'empty labeled points', graph: {_data: []}, expected: []}, + { + name: 'labeled points override legacy values', + graph: {data: [99], _data: [{value: 10}]}, + expected: [10], + }, + { + name: 'empty labeled points fall back to legacy values', + graph: {data: [99], _data: []}, + expected: [99], + }, + { + name: 'null legacy values', + graph: {data: [null, null]}, + expected: [null, null], + }, + ]; + + test.each(cases)('prepares $name without mutating input', ({graph, expected}) => { + const sourceGraph = {...graph, id: 'a', dataLabels: {enabled: true, padding: 0}}; + const data = {timeline: [1, 2, 3, 4, 5], graphs: [sourceGraph]}; + const original = structuredClone(data); + sourceGraph._data?.forEach(Object.freeze); + Object.freeze(sourceGraph._data); + Object.freeze(sourceGraph.data); + Object.freeze(sourceGraph.dataLabels); + Object.freeze(sourceGraph); + + const config = shapeYagrConfig({data, libraryConfig: {}, theme: 'light'}); + + expect(config.series[0]).toMatchObject({ + ...sourceGraph, + data: expected, + }); + expect(data).toEqual(original); + expect(config.series[0]).not.toBe(sourceGraph); + expect(config.series[0].data).not.toBe(sourceGraph.data); + }); + + test('assigns unique ids without colliding with consumer ids or names', () => { + const graphs: YagrGraph[] = [ + {data: [10]}, + {id: 'chartkit-series-0', data: [20]}, + {name: 'Named', _data: [{value: 10, label: 'Plan'}]}, + {name: 'Named', _data: [{value: 30, label: 'Actual'}]}, + {name: 'Explicit', data: [40]}, + {id: 'Explicit', data: [50]}, + {name: 'chartkit-series-3', data: [60]}, + ]; + const originalGraphs = structuredClone(graphs); + const config = shapeYagrConfig({ + data: {timeline: [1], graphs}, + libraryConfig: {}, + theme: 'light', + }); + + expect(new Set(config.series.map((series) => series.id)).size).toBe(graphs.length); + expect(config.series[1].id).toBe('chartkit-series-0'); + expect(config.series[2].id).toBe('Named'); + expect(config.series[5].id).toBe('Explicit'); + expect(config.series[6].id).toBe('chartkit-series-3'); + expect(graphs).toEqual(originalGraphs); + }); + + test('preserves caller plugins and handlers', () => { + const draw = vi.fn(); + const processed = vi.fn(); + const plugin = vi.fn(() => ({uplot: {hooks: {}}})); + const editUplotOptions = vi.fn((options) => options); + const libraryConfig = { + plugins: {custom: plugin}, + hooks: {draw: [draw], processed: [processed]}, + editUplotOptions, + }; + const config = shapeYagrConfig({data: DATA, libraryConfig, theme: 'light'}); + + expect(config.plugins?.custom).toBe(plugin); + expect(config.hooks?.draw).toContain(draw); + expect(config.hooks?.processed).toContain(processed); + expect(libraryConfig.hooks).toEqual({draw: [draw], processed: [processed]}); + + const options = {width: 400, height: 300, series: []}; + expect(config.editUplotOptions?.(options)).toEqual(options); + expect(editUplotOptions).toHaveBeenCalledOnce(); + }); + }); + describe('GetUplotTimezoneAligner', () => { test.each<[YagrChartOptions | undefined, string | undefined, number, number]>([ // UTC diff --git a/src/plugins/yagr/plugins/YagrDataLabelsPlugin/index.ts b/src/plugins/yagr/plugins/YagrDataLabelsPlugin/index.ts new file mode 100644 index 00000000..b6f4359a --- /dev/null +++ b/src/plugins/yagr/plugins/YagrDataLabelsPlugin/index.ts @@ -0,0 +1,147 @@ +import type {RawSerieData, YagrPlugin} from '@gravity-ui/yagr'; + +import type {Yagr, YagrGraph} from '../../types'; + +type LabeledSeries = RawSerieData & Pick; + +type PositionedLabel = { + text: string; + x: number; + y: number; + left: number; + right: number; + top: number; + bottom: number; +}; + +function isOverlapping(first: PositionedLabel, second: PositionedLabel) { + return ( + first.left < second.right && + first.right > second.left && + first.top < second.bottom && + first.bottom > second.top + ); +} + +function drawLabels(yagr: Yagr, u: Yagr['uplot']) { + const seriesIndexById = new Map(u.series.map((series, index) => [series.id, index])); + const {ctx, bbox} = u; + const pixelRatio = ctx.canvas.width / u.width; + const style = getComputedStyle(yagr.root); + const fontSize = 11 * pixelRatio; + const right = bbox.left + bbox.width; + const bottom = bbox.top + bbox.height; + const placedLabels: PositionedLabel[] = []; + + ctx.save(); + + try { + ctx.beginPath(); + ctx.rect(bbox.left, bbox.top, bbox.width, bbox.height); + ctx.clip(); + ctx.font = `bold ${fontSize}px ${style.fontFamily}`; + ctx.fillStyle = yagr.utils.colors.parse('var(--g-color-text-secondary)'); + ctx.textAlign = 'center'; + ctx.textBaseline = 'bottom'; + + // Process later input series first so their labels take priority. + [...yagr.config.series].reverse().forEach((series: LabeledSeries) => { + if (series.id === undefined) { + return; + } + + const seriesIndex = seriesIndexById.get(series.id); + if (!seriesIndex) { + return; + } + + const uplotSeries = u.series[seriesIndex]; + if (uplotSeries.show === false || uplotSeries.showInGraph === false) { + return; + } + + const type = + uplotSeries.type ?? series.type ?? yagr.config.chart.series?.type ?? 'line'; + + if (type !== 'line' || !series.dataLabels?.enabled) { + return; + } + + const padding = (series.dataLabels.padding ?? 5) * pixelRatio; + const scale = uplotSeries.scale || 'y'; + const labels: PositionedLabel[] = []; + + series.data.forEach((rawValue, pointIndex) => { + const label = series._data?.[pointIndex]?.label ?? String(rawValue); + const time = u.data[0][pointIndex]; + const value = u.data[seriesIndex][pointIndex]; + + if ( + !label || + rawValue === null || + time === undefined || + value === null || + value === undefined || + !Number.isFinite(value) + ) { + return; + } + + const x = u.valToPos(time, 'x', true); + const y = u.valToPos(value, scale, true); + + if ( + !Number.isFinite(x) || + !Number.isFinite(y) || + x < bbox.left || + x > right || + y < bbox.top || + y > bottom + ) { + return; + } + + const metrics = ctx.measureText(label); + const halfWidth = Math.min(metrics.width, bbox.width) / 2; + + const labelX = Math.max(bbox.left + halfWidth, Math.min(x, right - halfWidth)); + const labelY = Math.max( + bbox.top + Math.max(0, padding) + metrics.actualBoundingBoxAscent, + Math.min(y - padding, bottom - metrics.actualBoundingBoxDescent), + ); + + labels.push({ + text: label, + x: labelX, + y: labelY, + left: labelX - metrics.width / 2, + right: labelX + metrics.width / 2, + top: labelY - metrics.actualBoundingBoxAscent, + bottom: labelY + metrics.actualBoundingBoxDescent, + }); + }); + + if (!series.dataLabels.allowOverlap) { + labels.sort((first, second) => first.top - second.top || first.left - second.left); + } + + for (const label of labels) { + if ( + !series.dataLabels.allowOverlap && + placedLabels.some((placed) => isOverlapping(label, placed)) + ) { + continue; + } + + ctx.fillText(label.text, label.x, label.y); + placedLabels.push(label); + } + }); + } finally { + ctx.restore(); + } +} + +export const YagrDataLabelsPlugin: YagrPlugin = (yagr) => ({ + uplot: {hooks: {draw: [(u) => drawLabels(yagr, u)]}}, +}); diff --git a/src/plugins/yagr/renderer/labels/__screenshots__/label.visual.test.tsx-screenshots/Yagr-canvas-labels-integration-line-labels-at-plot-boundaries-in-dar-1-chromium-linux.png b/src/plugins/yagr/renderer/labels/__screenshots__/label.visual.test.tsx-screenshots/Yagr-canvas-labels-integration-line-labels-at-plot-boundaries-in-dar-1-chromium-linux.png deleted file mode 100644 index 706f2ed35357d4367042059221bb5f07f55f7946..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8839 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 acsAei+E4MR+rU4VoKsiUhLzm1eEM%_DLiKY diff --git a/src/plugins/yagr/renderer/labels/__screenshots__/label.visual.test.tsx-screenshots/Yagr-canvas-labels-integration-normalized-stacked-column-labels-1-chromium-linux.png b/src/plugins/yagr/renderer/labels/__screenshots__/label.visual.test.tsx-screenshots/Yagr-canvas-labels-integration-normalized-stacked-column-labels-1-chromium-linux.png deleted file mode 100644 index bc9e31ca3c4e4175867b10e5244379b0275ce7e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7680 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 diff --git a/src/plugins/yagr/renderer/labels/__screenshots__/label.visual.test.tsx-screenshots/Yagr-canvas-labels-integration-positive-and-negative-stacked-column-1-chromium-linux.png b/src/plugins/yagr/renderer/labels/__screenshots__/label.visual.test.tsx-screenshots/Yagr-canvas-labels-integration-positive-and-negative-stacked-column-1-chromium-linux.png deleted file mode 100644 index be01fb099098b08280469d953e8f772a2f6c40d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5187 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 value === second.data[index]) - ); -} - -describe('Yagr canvas labels integration', () => { - beforeAll(async () => { - await import('../../YagrWidget.js'); - }); - - beforeEach(() => { - settings.set({plugins: [YagrPlugin]}); - }); - - afterEach(() => { - vi.restoreAllMocks(); - }); - - test.each(SCREENSHOT_CASES)('$name', async ({theme, data}) => { - let chart: Yagr | undefined; - const chartData: YagrWidgetData = { - ...data, - libraryConfig: { - ...data.libraryConfig, - chart: {...data.libraryConfig.chart, size: {width: 360, height: 240}}, - axes: {x: {values: (_u, values) => values.map(String)}}, - }, - }; - const screen = await render( -
- { - chart = widget ?? undefined; - }} - /> -
, - {providers: {theme}}, - ); - - await expect.poll(() => chart?.uplot.data[0]).toEqual(data.data.timeline); - await document.fonts.ready; - chart?.redraw(); - - await expect(screen.getByTestId('label-chart')).toMatchScreenshot(); - }); - - test('updates values and labels, removes and re-enables labels on the real widget', async () => { - const fillText = vi.spyOn(CanvasRenderingContext2D.prototype, 'fillText'); - const drawnTexts = () => fillText.mock.calls.map(([text]) => text); - let chart: Yagr | undefined; - const onChartLoad = ({widget}: {widget?: Yagr | null}) => { - chart = widget ?? undefined; - }; - const widget = (data: YagrWidgetData) => ( -
- -
- ); - const screen = await render(widget(DATA)); - await expect.poll(() => chart).toBeDefined(); - await expect.poll(drawnTexts).toContain('Plan'); - - const updated: YagrWidgetData = { - ...DATA, - data: { - timeline: [1, 2, 3], - graphs: [{data: [30, null, 0], pointLabels: ['Updated', 'Gap', 'Zero']}], - }, - }; - fillText.mockClear(); - await screen.rerender(widget(updated)); - await expect.poll(drawnTexts).toContain('Updated'); - expect(drawnTexts()).toContain('Zero'); - expect(drawnTexts()).not.toContain('Plan'); - expect(drawnTexts()).not.toContain('Gap'); - expect(chart?.uplot.data[1]).toEqual([30, null, 0]); - - const withoutLabels: YagrWidgetData = { - ...updated, - data: {...updated.data, graphs: [{data: [30, null, 0]}]}, - }; - fillText.mockClear(); - await screen.rerender(widget(withoutLabels)); - await expect.poll(() => fillText.mock.calls.length).toBeGreaterThan(0); - expect(drawnTexts()).not.toContain('Updated'); - expect(drawnTexts()).not.toContain('Zero'); - - fillText.mockClear(); - await screen.rerender(widget(updated)); - await expect.poll(drawnTexts).toContain('Updated'); - }); - - test('exports the current canvas with labels and after labels are removed', async () => { - let chart: Yagr | undefined; - await render( -
- { - chart = widget ?? undefined; - }} - /> -
, - ); - await expect.poll(() => chart).toBeDefined(); - if (!chart) { - throw new Error('Yagr widget was not loaded'); - } - - const widget = chart; - const readCanvas = () => { - const {ctx} = widget.uplot; - return ctx.getImageData(0, 0, ctx.canvas.width, ctx.canvas.height); - }; - const withLabels = await readPng(widget); - expect(hasSamePixels(withLabels, readCanvas())).toBe(true); - - widget.setConfig({series: [{data: [10, 20, 30]}]}); - await expect - .poll(async () => hasSamePixels(await readPng(widget), readCanvas())) - .toBe(true); - - const withoutLabels = await readPng(widget); - expect(hasSamePixels(withLabels, withoutLabels)).toBe(false); - }); -}); diff --git a/src/plugins/yagr/renderer/labels/__tests__/renderLabel.test.ts b/src/plugins/yagr/renderer/labels/__tests__/renderLabel.test.ts deleted file mode 100644 index 8a0cc10e..00000000 --- a/src/plugins/yagr/renderer/labels/__tests__/renderLabel.test.ts +++ /dev/null @@ -1,231 +0,0 @@ -import type {Yagr, YagrConfig} from '../../../types.js'; -import {getLabelHooks} from '../index.js'; - -function createYagrChart() { - const ctx = { - canvas: {width: 800}, - font: '', - save: vi.fn(), - restore: vi.fn(), - beginPath: vi.fn(), - rect: vi.fn(), - clip: vi.fn(), - fillText: vi.fn(), - measureText: vi.fn(() => ({width: 40})), - }; - const root = {}; - const sourceData: (number | null)[] = [20]; - const series = { - id: 'a', - show: true, - scale: 'y', - type: 'line', - $c: sourceData, - pointLabels: ['Prepared'], - }; - const uplot = { - ctx, - root, - width: 400, - bbox: {left: 20, top: 20, width: 760, height: 480}, - series: [{}, series], - data: [[1], [30]], - valToPos: vi.fn((value, scale) => (scale === 'x' ? value * 200 : value * 2)), - } as unknown as Yagr['uplot']; - const existingDraw = vi.fn(); - const originalHooks: YagrConfig['hooks'] = {draw: [existingDraw]}; - const hooks = getLabelHooks(originalHooks); - const chart = { - config: { - scales: {y: {stacking: true}}, - }, - }; - const handleProcessed = hooks.processed?.[0]; - const draw = hooks.draw?.[1]; - if (!handleProcessed || !draw) { - throw new Error('Expected Yagr label handlers'); - } - - handleProcessed({ - chart: chart as unknown as Yagr, - meta: {processTime: 0}, - }); - - return { - ctx, - uplot, - series, - chart, - hooks, - originalHooks, - existingDraw, - draw, - }; -} - -describe('Yagr point labels', () => { - beforeEach(() => { - vi.stubGlobal('getComputedStyle', () => ({ - fontFamily: 'Arial', - color: 'black', - getPropertyValue: () => '', - })); - }); - - afterEach(() => { - vi.unstubAllGlobals(); - }); - - test('preserves caller hooks without changing their arrays', () => { - const {hooks, originalHooks, existingDraw} = createYagrChart(); - - expect(originalHooks.draw).toEqual([existingDraw]); - expect(originalHooks.processed).toBeUndefined(); - expect(hooks.draw).toContain(existingDraw); - }); - - test('draws prepared plain text only for visible series, including zero values', () => { - const {ctx, uplot, series, draw} = createYagrChart(); - series.$c = [0]; - series.pointLabels = ['Plan **0**']; - - draw(uplot); - expect(ctx.fillText).toHaveBeenCalledWith('Plan **0**', 200, 52); - - series.show = false; - ctx.fillText.mockClear(); - draw(uplot); - expect(ctx.fillText).not.toHaveBeenCalled(); - - series.show = true; - uplot.series[1].showInGraph = false; - draw(uplot); - expect(ctx.fillText).not.toHaveBeenCalled(); - }); - - const columnCases = [ - { - name: 'positive stack', - value: 20, - coordinate: 30, - stacking: true, - normalized: undefined, - expectedY: 332, - }, - { - name: 'negative stack', - value: -20, - coordinate: -30, - stacking: true, - normalized: undefined, - expectedY: 412, - }, - { - name: 'negative column', - value: -20, - coordinate: -20, - stacking: false, - normalized: undefined, - expectedY: 392, - }, - { - name: 'percentage stack', - value: 20, - coordinate: 100, - stacking: true, - normalized: 66, - expectedY: 192, - }, - ]; - - test.each(columnCases)( - 'positions the label above the $name segment', - ({value, coordinate, stacking, normalized, expectedY}) => { - const {ctx, uplot, series, chart, draw} = createYagrChart(); - series.$c = [value]; - series.pointLabels = ['20']; - chart.config.scales.y.stacking = stacking; - uplot.series[1].type = 'column'; - uplot.series[1].normalizedData = normalized === undefined ? undefined : [normalized]; - uplot.data[1][0] = coordinate; - vi.mocked(uplot.valToPos).mockImplementation((v, scale) => - scale === 'x' ? v * 200 : 400 - v * 2, - ); - - draw(uplot); - - expect(ctx.fillText).toHaveBeenCalledWith('20', 200, expectedY); - }, - ); - - test('skips missing source values and coordinates even in stacked series', () => { - const {ctx, uplot, series, draw} = createYagrChart(); - series.$c = [null]; - draw(uplot); - expect(ctx.fillText).not.toHaveBeenCalled(); - - series.$c = [0]; - uplot.data[1][0] = null; - draw(uplot); - expect(ctx.fillText).not.toHaveBeenCalled(); - }); - - test('keeps constant column labels inside the plot at the upper scale boundary', () => { - const {ctx, uplot, series, draw} = createYagrChart(); - series.$c = [50, 50]; - series.pointLabels = ['50', '50']; - uplot.series[1].type = 'column'; - uplot.data[0] = [1, 2]; - uplot.data[1] = [50, 50]; - vi.mocked(uplot.valToPos).mockImplementation((value, scale) => - scale === 'x' ? value * 200 : 220 - value * 4, - ); - - draw(uplot); - - expect(ctx.font).toBe('500 24px Arial'); - expect(ctx.fillText.mock.calls).toEqual([ - ['50', 200, 44], - ['50', 400, 44], - ]); - }); - - test('keeps labels within the left, right and bottom plot boundaries', () => { - const {ctx, uplot, series, draw} = createYagrChart(); - series.$c = [20, 20, 20]; - series.pointLabels = ['20', '20', '20']; - uplot.data[0] = [20, 780, 400]; - uplot.data[1] = [200, 200, 500]; - vi.mocked(uplot.valToPos).mockImplementation((value) => value); - - draw(uplot); - - expect(ctx.fillText.mock.calls).toEqual([ - ['20', 40, 192], - ['20', 760, 192], - ['20', 400, 492], - ]); - }); - - test('does not move labels of points outside the plot into view', () => { - const {ctx, uplot, series, draw} = createYagrChart(); - series.$c = [20, 20, 20, 20]; - series.pointLabels = ['20', '20', '20', '20']; - uplot.data[0] = [19, 781, 400, 400]; - uplot.data[1] = [200, 200, 19, 501]; - vi.mocked(uplot.valToPos).mockImplementation((value) => value); - - draw(uplot); - - expect(ctx.fillText).not.toHaveBeenCalled(); - }); - - test('hides labels wider than the plot', () => { - const {ctx, uplot, draw} = createYagrChart(); - ctx.measureText.mockReturnValue({width: 800}); - - draw(uplot); - - expect(ctx.fillText).not.toHaveBeenCalled(); - }); -}); diff --git a/src/plugins/yagr/renderer/labels/index.ts b/src/plugins/yagr/renderer/labels/index.ts deleted file mode 100644 index e022d776..00000000 --- a/src/plugins/yagr/renderer/labels/index.ts +++ /dev/null @@ -1 +0,0 @@ -export {getLabelHooks} from './renderLabels'; diff --git a/src/plugins/yagr/renderer/labels/renderLabels.ts b/src/plugins/yagr/renderer/labels/renderLabels.ts deleted file mode 100644 index 114ed5b1..00000000 --- a/src/plugins/yagr/renderer/labels/renderLabels.ts +++ /dev/null @@ -1,116 +0,0 @@ -import type {Yagr, YagrConfig, YagrSeriesPointLabels} from '../../types'; - -const LABEL_OFFSET = 4; -const LABEL_FONT_SIZE = 12; -const LABEL_FONT_WEIGHT = 500; - -function renderLabels(u: Yagr['uplot'], chart: Yagr) { - const chartSeries: (Yagr['uplot']['series'][number] & YagrSeriesPointLabels)[] = u.series; - if (!chartSeries.some((series) => series.pointLabels?.length)) { - return; - } - - const {ctx, bbox} = u; - const pixelRatio = ctx.canvas.width / u.width; - const style = getComputedStyle(u.root); - const labelHeight = LABEL_FONT_SIZE * pixelRatio; - const offset = LABEL_OFFSET * pixelRatio; - const plotRight = bbox.left + bbox.width; - const plotBottom = bbox.top + bbox.height; - - ctx.save(); - try { - ctx.beginPath(); - ctx.rect(bbox.left, bbox.top, bbox.width, bbox.height); - ctx.clip(); - ctx.font = `${LABEL_FONT_WEIGHT} ${labelHeight}px ${style.fontFamily}`; - ctx.fillStyle = style.getPropertyValue('--g-color-text-primary') || style.color; - ctx.textAlign = 'center'; - ctx.textBaseline = 'bottom'; - - chartSeries.forEach((series, seriesIndex) => { - if ( - !seriesIndex || - !series.show || - series.showInGraph === false || - !series.pointLabels - ) { - return; - } - - const scale = series.scale || 'y'; - const stacking = chart.config.scales?.[scale]?.stacking; - series.pointLabels.forEach((label, pointIndex) => { - const value = series.$c[pointIndex]; - const coordinate = u.data[seriesIndex][pointIndex]; - if ( - label === null || - label === '' || - typeof value !== 'number' || - !Number.isFinite(value) || - coordinate === null || - coordinate === undefined || - !Number.isFinite(coordinate) - ) { - return; - } - - const x = u.valToPos(u.data[0][pointIndex], 'x', true); - let y = u.valToPos(coordinate, scale, true); - if (series.type === 'column') { - const segmentValue = series.normalizedData?.[pointIndex] ?? value; - const base = stacking ? coordinate - segmentValue : 0; - y = Math.min(y, u.valToPos(base, scale, true)); - } - - if ( - !Number.isFinite(x) || - !Number.isFinite(y) || - x < bbox.left || - x > plotRight || - y < bbox.top || - y > plotBottom - ) { - return; - } - - const labelWidth = ctx.measureText(label).width; - if (labelWidth > bbox.width || labelHeight > bbox.height) { - return; - } - - const halfWidth = labelWidth / 2; - const labelX = Math.max(bbox.left + halfWidth, Math.min(x, plotRight - halfWidth)); - const labelY = Math.max(bbox.top + labelHeight, Math.min(y - offset, plotBottom)); - - ctx.fillText(label, labelX, labelY); - }); - }); - } finally { - ctx.restore(); - } -} - -export function getLabelHooks(existingHooks: YagrConfig['hooks'] = {}) { - let chart: Yagr | undefined; - const hooks: YagrConfig['hooks'] = {...existingHooks}; - - hooks.processed = [ - ...(hooks.processed || []), - (event) => { - chart = event.chart; - }, - ]; - - hooks.draw = [ - ...(hooks.draw || []), - (u) => { - if (chart) { - chart.canvas = u.ctx.canvas; - renderLabels(u, chart); - } - }, - ]; - - return hooks; -} diff --git a/src/plugins/yagr/renderer/utils.ts b/src/plugins/yagr/renderer/utils.ts index 77629c51..f9d22afa 100644 --- a/src/plugins/yagr/renderer/utils.ts +++ b/src/plugins/yagr/renderer/utils.ts @@ -3,11 +3,21 @@ import {defaults} from '@gravity-ui/yagr'; import {settings} from '../../../libs'; import {merge} from '../../../utils/merge'; -import type {MinimalValidConfig, Yagr, YagrChartOptions, YagrTheme, YagrWidgetData} from '../types'; +import {YagrDataLabelsPlugin} from '../plugins/YagrDataLabelsPlugin'; +import type { + MinimalValidConfig, + Yagr, + YagrChartOptions, + YagrConfig, + YagrGraph, + YagrTheme, + YagrWidgetData, +} from '../types'; -import {getLabelHooks} from './labels'; import {getRenderTooltip} from './tooltip'; +const GRAPH_ID_PREFIX = 'chartkit-series'; + const TOOLTIP_HEADER_CLASS_NAME = '_tooltip-header'; const TOOLTIP_LIST_CLASS_NAME = '_tooltip-list'; @@ -152,12 +162,55 @@ export const getUplotTimezoneAligner = return new Date(browserDate.valueOf() - uPlotOffset); }; +function getGraphId(index: number) { + return `${GRAPH_ID_PREFIX}-${index}`; +} + +function prepareSeries(graphs: YagrGraph[]) { + const knownIds = new Set(); + const usedIds = new Set(); + + for (const graph of graphs) { + const id = graph.id || graph.name; + if (id) { + knownIds.add(id); + } + + if (graph.id) { + usedIds.add(graph.id); + } + } + + return graphs.map((graph, index) => { + let id = graph.id || graph.name; + if (!id || (!graph.id && usedIds.has(id))) { + id = getGraphId(index); + while (knownIds.has(id)) { + id = `_${id}`; + } + knownIds.add(id); + } + + usedIds.add(id); + + return { + ...graph, + id, + data: graph._data?.length + ? graph._data.map((point) => point.value) + : (graph.data ?? []).slice(), + dataLabels: graph.dataLabels && {...graph.dataLabels}, + }; + }); +} + export const shapeYagrConfig = (args: ShapeYagrConfigArgs): MinimalValidConfig => { const {data, libraryConfig, theme} = args; const config: MinimalValidConfig = { ...libraryConfig, timeline: data.timeline, - series: data.graphs, + series: prepareSeries(data.graphs), + plugins: {...libraryConfig.plugins, chartKitDataLabels: YagrDataLabelsPlugin}, }; const {timeZone} = data; @@ -194,16 +247,23 @@ export const shapeYagrConfig = (args: ShapeYagrConfigArgs): MinimalValidConfig = config.tooltip.sort = config.tooltip.sort || ((a, b) => b.rowIdx - a.rowIdx); } - config.axes = config.axes || {}; + config.axes = {...config.axes}; const xAxis = config.axes[defaults.DEFAULT_X_SCALE]; - config.editUplotOptions = (opts) => ({ - ...opts, - tzDate: timeZone ? getUplotTimezoneAligner(config.chart, timeZone) : undefined, - }); + config.editUplotOptions = (opts) => { + const options = { + ...opts, + tzDate: timeZone ? getUplotTimezoneAligner(config.chart, timeZone) : opts.tzDate, + }; + + return libraryConfig.editUplotOptions?.(options) ?? options; + }; if (xAxis && !xAxis.values) { - xAxis.values = getXAxisFormatter(config.chart.timeMultiplier, timeZone); + config.axes[defaults.DEFAULT_X_SCALE] = { + ...xAxis, + values: getXAxisFormatter(config.chart.timeMultiplier, timeZone), + }; } if (!xAxis) { @@ -212,7 +272,32 @@ export const shapeYagrConfig = (args: ShapeYagrConfigArgs): MinimalValidConfig = }; } - config.hooks = getLabelHooks(config.hooks); + config.hooks = getExportCanvasHooks(config.hooks); return config; }; + +// Yagr can retain a detached canvas after updates, so PNG exports need the current canvas. +// TODO: Remove in the follow-up Yagr upgrade PR. +// https://github.com/gravity-ui/chartkit/issues/970 +function getExportCanvasHooks(existingHooks: YagrConfig['hooks'] = {}): YagrConfig['hooks'] { + let chart: Yagr | undefined; + + return { + ...existingHooks, + processed: [ + ...(existingHooks.processed || []), + (event) => { + chart = event.chart; + }, + ], + draw: [ + ...(existingHooks.draw || []), + (u) => { + if (chart) { + chart.canvas = u.ctx.canvas; + } + }, + ], + }; +} diff --git a/src/plugins/yagr/types.ts b/src/plugins/yagr/types.ts index 4a0df259..47c309b6 100644 --- a/src/plugins/yagr/types.ts +++ b/src/plugins/yagr/types.ts @@ -19,14 +19,45 @@ export type YagrWidgetProps = ChartKitProps<'yagr'> & { id: string; }; -export type YagrSeriesPointLabels = { - /** Prepared plain-text labels in timeline order. Empty, null, and missing entries hide a label. */ - pointLabels?: (string | null)[]; -}; +export interface YagrDataPoint { + value: number | string | null; + /** Plain text; null or omitted uses the value, an empty string hides the label. */ + label?: string | null; +} + +export interface YagrDataLabels { + /** Show line data labels. Defaults to false. */ + enabled?: boolean; + /** + * Distance from the point center to the label's bottom edge in CSS pixels. Defaults to 5. + */ + padding?: number; + /** + * Draw labels even when they overlap other labels. Defaults to false. + */ + allowOverlap?: boolean; +} + +export type YagrGraph = Omit & { + dataLabels?: YagrDataLabels; +} & ( + | { + data: RawSerieData['data']; + _data?: undefined; + } + | { + data?: RawSerieData['data']; + /** + * @experimental + * Raw data with labels + */ + _data: YagrDataPoint[]; + } + ); export type YagrWidgetData = { data: { - graphs: (RawSerieData & YagrSeriesPointLabels)[]; + graphs: YagrGraph[]; timeline: number[]; /** * Allow to setup timezone for X axis and tooltip's header.