From 732ece092a26b36a096d0dec4e0a2fe21c09b9ee Mon Sep 17 00:00:00 2001 From: "Irina V. Kuzmina" Date: Fri, 13 Nov 2026 17:49:11 +0300 Subject: [PATCH] feat(indicator): add secondary values and number formatting (cherry picked from commit 860e627c7c95fc581030b949332d76372dd5e9c4) Adapt the backport to release/v8: retain lodash and the default renderer export, update the icons lock entry, and use UIKit 7 label metrics in visual assertions. Check the published indicator types with v8 bundler and node resolution in CI. --- .github/workflows/ci.yml | 2 + .storybook/preview-head.html | 4 + docs/indicator.md | 187 ++++++++ package-lock.json | 7 +- package.json | 2 + scripts/check-build.mjs | 169 +++++++ .../ErrorBoundary/ErrorBoundary.tsx | 4 +- ...-in-album-orientation-1-chromium-linux.png | Bin 69061 -> 65251 bytes ...-portrait-orientation-1-chromium-linux.png | Bin 25567 -> 23225 bytes ...l-tests-default-state-1-chromium-linux.png | Bin 10051 -> 10812 bytes ...endent-number-formats-1-chromium-linux.png | Bin 0 -> 6354 bytes ...tests-secondary-value-1-chromium-linux.png | Bin 0 -> 44090 bytes ...hout-color-or-caption-1-chromium-linux.png | Bin 0 -> 6383 bytes ...with-a-downward-arrow-1-chromium-linux.png | Bin 0 -> 8206 bytes .../__stories__/Indicator.stories.tsx | 84 +++- .../__tests__/Indicator.visual.test.tsx | 440 +++++++++++++++++- .../indicator/__tests__/normalize.test.ts | 100 ++++ src/plugins/indicator/index.ts | 2 +- src/plugins/indicator/normalize.ts | 77 +++ src/plugins/indicator/public-types.ts | 54 +++ .../indicator/renderer/IndicatorItem.tsx | 39 +- .../renderer/IndicatorSecondaryValue.tsx | 63 +++ .../indicator/renderer/IndicatorWidget.scss | 78 ++++ .../indicator/renderer/IndicatorWidget.tsx | 51 +- .../renderer/__tests__/utils.test.ts | 93 ++++ src/plugins/indicator/renderer/utils.ts | 37 ++ src/plugins/indicator/types.ts | 57 ++- .../format-number/format-number.test.ts | 43 +- .../shared/format-number/format-number.ts | 83 ++-- src/plugins/shared/format-number/types.ts | 1 + src/types/index.ts | 3 +- src/types/widget.ts | 2 +- test-utils/tester.html | 24 + vitest.config.ts | 4 + 34 files changed, 1595 insertions(+), 115 deletions(-) create mode 100644 .storybook/preview-head.html create mode 100644 docs/indicator.md create mode 100644 scripts/check-build.mjs create mode 100644 src/plugins/indicator/__screenshots__/Indicator.visual.test.tsx-screenshots/Indicator-visual-tests-independent-number-formats-1-chromium-linux.png create mode 100644 src/plugins/indicator/__screenshots__/Indicator.visual.test.tsx-screenshots/Indicator-visual-tests-secondary-value-1-chromium-linux.png create mode 100644 src/plugins/indicator/__screenshots__/Indicator.visual.test.tsx-screenshots/Indicator-visual-tests-secondary-value-below-label-without-color-or-caption-1-chromium-linux.png create mode 100644 src/plugins/indicator/__screenshots__/Indicator.visual.test.tsx-screenshots/Indicator-visual-tests-secondary-value-below-text-with-a-downward-arrow-1-chromium-linux.png create mode 100644 src/plugins/indicator/__tests__/normalize.test.ts create mode 100644 src/plugins/indicator/normalize.ts create mode 100644 src/plugins/indicator/public-types.ts create mode 100644 src/plugins/indicator/renderer/IndicatorSecondaryValue.tsx create mode 100644 src/plugins/indicator/renderer/__tests__/utils.test.ts create mode 100644 src/plugins/indicator/renderer/utils.ts create mode 100644 test-utils/tester.html diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 78fe9d4a..5e498ebd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -94,3 +94,5 @@ jobs: run: npm ci - name: Build run: npm run build + - name: Check Build + run: npm run test:build diff --git a/.storybook/preview-head.html b/.storybook/preview-head.html new file mode 100644 index 00000000..fea6dc98 --- /dev/null +++ b/.storybook/preview-head.html @@ -0,0 +1,4 @@ + diff --git a/docs/indicator.md b/docs/indicator.md new file mode 100644 index 00000000..65cdc4c7 --- /dev/null +++ b/docs/indicator.md @@ -0,0 +1,187 @@ +# Indicator + +The indicator displays one or more values with optional titles. + +Register `IndicatorPlugin` from `@gravity-ui/chartkit/indicator` and pass the +configuration to ``: + +```tsx +import ChartKit, {settings, type ChartKitProps} from '@gravity-ui/chartkit'; +import {IndicatorPlugin} from '@gravity-ui/chartkit/indicator'; + +settings.set({plugins: [IndicatorPlugin]}); + +const data: ChartKitProps<'indicator'>['data'] = { + data: [ + { + title: 'Revenue', + value: { + value: 1539577, + numberFormat: {precision: 0, showRankDelimiter: true}, + }, + size: 'm', + secondaryValue: { + value: 0.124, + numberFormat: { + format: 'percent', + precision: 1, + signDisplay: 'exceptZero', + }, + caption: 'vs the previous month', + position: 'right', + color: 'var(--g-color-text-positive)', + view: 'label', + arrow: {direction: 'up', ariaLabel: 'Increase'}, + }, + }, + ], +}; + +; +``` + +With the English locale, this example displays `1,539,577` as the main value and +`+12.4%` as the secondary value. Strings render as supplied, including strings that look like numbers. +The application computes differences, chooses colors and localizes captions. + +## Configuration + +The widget configuration contains a `data` array with one entry per indicator. +Use `ChartKitProps<'indicator'>['data']` for configurations with `value` +or a mix of new and legacy items. Use `ChartKitProps<'indicator'>` for the props +of a wrapper around ``. + +`IndicatorWidgetData` and `IndicatorWidgetDataItem` retain the legacy contract +with required `content.current`, so existing TypeScript wrappers and interfaces +can keep using them. + +| Item property | Description | Default | +| ---------------- | ------------------------------------------------------------------------- | ------------------------------------- | +| `value` | Main value | Required unless using the legacy form | +| `secondaryValue` | Additional value | None | +| `title` | Text displayed above the main value | None | +| `size` | `s`, `m`, `l`, or `xl`; controls both values | `m` | +| `nowrap` | Truncate the title to one line and show its full text in a native tooltip | `false` | + +Both values accept `value`, `formatNumber`, `numberFormat`, and `color`. + +Set the widget's `defaultColor` to provide a fallback color for primary values. +`value.color` overrides it. Secondary values have their own `color`. + +## Secondary value + +| Secondary value property | Description | Default | +| ------------------------ | -------------------------------------------------------------------------------- | ------------------ | +| `value` | A number or an already formatted string | Required | +| `formatNumber` | A custom `(value: number) => string` formatter; overrides `numberFormat` | None | +| `numberFormat` | Formatting options applied to this value | None | +| `caption` | A caption (`ReactNode`); string captions also have a native tooltip | None | +| `position` | `bottom` or `right` | `bottom` | +| `color` | A CSS color for the value and arrow, including theme variables | Primary text color | +| `view` | `text` or `label`; the label background is a 15% tint of `color` | `text` | +| `arrow.direction` | `up` or `down`, chosen explicitly by the application | None | +| `arrow.ariaLabel` | A localized accessible label for the arrow, for example `Increase` or `Decrease` | None | + +Provide `arrow.ariaLabel` when the arrow conveys information beyond the displayed +value. The application localizes this label. Without a label, the arrow is +decorative, so its meaning should be conveyed by the value or caption as well. + +## Number formatting + +Set `value.numberFormat` for the main value and +`secondaryValue.numberFormat` for the secondary value. The two configurations are +independent and accept the following options: + +| Option | Description | Default | +| ------------------- | ------------------------------------------------------------------------------------------ | -------------------- | +| `format` | `number` or `percent`; percent multiplies the value by 100 | `number` | +| `precision` | Fraction digits, or `auto` for adaptive precision | No fixed precision | +| `showRankDelimiter` | Group thousands | `true` | +| `unit` | `auto`, `k`, `m`, `b`, `t`, or `null` for no scaling | No scaling | +| `unitRate` | Scale index: `0` for units, `1` for thousands, through `4` for trillions; overrides `unit` | Determined by `unit` | +| `multiplier` | Multiply the number before formatting | `1` | +| `prefix` | Text prepended to the formatted value | Empty string | +| `postfix` | Text appended to the formatted value | Empty string | +| `lang` | Locale override | `settings.lang` | +| `signDisplay` | `auto`, `always`, `never` or `exceptZero` | `auto` | + +`lang` accepts an `Intl.NumberFormat` locale, including regional tags such as +`en-US` and `ru-RU`. Unit labels use Russian for `ru` locales and English otherwise. + +With `format: 'percent'`, the multiplier is always `100`; a supplied `multiplier` +is ignored. + +For the numeric main value, formatting priority is: + +1. The local `value.formatNumber` callback. +2. Explicit `value.numberFormat` options, applied by ChartKit's built-in formatter. +3. The widget's `formatNumber` callback. It receives the number and the complete + `value` object, or the legacy `content.current` object including application metadata. +4. Plain text if no callback or options are supplied. + +For the numeric secondary value, formatting priority is: + +1. The local `secondaryValue.formatNumber` callback. +2. Explicit `secondaryValue.numberFormat` options. +3. Plain text if no callback or options are supplied. + +Local callbacks receive the number and return its display string, including any +sign or unit. The widget's callback applies only to main values; it can serve as +a shared default for multiple indicators. Each value can independently provide +a local callback or options: + +```ts +const data: ChartKitProps<'indicator'>['data'] = { + data: [ + { + value: {value: 1200, formatNumber: (value) => `${value} USD`}, + secondaryValue: { + value: 0.124, + numberFormat: {format: 'percent', precision: 1}, + }, + }, + ], +}; +``` + +An empty `numberFormat` object `{}` selects the built-in defaults and overrides +the widget's callback. The built-in formatter uses `settings.lang` unless +`numberFormat.lang` is specified. Strings bypass all formatters. To display a +missing value, supply a string such as `value: '—'` and omit `arrow`. + +`numberFormat.signDisplay` follows `Intl.NumberFormat` semantics: `auto`, `always`, +`never` or `exceptZero`. For example, `exceptZero` shows a plus sign for positive +values and omits the sign for values rounded to zero. + +## Legacy configuration + +The legacy form supplies the main value through `content.current.value` and its +color through the item-level `color` property: + +```tsx +import type {IndicatorWidgetData} from '@gravity-ui/chartkit/indicator'; + +const data: IndicatorWidgetData = { + data: [ + { + title: 'Revenue', + content: {current: {value: 1539577}}, + color: 'var(--g-color-text-positive)', + }, + ], +}; + + value.toLocaleString('en-US')} />; +``` + +The item also accepts `title`, `size`, `nowrap`, and `secondaryValue` as described +above. The widget's `defaultColor` is used when the item has no color. + +For a numeric main value, `formatNumber` receives the number and the complete +`content.current` object, including application metadata. Fields inside +`content.current` other than `value`, including `color`, `formatNumber`, and `numberFormat`, are +formatter metadata and do not configure the display. Strings render as supplied. + +When an item supplies both forms, `value` determines the main value. +If `value.color` is omitted, the item-level `color` is used. An explicitly +empty `value.color` uses `defaultColor`. diff --git a/package-lock.json b/package-lock.json index f4441795..5c8662f2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,6 +13,7 @@ "@gravity-ui/charts": "^1.73.1", "@gravity-ui/date-utils": "^2.1.0", "@gravity-ui/i18n": "^1.0.0", + "@gravity-ui/icons": "^2.23.1", "@gravity-ui/yagr": "^5.0.0", "afterframe": "^1.0.2", "lodash": "^4.17.21", @@ -1603,9 +1604,9 @@ "integrity": "sha512-jZotOX73lMVARsNZ5L8rquDhyCIcHnX7GwT32m6vrnqy6iKBfBdOuAnAalUbnoVJoasfvYiSyX3kwusetyZgfQ==" }, "node_modules/@gravity-ui/icons": { - "version": "2.16.0", - "resolved": "https://registry.npmjs.org/@gravity-ui/icons/-/icons-2.16.0.tgz", - "integrity": "sha512-AMjPSO+7yPpvcCa9k+ZFNOZ+8cmIauLyRMswhoyfQ7SeoJOVzsAa2OP/B+Dd+AZRvzTaeJha4m2iEk93JvAklA==", + "version": "2.23.1", + "resolved": "https://registry.npmjs.org/@gravity-ui/icons/-/icons-2.23.1.tgz", + "integrity": "sha512-sinT5jSWuP0KCYPJVsl4PiTnZUNQ3h4BgPazdcVf/nTNlZhsbDivfuLFSqCt5dC/Tn3NzhrTWJXqhlBQtF710Q==", "license": "MIT", "dependencies": { "tslib": "^2.8.1" diff --git a/package.json b/package.json index 26cae29c..1e087ec3 100644 --- a/package.json +++ b/package.json @@ -64,6 +64,7 @@ "@gravity-ui/charts": "^1.73.1", "@gravity-ui/date-utils": "^2.1.0", "@gravity-ui/i18n": "^1.0.0", + "@gravity-ui/icons": "^2.23.1", "@gravity-ui/yagr": "^5.0.0", "afterframe": "^1.0.2", "lodash": "^4.17.21", @@ -129,6 +130,7 @@ "test:coverage": "vitest run --project unit --coverage", "test:storybook": "vitest run --project storybook", "test:unit": "vitest run --project unit", + "test:build": "node scripts/check-build.mjs", "test:visual": "vitest run --project visual", "test:docker": "./scripts/playwright-docker.sh npm run test:visual --", "test:docker:update": "./scripts/playwright-docker.sh npm run test:visual -- --update", diff --git a/scripts/check-build.mjs b/scripts/check-build.mjs new file mode 100644 index 00000000..9204d584 --- /dev/null +++ b/scripts/check-build.mjs @@ -0,0 +1,169 @@ +#!/usr/bin/env node +// Run after npm run build. Check the published v8 declarations with bundler and legacy +// node resolution, including the legacy indicator contract and the new value configuration. +import {spawnSync} from 'node:child_process'; +import {mkdirSync, mkdtempSync, readFileSync, rmSync, symlinkSync, writeFileSync} from 'node:fs'; +import {createRequire} from 'node:module'; +import {tmpdir} from 'node:os'; +import {dirname, join, resolve} from 'node:path'; +import {execPath, exit, stderr, stdout} from 'node:process'; + +const ROOT = resolve(import.meta.dirname, '..'); +const {name} = JSON.parse(readFileSync(join(ROOT, 'package.json'), 'utf8')); +const require = createRequire(import.meta.url); +let failed = false; + +const CONSUMER_BASE = `import ChartKit, {settings} from '${name}'; +import type {ChartKitProps, ChartKitWidget} from '${name}'; +import {GravityChartsPlugin} from '${name}/gravity-charts'; +import {HighchartsPlugin} from '${name}/highcharts'; +import type {HighchartsWidgetData} from '${name}/highcharts'; +import {IndicatorPlugin} from '${name}/indicator'; +import type {IndicatorWidgetData, IndicatorWidgetDataItem} from '${name}/indicator'; +import {YagrPlugin} from '${name}/yagr'; + +settings.set({plugins: [GravityChartsPlugin, HighchartsPlugin, IndicatorPlugin, YagrPlugin]}); + +interface AppIndicator extends IndicatorWidgetDataItem {appId: string} +interface AppIndicatorData extends IndicatorWidgetData {appId: string} +type LegacyCurrent = IndicatorWidgetDataItem['content']['current']; +function readLegacyIndicator(item: IndicatorWidgetDataItem): string | number { + const current: LegacyCurrent = item.content.current; + return current.value; +} +function readLegacyWidget(data: ChartKitWidget['indicator']['data']): string | number | undefined { + return data.data?.[0].content.current.value; +} +function forwardLegacyData(data: ChartKitWidget[T]['data']): ChartKitProps['data'] { + return data; +} +const legacyIndicator: IndicatorWidgetDataItem = {content: {current: {value: 42, numberFormat: 'application metadata', formatNumber: 'application metadata', customMetadata: 'legacy'}}}; +const legacyIndicatorValue: string | number = legacyIndicator.content.current.value; +const legacyIndicatorData: IndicatorWidgetData = {data: [legacyIndicator]}; +ChartKit({type: 'indicator', data: legacyIndicatorData}); +type IndicatorInput = ChartKitProps<'indicator'>['data']; +type IndicatorInputItem = NonNullable[number]; +const numberFormat = {unitRate: 1, multiplier: 1000, precision: 1}; +const indicatorData: IndicatorInput = {data: [{value: {value: 42, numberFormat}, secondaryValue: {value: 1, arrow: {direction: 'up', ariaLabel: 'Increase'}}}]}; +const indicatorWithCallbacks: IndicatorInput = {data: [{value: {value: 42, formatNumber: (value) => String(value), numberFormat}, secondaryValue: {value: 1, formatNumber: (value) => String(value), numberFormat}}]}; +ChartKit({type: 'indicator', data: indicatorWithCallbacks}); +const publicIndicatorData: ChartKitWidget['indicator']['data'] = legacyIndicatorData; +const indicatorInput: IndicatorInput = {data: [legacyIndicator, ...indicatorData.data!]}; +const indicatorProps: ChartKitProps<'indicator'> = {type: 'indicator', data: indicatorInput}; +ChartKit(indicatorProps); +ChartKit({type: 'indicator', data: indicatorData}); + +type TooltipLine = Parameters>[0]['lines'][number]; +const tooltipFormat: Pick = {chartKitFormat: 'number', chartKitPrecision: 'auto', chartKitUnit: 'k'}; +export {ChartKit}; +`; + +const CONSUMER_CHECKS = ` +// @ts-expect-error the normalized indicator configuration is internal +import type {NormalizedIndicatorWidgetConfig} from '${name}/indicator'; +// @ts-expect-error the shared value shape is internal +import type {IndicatorValue} from '${name}/indicator'; +// @ts-expect-error clean configuration types are internal +import type {IndicatorWidgetConfig} from '${name}/indicator'; +// @ts-expect-error clean configuration item types are internal +import type {IndicatorWidgetConfigItem} from '${name}/indicator'; +// @ts-expect-error standalone formatting types are internal +import type {FormatNumberOptions} from '${name}/indicator'; +// @ts-expect-error the indicator value type must not degrade to any +const invalidIndicator: IndicatorInput = {data: [{value: {value: false}}]}; +// @ts-expect-error the new value configuration does not accept arbitrary metadata +const invalidValueMetadata: IndicatorInput = {data: [{value: {value: 42, customMetadata: 'new'}}]}; +// @ts-expect-error the new value configuration must reject misspelled display options +const invalidValueColor: IndicatorInput = {data: [{value: {value: 42, colour: 'green'}}]}; +// @ts-expect-error local callbacks must return strings +const invalidValueCallback: IndicatorInput = {data: [{value: {value: 42, formatNumber: () => 42}}]}; +// @ts-expect-error secondary callbacks must return strings +const invalidSecondaryCallback: IndicatorInput = {data: [{value: {value: 42}, secondaryValue: {value: 1, formatNumber: () => 1}}]}; +// @ts-expect-error the legacy value type must retain its original contract +const invalidLegacyValue: IndicatorWidgetDataItem['content']['current']['value'] = false; +// @ts-expect-error the legacy item type must keep content required +const invalidLegacyItem: IndicatorWidgetDataItem = {value: {value: 42}}; +// @ts-expect-error each indicator requires value or content.current +const emptyIndicator: IndicatorInput = {data: [{}]}; +// @ts-expect-error the extended indicator input must not widen other plugins' data +const invalidHighchartsInput: ChartKitProps<'highcharts'>['data'] = indicatorData; +// @ts-expect-error arrows use an object with a direction +const invalidArrow: NonNullable = {value: 1, arrow: 'up'}; +// @ts-expect-error arrow directions are restricted to up and down +const invalidDirection: NonNullable = {value: 1, arrow: {direction: 'left'}}; +// @ts-expect-error labelMode is not an indicator formatting option +const invalidNumberFormat: IndicatorInputItem = {value: {value: 1, numberFormat: {labelMode: 'percent'}}}; +// @ts-expect-error Highcharts tooltip precision must retain its original type +const invalidTooltipPrecision: TooltipLine['chartKitPrecision'] = true; +`; + +const CONSUMER = CONSUMER_BASE + CONSUMER_CHECKS; + +const CONSUMER_MODES = [ + { + label: 'moduleResolution bundler', + type: 'module', + options: {module: 'esnext', moduleResolution: 'bundler'}, + source: CONSUMER, + }, + { + label: 'moduleResolution node', + type: 'commonjs', + options: {module: 'commonjs', moduleResolution: 'node', esModuleInterop: true}, + source: CONSUMER, + }, +]; + +function typecheckConsumers() { + const tsc = require.resolve('typescript/bin/tsc'); + const dir = mkdtempSync(join(tmpdir(), 'chartkit-consumer-')); + try { + // The package resolves through a symlink to the repository, and its dependencies from the + // repository's node_modules (TypeScript resolves the symlink to its real path). + mkdirSync(join(dir, 'node_modules', dirname(name)), {recursive: true}); + symlinkSync(ROOT, join(dir, 'node_modules', name), 'dir'); + for (const [index, mode] of CONSUMER_MODES.entries()) { + const project = join(dir, `mode-${index}`); + mkdirSync(project); + writeFileSync(join(project, 'package.json'), JSON.stringify({type: mode.type})); + writeFileSync(join(project, 'consumer.ts'), mode.source); + // skipLibCheck as in a typical application: the check is on what the consumer sees. + // No @types are picked up: the scratch project has none. + writeFileSync( + join(project, 'tsconfig.json'), + JSON.stringify({ + compilerOptions: { + strict: true, + noEmit: true, + target: 'es2022', + skipLibCheck: true, + types: [], + ...mode.options, + }, + files: ['consumer.ts'], + }), + ); + const result = spawnSync(execPath, [tsc, '-p', project], { + cwd: project, + encoding: 'utf8', + }); + if (result.status === 0) { + stdout.write(`consumer (${mode.label}): types resolve\n`); + } else { + stderr.write( + `consumer (${mode.label}) fails to type-check:\n${result.stdout}${result.stderr}`, + ); + failed = true; + } + } + } finally { + rmSync(dir, {recursive: true, force: true}); + } +} + +typecheckConsumers(); + +if (failed) { + exit(1); +} +stdout.write('The built package preserves the indicator API in both resolution modes.\n'); diff --git a/src/components/ErrorBoundary/ErrorBoundary.tsx b/src/components/ErrorBoundary/ErrorBoundary.tsx index 2d45c1ab..2fca1981 100644 --- a/src/components/ErrorBoundary/ErrorBoundary.tsx +++ b/src/components/ErrorBoundary/ErrorBoundary.tsx @@ -2,13 +2,13 @@ import React from 'react'; import type {ChartKitError} from '../../libs'; import {CHARTKIT_ERROR_CODE} from '../../libs'; -import type {ChartKitOnError, ChartKitType, ChartKitWidget, RenderError} from '../../types'; +import type {ChartKitOnError, ChartKitProps, ChartKitType, RenderError} from '../../types'; import {getErrorMessage} from '../../utils/getErrorMessage'; type Props = { children: React.ReactNode; onError?: ChartKitOnError; - data: ChartKitWidget[ChartKitType]['data']; + data: ChartKitProps['data']; renderError?: RenderError; }; diff --git a/src/plugins/gravity-charts/__screenshots__/SplitTooltip.visual.test.tsx-screenshots/Split-tooltip-visual-tests-should-render-tooltip-in-album-orientation-1-chromium-linux.png b/src/plugins/gravity-charts/__screenshots__/SplitTooltip.visual.test.tsx-screenshots/Split-tooltip-visual-tests-should-render-tooltip-in-album-orientation-1-chromium-linux.png index 8e840b1f61bb0879a49bd51e8fc1a4dc6e9d0dce..348a919607e2919d1715d7a41b1e9eda64f94348 100644 GIT binary patch literal 65251 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 diff --git a/src/plugins/indicator/__screenshots__/Indicator.visual.test.tsx-screenshots/Indicator-visual-tests-default-state-1-chromium-linux.png b/src/plugins/indicator/__screenshots__/Indicator.visual.test.tsx-screenshots/Indicator-visual-tests-default-state-1-chromium-linux.png index 39336608276b98b720c04bac9ed69e9f1db30b35..92446f48b9109e6ca7c3019393fe7d57e382792d 100644 GIT binary patch literal 10812 zcmeHtXEfaF+INHy(Gq102GJ7?24S?ZV-TVxh@R**+7K;jik8s@(IZ5c=p}luLj=($ zj4~v8Z{hvRKIc4p?{}T&S?8?t@vOy%d+z%GUF~;W_Z@mq{SL(y#w!;tT%b@^lGnU& zfglR_=f6x0{IXiL&~o7dFQKyhZEa72)n;S+*ZUdxv;A#fD;6u^%rV7gJ(Cy$^^&3q z-cDOuKEtxy6`crobX4CZr8`ji!q+s+c{NHpHr^!><#~GV>ATe!^J==5DU1RvqP3Y* zS$GZ37#UKBQIvaTQ-pAs;wg{SQoqm~J`wNbx7@uqEMnf|XRkTq^GJ~IW-uo@jSYyHJtp(IjNZ}bDl}0+?jPjI+LE50m8y%y!b2`?)%)lQ(Xw& zp3rko0G|j=IE)P);(@!b5WUdy$xE@`X}SKQHFLfz>I<1TM)2GrVMv3^ zWv5zZgZm>i)yrLTKc*5<#R@Nk-VX|n-KwvlPSJ zY;*AUq(YyO5(o3ZzhL_t6B)Us47dmVLektD?pfhlu8*(WpefUu@BZvM4;I|5h&AET zB2NRGL?P5uq~)ZHc{Nh3W-Q{{q6vtPgin;c>|U<~^0#Jc&C@`4b|ARV8TF!?k6$&@ z5Z3vdzLI5>MuiOSaioBkOwCLJZXdx>rNN

4TRf#J$c@?0(cGEG?;k7?jf(V54N7 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 diff --git a/src/plugins/indicator/__screenshots__/Indicator.visual.test.tsx-screenshots/Indicator-visual-tests-independent-number-formats-1-chromium-linux.png b/src/plugins/indicator/__screenshots__/Indicator.visual.test.tsx-screenshots/Indicator-visual-tests-independent-number-formats-1-chromium-linux.png new file mode 100644 index 0000000000000000000000000000000000000000..d9bc02572b7a8c02704c43a8d4f9bd1ca8546301 GIT binary patch literal 6354 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 literal 0 HcmV?d00001 diff --git a/src/plugins/indicator/__screenshots__/Indicator.visual.test.tsx-screenshots/Indicator-visual-tests-secondary-value-1-chromium-linux.png b/src/plugins/indicator/__screenshots__/Indicator.visual.test.tsx-screenshots/Indicator-visual-tests-secondary-value-1-chromium-linux.png new file mode 100644 index 0000000000000000000000000000000000000000..8388d4cdb5cfd363ebbf05524f9ac7227c292d88 GIT binary patch literal 44090 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 literal 0 HcmV?d00001 diff --git a/src/plugins/indicator/__screenshots__/Indicator.visual.test.tsx-screenshots/Indicator-visual-tests-secondary-value-below-label-without-color-or-caption-1-chromium-linux.png b/src/plugins/indicator/__screenshots__/Indicator.visual.test.tsx-screenshots/Indicator-visual-tests-secondary-value-below-label-without-color-or-caption-1-chromium-linux.png new file mode 100644 index 0000000000000000000000000000000000000000..9ea69b4084739a8fb14d68d4acc547156ea818e5 GIT binary patch literal 6383 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 Ax&QzG literal 0 HcmV?d00001 diff --git a/src/plugins/indicator/__screenshots__/Indicator.visual.test.tsx-screenshots/Indicator-visual-tests-secondary-value-below-text-with-a-downward-arrow-1-chromium-linux.png b/src/plugins/indicator/__screenshots__/Indicator.visual.test.tsx-screenshots/Indicator-visual-tests-secondary-value-below-text-with-a-downward-arrow-1-chromium-linux.png new file mode 100644 index 0000000000000000000000000000000000000000..989ad93338777f84ee59f823af630d7ae5ae26e2 GIT binary patch literal 8206 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 { const [shown, setShown] = React.useState(false); const chartkitRef = React.useRef(undefined); - const resultData = cloneDeep(data); - - if (resultData.data) { - resultData.data[0].size = size; - resultData.data[0].color = color; - resultData.data[0].title = title; - resultData.data[0].nowrap = nowrap; - } + const resultData: ChartKitProps<'indicator'>['data'] = { + data: [{value: {value: 1539577973, color}, size, title, nowrap}], + }; if (!shown) { settings.set({plugins: [IndicatorPlugin]}); @@ -81,3 +63,59 @@ export const Showcase: StoryObj = { nowrap: {control: 'boolean'}, }, }; + +interface SecondaryValueStoryProps extends ChartStoryProps { + secondaryValuePosition: NonNullable['position']; + secondaryValue: Omit, 'position'>; +} + +export const WithSecondaryValue: StoryObj = { + render: ({color, size, title, nowrap, secondaryValuePosition, secondaryValue}) => { + settings.set({plugins: [IndicatorPlugin]}); + + return ( +

+ +
+ ); + }, + args: { + ...Showcase.args, + secondaryValuePosition: 'bottom', + secondaryValue: { + value: 0.124, + numberFormat: {format: 'percent', precision: 1, signDisplay: 'exceptZero'}, + caption: 'vs the previous month', + arrow: {direction: 'up', ariaLabel: 'Increase'}, + color: 'var(--g-color-text-positive)', + view: 'label', + }, + }, + argTypes: { + ...Showcase.argTypes, + secondaryValuePosition: { + control: 'radio', + options: ['bottom', 'right'], + }, + secondaryValue: { + control: 'object', + }, + }, +}; diff --git a/src/plugins/indicator/__tests__/Indicator.visual.test.tsx b/src/plugins/indicator/__tests__/Indicator.visual.test.tsx index 8e16c2c1..8bf2b1af 100644 --- a/src/plugins/indicator/__tests__/Indicator.visual.test.tsx +++ b/src/plugins/indicator/__tests__/Indicator.visual.test.tsx @@ -1,10 +1,13 @@ import React from 'react'; -import {render} from '../../../../test-utils/utils.js'; -import {ChartKit} from '../../../components/ChartKit.js'; -import {settings} from '../../../libs/index.js'; -import {IndicatorPlugin} from '../index.js'; -import type {IndicatorWidgetData} from '../types.js'; +import {page} from 'vitest/browser'; + +import {IndicatorPlugin} from '../'; +import {render} from '../../../../test-utils/utils'; +import {ChartKit} from '../../../components/ChartKit'; +import {settings} from '../../../libs'; +import type {IndicatorWidgetData, IndicatorWidgetDataItem} from '../public-types'; +import type {IndicatorWidgetConfigItem} from '../types'; const indicatorData: IndicatorWidgetData = { data: [ @@ -36,6 +39,27 @@ describe('Indicator visual tests', () => { await expect.element(screen.getByText('1539577973')).toBeVisible(); await expect(screen.getByTestId('indicator-wrapper')).toMatchScreenshot(); + + const legacyMarkup = screen.container.querySelector('.chartkit-indicator')?.innerHTML; + await screen.rerender( +
+ +
, + ); + await expect.element(screen.getByText('1539577973')).toBeVisible(); + expect(screen.container.querySelector('.chartkit-indicator')?.innerHTML).toBe(legacyMarkup); }); test('no data state', async () => { @@ -54,4 +78,410 @@ describe('Indicator visual tests', () => { await expect.element(screen.getByText('No data')).toBeVisible(); }); + + test('secondary value formatting and overflow', async () => { + settings.set({plugins: [IndicatorPlugin]}); + const item = { + title: 'Revenue', + content: {current: {value: 1200}}, + secondaryValue: { + value: 0.124, + numberFormat: { + format: 'percent', + precision: 1, + signDisplay: 'exceptZero', + }, + position: 'right', + caption: 'vs the previous month', + color: 'var(--g-color-text-positive)', + view: 'label', + arrow: {direction: 'up', ariaLabel: 'Increase'}, + }, + } satisfies IndicatorWidgetDataItem; + const renderIndicator = ( + dataItem: IndicatorWidgetConfigItem, + width: number | string = '100%', + ) => ( +
+ +
+ ); + const screen = await render(renderIndicator(item), options); + + await expect.element(screen.getByText('+12.4%', {exact: true})).toBeVisible(); + await expect.element(screen.getByRole('img', {name: 'Increase'})).toBeVisible(); + + const legacyMarkup = screen.container.querySelector('.chartkit-indicator')?.innerHTML; + await screen.rerender( + renderIndicator({ + title: 'Revenue', + value: {value: 1200}, + secondaryValue: { + value: 0.124, + numberFormat: {format: 'percent', precision: 1, signDisplay: 'exceptZero'}, + position: 'right', + caption: 'vs the previous month', + color: 'var(--g-color-text-positive)', + view: 'label', + arrow: {direction: 'up', ariaLabel: 'Increase'}, + }, + }), + ); + await expect.element(screen.getByRole('img', {name: 'Increase'})).toBeVisible(); + expect(screen.container.querySelector('.chartkit-indicator')?.innerHTML).toBe(legacyMarkup); + + for (const {width, size} of [ + {width: 300, size: 'm'}, + {width: 400, size: 'xl'}, + {width: 100, size: 'm'}, + ] as const) { + await screen.rerender( + renderIndicator( + { + ...item, + size, + content: {current: {value: 1539577973}}, + }, + width, + ), + ); + + const text = screen.getByText('+12.4%', {exact: true}).element(); + const secondary = screen.container.querySelector( + '.chartkit-indicator__secondary-value', + ); + const caption = screen.getByText('vs the previous month', {exact: true}).element(); + const scrollable = screen.container.querySelector('.chartkit-indicator__content'); + if (!secondary || !scrollable) { + throw new Error('Indicator content is missing'); + } + + const secondaryRect = secondary.getBoundingClientRect(); + const textRect = text.getBoundingClientRect(); + expect(textRect.left).toBeGreaterThanOrEqual(secondaryRect.left); + expect(textRect.right).toBeLessThanOrEqual(secondaryRect.right); + expect(caption.getBoundingClientRect().width).toBeGreaterThan(0); + expect(caption.getAttribute('title')).toBe('vs the previous month'); + expect(scrollable.scrollWidth).toBeGreaterThan(scrollable.clientWidth); + + scrollable.scrollLeft = scrollable.scrollWidth; + await expect + .poll(() => { + const viewport = scrollable.getBoundingClientRect(); + const value = text.getBoundingClientRect(); + const captionRect = caption.getBoundingClientRect(); + return ( + value.left >= viewport.left && + value.right <= viewport.right && + captionRect.left >= viewport.left && + captionRect.right <= viewport.right + ); + }) + .toBe(true); + } + }); + + test('secondary value below: text with a downward arrow', async () => { + settings.set({plugins: [IndicatorPlugin], lang: 'en'}); + + const screen = await render( +
+ +
, + options, + ); + + await expect.element(screen.getByText('-12.4%', {exact: true})).toBeVisible(); + await expect.element(screen.getByRole('img', {name: 'Decrease'})).toBeVisible(); + + const mainRect = screen.getByText('1200', {exact: true}).element().getBoundingClientRect(); + const secondaryRect = screen + .getByText('-12.4%', {exact: true}) + .element() + .getBoundingClientRect(); + expect(secondaryRect.top).toBeGreaterThanOrEqual(mainRect.bottom); + + await expect(screen.getByTestId('indicator-secondary-wrapper')).toMatchScreenshot(); + }); + + test('secondary value', async () => { + await page.viewport(1000, 600); + settings.set({plugins: [IndicatorPlugin]}); + const sizes = [ + {size: 's', labelHeight: 20, iconSize: 12, captionSize: 13}, + {size: 'm', labelHeight: 24, iconSize: 14, captionSize: 13}, + {size: 'l', labelHeight: 24, iconSize: 14, captionSize: 15}, + {size: 'xl', labelHeight: 28, iconSize: 16, captionSize: 15}, + ] as const; + const screen = await render( +
+ ({ + size, + title: `Revenue (${size})`, + value: {value: '$112.4M'}, + secondaryValue: { + value: '+13.4%', + position: 'right', + caption: 'vs the previous month', + color: 'var(--g-color-text-positive)', + view: 'label', + arrow: {direction: 'up', ariaLabel: 'Increase'}, + }, + })), + }} + /> +
, + options, + ); + + function getBaseline(element: Element) { + const marker = document.createElement('span'); + marker.style.cssText = + 'display: inline-block; width: 0; height: 0; vertical-align: baseline'; + element.append(marker); + const baseline = marker.getBoundingClientRect().top; + marker.remove(); + return baseline; + } + + for (const [index, item] of screen.container + .querySelectorAll('.chartkit-indicator__item') + .entries()) { + const expected = sizes[index]; + const main = item.querySelector('.chartkit-indicator__item-value'); + const label = item.querySelector('.g-label'); + const labelText = item.querySelector('.g-label__content'); + const icon = item.querySelector('.chartkit-indicator__secondary-value-arrow svg'); + const caption = item.querySelector('.chartkit-indicator__secondary-value-caption'); + if (!main || !label || !labelText || !icon || !caption) { + throw new Error('Indicator content is missing'); + } + expect(getComputedStyle(labelText).fontSize).toBe('13px'); + expect(getComputedStyle(labelText).lineHeight).toBe(`${expected.labelHeight}px`); + expect(getComputedStyle(caption).fontSize).toBe(`${expected.captionSize}px`); + expect(icon.getAttribute('width')).toBe(String(expected.iconSize)); + expect(icon.getAttribute('height')).toBe(String(expected.iconSize)); + const baseline = getBaseline(main); + const labelRect = label.getBoundingClientRect(); + const captionRect = caption.getBoundingClientRect(); + expect(labelRect.height).toBe(expected.labelHeight); + expect(Math.abs(labelRect.bottom - baseline)).toBeLessThan(1); + expect( + Math.abs( + captionRect.top + + captionRect.height / 2 - + (labelRect.top + labelRect.height / 2), + ), + ).toBeLessThan(1); + } + + await expect(screen.getByTestId('indicator-alignment-wrapper')).toMatchScreenshot(); + await page.viewport(400, 280); + }); + + test('secondary value below: label without color or caption', async () => { + settings.set({plugins: [IndicatorPlugin], lang: 'en'}); + + const screen = await render( +
+ +
, + options, + ); + + await expect.element(screen.getByText('12.4%', {exact: true})).toBeVisible(); + + const mainRect = screen.getByText('1200', {exact: true}).element().getBoundingClientRect(); + const secondaryRect = screen + .getByText('12.4%', {exact: true}) + .element() + .getBoundingClientRect(); + expect(secondaryRect.top).toBeGreaterThanOrEqual(mainRect.bottom); + + await expect(screen.getByTestId('indicator-secondary-wrapper')).toMatchScreenshot(); + }); + + test('independent number formats', async () => { + settings.set({plugins: [IndicatorPlugin], lang: 'en'}); + const formatNumber = vi.fn((_value: number, _options?: unknown) => 'custom result'); + const current = { + value: 1234.56, + precision: 2, + customMetadata: 'main value', + }; + const mainNumberFormat = {precision: 0, showRankDelimiter: true, postfix: ' USD'}; + const secondaryValue: NonNullable = { + value: 0.124, + numberFormat: {format: 'percent', precision: 1, signDisplay: 'exceptZero'}, + }; + const renderIndicator = (item: IndicatorWidgetConfigItem) => ( +
+ +
+ ); + const screen = await render( + renderIndicator({ + value: {value: current.value, numberFormat: mainNumberFormat}, + secondaryValue, + }), + options, + ); + + await expect.element(screen.getByText('1,235 USD', {exact: true})).toBeVisible(); + await expect.element(screen.getByText('+12.4%', {exact: true})).toBeVisible(); + expect(formatNumber).not.toHaveBeenCalled(); + await expect(screen.getByTestId('indicator-formats-wrapper')).toMatchScreenshot(); + + await screen.rerender(renderIndicator({content: {current}, secondaryValue})); + + await expect.element(screen.getByText('custom result', {exact: true})).toBeVisible(); + await expect.element(screen.getByText('+12.4%', {exact: true})).toBeVisible(); + expect(formatNumber).toHaveBeenCalledExactlyOnceWith(current.value, current); + expect(formatNumber.mock.calls[0][1]).toBe(current); + + formatNumber.mockClear(); + await screen.rerender( + renderIndicator({ + value: {value: current.value, numberFormat: mainNumberFormat}, + secondaryValue: {value: secondaryValue.value}, + }), + ); + + await expect.element(screen.getByText('1,235 USD', {exact: true})).toBeVisible(); + await expect.element(screen.getByText('0.124', {exact: true})).toBeVisible(); + expect(formatNumber).not.toHaveBeenCalled(); + + formatNumber.mockClear(); + const value = {value: 0, color: 'green'}; + await screen.rerender(renderIndicator({value, secondaryValue})); + await expect.element(screen.getByText('custom result', {exact: true})).toBeVisible(); + expect(formatNumber).toHaveBeenCalledExactlyOnceWith(0, value); + expect(formatNumber.mock.calls[0][1]).toBe(value); + + formatNumber.mockClear(); + const localMainFormatter = vi.fn(() => 'main callback'); + const localSecondaryFormatter = vi.fn(() => 'secondary callback'); + await screen.rerender( + renderIndicator({ + value: { + value: current.value, + formatNumber: localMainFormatter, + numberFormat: mainNumberFormat, + }, + secondaryValue: {...secondaryValue, formatNumber: localSecondaryFormatter}, + }), + ); + await expect.element(screen.getByText('main callback', {exact: true})).toBeVisible(); + await expect.element(screen.getByText('secondary callback', {exact: true})).toBeVisible(); + expect(localMainFormatter).toHaveBeenCalledExactlyOnceWith(current.value); + expect(localSecondaryFormatter).toHaveBeenCalledExactlyOnceWith(secondaryValue.value); + expect(formatNumber).not.toHaveBeenCalled(); + }); + + test('legacy formatter metadata does not override the default color', async () => { + settings.set({plugins: [IndicatorPlugin]}); + const current = { + value: 42, + color: 'red', + numberFormat: 'formatter metadata', + formatNumber: vi.fn(() => 'formatter metadata'), + customMetadata: 'legacy', + }; + const formatNumber = vi.fn((value: number, _options?: unknown) => String(value)); + const screen = await render( + , + options, + ); + await expect.element(screen.getByText('42', {exact: true})).toBeVisible(); + expect(screen.getByText('42', {exact: true}).element().getAttribute('style')).toBe( + 'color: blue;', + ); + expect(formatNumber.mock.calls[0][1]).toBe(current); + expect(current.formatNumber).not.toHaveBeenCalled(); + }); + + test('updates when a new configuration reuses the data array', async () => { + settings.set({plugins: [IndicatorPlugin]}); + const items: IndicatorWidgetDataItem[] = [ + { + content: {current: {value: 42}}, + color: 'red', + title: 'Before', + }, + ]; + const screen = await render(, options); + await expect.element(screen.getByText('42', {exact: true})).toBeVisible(); + + items[0] = {content: {current: {value: 43}}, color: 'blue', title: 'After'}; + await screen.rerender(); + + await expect.element(screen.getByText('43', {exact: true})).toBeVisible(); + await expect.element(screen.getByText('After', {exact: true})).toBeVisible(); + expect(screen.getByText('43', {exact: true}).element().getAttribute('style')).toBe( + 'color: blue;', + ); + }); + + test('updates formatted values when only the formatter changes', async () => { + settings.set({plugins: [IndicatorPlugin]}); + const current = {value: 42, numberFormat: {precision: 2}, customMetadata: 'source'}; + const config = {data: [{content: {current}, secondaryValue: {value: 7}}]}; + const firstFormatter = vi.fn((value: number, _options?: unknown) => `first:${value}`); + const screen = await render( + , + options, + ); + await expect.element(screen.getByText('first:42', {exact: true})).toBeVisible(); + await expect.element(screen.getByText('7', {exact: true})).toBeVisible(); + expect(firstFormatter.mock.calls[0][1]).toBe(current); + firstFormatter.mockClear(); + + const nextFormatter = vi.fn((value: number, _options?: unknown) => `next:${value}`); + await screen.rerender( + , + ); + await expect.element(screen.getByText('next:42', {exact: true})).toBeVisible(); + await expect.element(screen.getByText('7', {exact: true})).toBeVisible(); + expect(firstFormatter).not.toHaveBeenCalled(); + expect(nextFormatter).toHaveBeenCalledExactlyOnceWith(42, current); + expect(nextFormatter.mock.calls[0][1]).toBe(current); + }); }); diff --git a/src/plugins/indicator/__tests__/normalize.test.ts b/src/plugins/indicator/__tests__/normalize.test.ts new file mode 100644 index 00000000..e4896403 --- /dev/null +++ b/src/plugins/indicator/__tests__/normalize.test.ts @@ -0,0 +1,100 @@ +import {getValueFormatOptions, normalizeIndicatorData} from '../normalize'; +import type {IndicatorWidgetConfig} from '../types'; + +describe('normalizeIndicatorData', () => { + test('converts aliases, preserves metadata and references, and is idempotent', () => { + const modern = Object.freeze({value: Object.freeze({value: 0})}); + const custom = {callback: vi.fn()}; + const current = Object.freeze({ + value: 1200, + color: 'metadata', + numberFormat: {precision: 2}, + custom, + }); + const secondaryValue = Object.freeze({value: '—', caption: 'Comparison'}); + const legacy = Object.freeze({ + content: Object.freeze({current}), + color: 'blue', + title: 'Revenue', + size: 'xl' as const, + nowrap: true, + secondaryValue, + }); + const input = Object.freeze({ + data: [modern, legacy], + defaultColor: 'black', + }) satisfies IndicatorWidgetConfig; + Object.freeze(input.data); + + const data = normalizeIndicatorData(input); + const converted = data.data?.[1]; + expect(converted).toEqual({ + value: {value: 1200, color: 'blue', custom}, + title: 'Revenue', + size: 'xl', + nowrap: true, + secondaryValue, + }); + expect(data.defaultColor).toBe('black'); + expect(data.data?.[0]).toBe(modern); + expect(converted?.value).toHaveProperty('custom', custom); + expect(converted?.secondaryValue).toBe(secondaryValue); + expect(getValueFormatOptions(legacy)).toBe(current); + expect(custom.callback).not.toHaveBeenCalled(); + expect(normalizeIndicatorData(data)).toBe(data); + }); + + test.each([ + {color: undefined, expected: 'red'}, + {color: '', expected: ''}, + ])('prefers primary value fields with color $color', ({color, expected}) => { + const value = {value: 0, color}; + const item = {value, content: {current: {value: 500}}, color: 'red'}; + const data = normalizeIndicatorData({data: [item]}); + expect(data.data?.[0]).toEqual({value: {value: 0, color: expected}}); + expect(getValueFormatOptions(item)).toBe(value); + }); + + test('handles missing data', () => { + const input = {}; + expect(normalizeIndicatorData(input)).toBe(input); + }); + + test('keeps legacy formatNumber fields as formatter metadata', () => { + const formatNumber = vi.fn(); + const current = {value: 42, formatNumber}; + const item = {content: {current}}; + const data = normalizeIndicatorData({data: [item]}); + expect(data.data?.[0]?.value).toEqual({value: 42}); + expect(getValueFormatOptions(item)).toBe(current); + expect(formatNumber).not.toHaveBeenCalled(); + }); + + test('preserves prototype getters when applying an item color', () => { + const formatNumber = vi.fn(() => 'custom'); + const numberFormat = {precision: 2}; + class Value { + get value() { + return 42; + } + get formatNumber() { + return formatNumber; + } + get numberFormat() { + return numberFormat; + } + } + const item = {value: new Value(), color: 'green'}; + const data = normalizeIndicatorData({data: [item]}); + expect(data.data?.[0]?.value).toEqual({ + value: 42, + formatNumber, + numberFormat, + color: 'green', + }); + expect(data.data?.[0]?.value.formatNumber).toBe(formatNumber); + expect(data.data?.[0]?.value.numberFormat).toBe(numberFormat); + expect(getValueFormatOptions(item)).toBe(item.value); + expect(formatNumber).not.toHaveBeenCalled(); + }); +}); diff --git a/src/plugins/indicator/index.ts b/src/plugins/indicator/index.ts index fe8f2f4c..2dbb38bc 100644 --- a/src/plugins/indicator/index.ts +++ b/src/plugins/indicator/index.ts @@ -2,7 +2,7 @@ import React from 'react'; import {ChartKitPlugin} from '../../types'; -export * from './types'; +export type {IndicatorWidgetData, IndicatorWidgetDataItem} from './public-types'; export const IndicatorPlugin: ChartKitPlugin = { type: 'indicator', diff --git a/src/plugins/indicator/normalize.ts b/src/plugins/indicator/normalize.ts new file mode 100644 index 00000000..2f32fcde --- /dev/null +++ b/src/plugins/indicator/normalize.ts @@ -0,0 +1,77 @@ +import type { + IndicatorFormatOptions, + IndicatorWidgetConfig, + IndicatorWidgetConfigItem, + NormalizedIndicatorWidgetConfig, + NormalizedIndicatorWidgetConfigItem, +} from './types'; + +/** Return the original formatNumber options, preserving application metadata and object identity. */ +export function getValueFormatOptions(item: IndicatorWidgetConfigItem): IndicatorFormatOptions { + if (item.value) { + return item.value; + } + if (item.content) { + return item.content.current; + } + throw new TypeError('An indicator item requires value or content.current.'); +} + +function normalizeValue( + item: IndicatorWidgetConfigItem, +): NormalizedIndicatorWidgetConfigItem['value'] { + const value = getValueFormatOptions(item); + if (item.value) { + if (value.color === undefined && item.color !== undefined) { + const {value: rawValue, formatNumber, numberFormat, ...rest} = item.value; + return {...rest, value: rawValue, formatNumber, numberFormat, color: item.color}; + } + return value; + } + if ( + !('color' in value) && + !('formatNumber' in value) && + !('numberFormat' in value) && + item.color === undefined + ) { + return value; + } + const { + value: rawValue, + color: _color, + formatNumber: _formatNumber, + numberFormat: _numberFormat, + ...rest + } = value; + return item.color === undefined + ? {...rest, value: rawValue} + : {...rest, value: rawValue, color: item.color}; +} + +/** + * Normalize indicator configuration without mutating input, invoking callbacks or logging. + */ +export function normalizeIndicatorData( + input: IndicatorWidgetConfig, +): NormalizedIndicatorWidgetConfig { + const data = input.data?.map((item): NormalizedIndicatorWidgetConfigItem => { + const value = normalizeValue(item); + + if (item.value === value && !('content' in item) && !('color' in item)) { + return item as NormalizedIndicatorWidgetConfigItem; + } + + return { + value, + ...(item.secondaryValue ? {secondaryValue: item.secondaryValue} : {}), + ...(item.title === undefined ? {} : {title: item.title}), + ...(item.size === undefined ? {} : {size: item.size}), + ...(item.nowrap === undefined ? {} : {nowrap: item.nowrap}), + }; + }); + + if (data?.every((item, index) => item === input.data?.[index]) ?? true) { + return input as NormalizedIndicatorWidgetConfig; + } + return {...input, data}; +} diff --git a/src/plugins/indicator/public-types.ts b/src/plugins/indicator/public-types.ts new file mode 100644 index 00000000..ba9307db --- /dev/null +++ b/src/plugins/indicator/public-types.ts @@ -0,0 +1,54 @@ +import type {ReactNode} from 'react'; + +import type {FormatNumberOptions} from '../shared'; + +type IndicatorValue = { + /** Numbers can be formatted; strings are displayed as supplied. */ + value: number | string; + /** Custom formatter; takes precedence over numberFormat. */ + formatNumber?: (value: number) => string; + /** Explicit options take precedence over the widget's formatNumber callback. */ + numberFormat?: Omit; + /** Any CSS color, including theme variables. */ + color?: string; +}; + +type IndicatorItemOptions = { + size?: 's' | 'm' | 'l' | 'xl'; + title?: string; + nowrap?: boolean; +}; + +type IndicatorSecondaryValue = IndicatorValue & { + caption?: ReactNode; + /** Defaults to bottom. */ + position?: 'bottom' | 'right'; + /** The label view uses a background derived from color. Defaults to text. */ + view?: 'text' | 'label'; + /** Hidden by default. */ + arrow?: { + direction: 'up' | 'down'; + /** Localized accessible label, for example "Increase". Omit for a decorative arrow. */ + ariaLabel?: string; + }; +}; + +type LegacyIndicatorContent = { + /** @deprecated Use value. */ + current: {value: string | number} & Record; +}; + +export type IndicatorWidgetDataItem = IndicatorItemOptions & { + /** @deprecated Use value in ChartKitProps<'indicator'>['data']. */ + content: LegacyIndicatorContent; + value?: IndicatorValue; + /** @deprecated Use value.color. */ + color?: string; + secondaryValue?: IndicatorSecondaryValue; +}; + +export type IndicatorWidgetData = { + data?: IndicatorWidgetDataItem[]; + /** Fallback color for primary values only. */ + defaultColor?: string; +}; diff --git a/src/plugins/indicator/renderer/IndicatorItem.tsx b/src/plugins/indicator/renderer/IndicatorItem.tsx index 8f575451..e1569574 100644 --- a/src/plugins/indicator/renderer/IndicatorItem.tsx +++ b/src/plugins/indicator/renderer/IndicatorItem.tsx @@ -1,26 +1,22 @@ import React from 'react'; -import type {ChartKitProps} from '../../../types'; import {block} from '../../../utils/cn'; -import type {IndicatorWidgetDataItem} from '../types'; +import type {IndicatorItemProps} from '../types'; -const b = block('indicator'); +import {IndicatorSecondaryValue} from './IndicatorSecondaryValue'; -export const IndicatorItem = ( - props: IndicatorWidgetDataItem & { - defaultColor?: string; - formatNumber?: ChartKitProps<'indicator'>['formatNumber']; - }, -) => { - const {formatNumber, content, color, defaultColor, size, title, nowrap} = props; - const mods = {size, nowrap}; - const style: React.CSSProperties = {color: color || defaultColor}; +const b = block('indicator'); - let value = content.current.value; +export const IndicatorItem = (props: IndicatorItemProps) => { + const {value, size, title, nowrap, secondaryValue} = props; + const mods = {size, nowrap, right: secondaryValue?.position === 'right'}; + const style: React.CSSProperties = {color: value.color}; - if (formatNumber && typeof value === 'number') { - value = formatNumber(value, content.current); - } + const valueContent = ( +
+ {value.value} +
+ ); return (
@@ -29,9 +25,14 @@ export const IndicatorItem = ( {title}
)} -
- {value} -
+ {secondaryValue ? ( +
+ {valueContent} + +
+ ) : ( + valueContent + )} ); }; diff --git a/src/plugins/indicator/renderer/IndicatorSecondaryValue.tsx b/src/plugins/indicator/renderer/IndicatorSecondaryValue.tsx new file mode 100644 index 00000000..a3fb1485 --- /dev/null +++ b/src/plugins/indicator/renderer/IndicatorSecondaryValue.tsx @@ -0,0 +1,63 @@ +import React from 'react'; + +import {ArrowDown as ArrowDownIcon, ArrowUp as ArrowUpIcon} from '@gravity-ui/icons'; +import {Icon, Label} from '@gravity-ui/uikit'; + +import {block} from '../../../utils/cn'; +import type {IndicatorItemProps} from '../types'; + +const b = block('indicator'); + +const LABEL_SIZE_BY_INDICATOR_SIZE = {s: 'xs', m: 's', l: 's', xl: 'm'} as const; +const ICON_SIZE_BY_INDICATOR_SIZE = {s: 12, m: 14, l: 14, xl: 16} as const; + +export function IndicatorSecondaryValue({ + secondaryValue, + size, +}: { + secondaryValue: NonNullable; + size: IndicatorItemProps['size']; +}) { + const {value, caption, view = 'text', arrow, color} = secondaryValue; + const labelSize = LABEL_SIZE_BY_INDICATOR_SIZE[size ?? 'm']; + const arrowIcon = arrow && ( + + + + ); + + return ( +
+
+ {view === 'label' ? ( + + ) : ( + + {arrowIcon} + {value} + + )} + {caption !== null && caption !== undefined && caption !== '' && ( + + {caption} + + )} +
+
+ ); +} diff --git a/src/plugins/indicator/renderer/IndicatorWidget.scss b/src/plugins/indicator/renderer/IndicatorWidget.scss index 887c519c..72097a45 100644 --- a/src/plugins/indicator/renderer/IndicatorWidget.scss +++ b/src/plugins/indicator/renderer/IndicatorWidget.scss @@ -63,4 +63,82 @@ font-size: 48px; white-space: nowrap; } + + &__value-row { + display: flex; + flex-direction: column; + align-items: flex-start; + gap: var(--g-spacing-2); + } + + &__item_right &__value-row { + flex-direction: row; + align-items: baseline; + gap: var(--g-spacing-3); + } + + &__item_right &__secondary-value_view_label { + contain: layout; + } + + &__secondary-value { + font-size: var(--g-text-body-1-font-size); + line-height: var(--g-text-body-1-line-height); + font-weight: var(--g-text-body-font-weight); + display: block; + min-width: min-content; + max-width: 100%; + } + + &__secondary-value-content { + display: grid; + grid-auto-flow: column; + grid-template-columns: max-content; + grid-auto-columns: minmax(1em, 1fr); + align-items: center; + gap: calc(var(--g-spacing-1) + var(--g-spacing-half)); + min-width: 0; + } + + &__item_size_l &__secondary-value, + &__item_size_xl &__secondary-value { + font-size: var(--g-text-body-2-font-size); + line-height: var(--g-text-body-2-line-height); + } + + &__secondary-value-text { + display: inline-flex; + align-items: center; + gap: var(--g-spacing-half); + flex-shrink: 0; + font: inherit; + white-space: nowrap; + color: var(--g-color-text-primary); + } + + &__secondary-value-arrow { + display: inline-flex; + flex-shrink: 0; + } + + &__secondary-value-label { + color: var(--indicator-secondary-value-color, var(--g-color-text-primary)); + background-color: color-mix( + in sRGB, + var(--indicator-secondary-value-color, var(--g-color-text-primary)) 15%, + transparent + ); + } + + &__secondary-value-caption { + min-width: 0; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + color: var(--g-color-text-secondary); + + &:empty { + display: none; + } + } } diff --git a/src/plugins/indicator/renderer/IndicatorWidget.tsx b/src/plugins/indicator/renderer/IndicatorWidget.tsx index ff679eb4..485d24a9 100644 --- a/src/plugins/indicator/renderer/IndicatorWidget.tsx +++ b/src/plugins/indicator/renderer/IndicatorWidget.tsx @@ -8,24 +8,25 @@ import {CHARTKIT_ERROR_CODE, ChartKitError} from '../../../libs'; import type {ChartKitProps, ChartKitWidgetRef} from '../../../types'; import {getChartPerformanceDuration, getRandomCKId, markChartPerformance} from '../../../utils'; import {block} from '../../../utils/cn'; +import {getValueFormatOptions, normalizeIndicatorData} from '../normalize'; +import type {IndicatorItemProps} from '../types'; import {IndicatorItem} from './IndicatorItem'; +import {formatValue} from './utils'; import './IndicatorWidget.scss'; const b = block('indicator'); const IndicatorWidget = React.forwardRef>( - // _ref needs to avoid this React warning: - // "forwardRef render functions accept exactly two parameters: props and ref" function IndicatorWidgetInner(props, _ref) { - const { - onLoad, - formatNumber, - data: {data = [], defaultColor}, - id, - onRender, - } = props; + const {onLoad, formatNumber, data: config, id, onRender} = props; + const {data = [], defaultColor} = config; + + const normalizedData = React.useMemo( + () => normalizeIndicatorData(config).data ?? [], + [config], + ); const generatedId = React.useMemo( () => `${id}_${getRandomCKId()}`, @@ -49,16 +50,34 @@ const IndicatorWidget = React.forwardRef { + const {value, secondaryValue, title, size, nowrap} = item; + return { + title, + size, + nowrap, + value: { + value: formatValue(value, formatNumber, getValueFormatOptions(data[index])), + color: value.color || defaultColor, + }, + secondaryValue: secondaryValue + ? { + value: formatValue(secondaryValue), + color: secondaryValue.color, + caption: secondaryValue.caption, + position: secondaryValue.position, + view: secondaryValue.view, + arrow: secondaryValue.arrow, + } + : undefined, + }; + }); + return (
- {data.map((item, index) => ( - + {items.map((item, index) => ( + ))}
diff --git a/src/plugins/indicator/renderer/__tests__/utils.test.ts b/src/plugins/indicator/renderer/__tests__/utils.test.ts new file mode 100644 index 00000000..55134470 --- /dev/null +++ b/src/plugins/indicator/renderer/__tests__/utils.test.ts @@ -0,0 +1,93 @@ +import {settings} from '../../../../libs'; +import {formatValue} from '../utils'; + +describe('formatValue', () => { + afterEach(() => settings.set({lang: 'en'})); + + test('prefers a local callback over options and the widget callback', () => { + const localFormatNumber = vi.fn(() => 'local'); + const formatNumber = vi.fn(() => 'widget'); + expect( + formatValue( + { + value: 0.124, + formatNumber: localFormatNumber, + numberFormat: {format: 'percent', precision: 1}, + }, + formatNumber, + ), + ).toBe('local'); + expect(localFormatNumber).toHaveBeenCalledExactlyOnceWith(0.124); + expect(formatNumber).not.toHaveBeenCalled(); + }); + + test('selects explicit formats, then the callback, then plain text', () => { + const formatNumber = vi.fn(() => 'custom'); + expect( + formatValue( + { + value: 0.124, + numberFormat: {format: 'percent', precision: 1, signDisplay: 'exceptZero'}, + }, + formatNumber, + ), + ).toBe('+12.4%'); + expect(formatValue({value: 1200, numberFormat: {}}, formatNumber)).toBe('1,200'); + expect(formatNumber).not.toHaveBeenCalled(); + expect(formatValue({value: 1200}, formatNumber)).toBe('custom'); + expect(formatNumber).toHaveBeenCalledExactlyOnceWith(1200, {value: 1200}); + expect(formatValue({value: 1234.5})).toBe('1234.5'); + }); + + test('applies a multiplier and an explicit scale', () => { + expect( + formatValue({ + value: 1.5, + numberFormat: {multiplier: 1000, unit: 'm', unitRate: 1}, + }), + ).toBe('1.5K'); + }); + + test('preserves numeric strings without invoking formatters', () => { + const localFormatNumber = vi.fn(); + const formatNumber = vi.fn(); + expect( + formatValue( + { + value: '0.124', + formatNumber: localFormatNumber, + numberFormat: {format: 'percent', precision: 1}, + }, + formatNumber, + ), + ).toBe('0.124'); + expect(localFormatNumber).not.toHaveBeenCalled(); + expect(formatNumber).not.toHaveBeenCalled(); + }); + + test('uses the widget locale unless the value overrides it', () => { + settings.set({lang: 'ru'}); + expect( + formatValue({ + value: 0.124, + numberFormat: {format: 'percent', precision: 1}, + }), + ).toBe('12,4%'); + expect( + formatValue({ + value: 0.124, + numberFormat: {format: 'percent', precision: 1, lang: 'en'}, + }), + ).toBe('12.4%'); + }); + + test('supports regional locales and rounds decimal ties in explicit formats', () => { + expect(formatValue({value: 1200, numberFormat: {lang: 'en-US'}})).toBe('1,200'); + expect( + formatValue({ + value: 0.01005, + numberFormat: {lang: 'ru-RU', format: 'percent', precision: 2}, + }), + ).toBe('1,01%'); + }); +}); diff --git a/src/plugins/indicator/renderer/utils.ts b/src/plugins/indicator/renderer/utils.ts new file mode 100644 index 00000000..1380fde9 --- /dev/null +++ b/src/plugins/indicator/renderer/utils.ts @@ -0,0 +1,37 @@ +import {settings} from '../../../libs'; +import {formatNumber as defaultFormatNumber} from '../../shared'; +import type {IndicatorFormatOptions, NormalizedIndicatorWidgetConfigItem} from '../types'; + +export function formatValue( + { + value, + formatNumber: localFormatNumber, + numberFormat, + }: Pick< + NormalizedIndicatorWidgetConfigItem['value'], + 'value' | 'formatNumber' | 'numberFormat' + >, + formatNumber?: (value: number, options: {value: number | string}) => string, + formatOptions?: IndicatorFormatOptions, +): string { + if (typeof value === 'string') { + return value; + } + + if (localFormatNumber) { + return localFormatNumber(value); + } + + if (numberFormat) { + return defaultFormatNumber(value, { + ...numberFormat, + lang: numberFormat.lang ?? settings.get('lang'), + }); + } + + if (formatNumber) { + return formatNumber(value, formatOptions ?? {value}); + } + + return String(value); +} diff --git a/src/plugins/indicator/types.ts b/src/plugins/indicator/types.ts index ac7caad4..9df57b80 100644 --- a/src/plugins/indicator/types.ts +++ b/src/plugins/indicator/types.ts @@ -1,16 +1,47 @@ -export type IndicatorWidgetDataItem = { - content: { - current: { - value: string | number; - } & Record; - }; - color?: string; - size?: 's' | 'm' | 'l' | 'xl'; - title?: string; - nowrap?: boolean; +import type {IndicatorWidgetData, IndicatorWidgetDataItem} from './public-types'; + +/** + * Indicator item before normalization, using either value or legacy content.current. + * When both are provided, value takes precedence. + */ +export type IndicatorWidgetConfigItem = + | IndicatorWidgetDataItem + | (Omit & { + value: NonNullable; + content?: IndicatorWidgetDataItem['content']; + }); + +/** Indicator configuration accepted by the widget before normalization. */ +export type IndicatorWidgetConfig = Omit & { + data?: IndicatorWidgetConfigItem[]; }; -export type IndicatorWidgetData = { - data?: IndicatorWidgetDataItem[]; - defaultColor?: string; +/** Original primary value object passed to the widget's formatNumber callback, including application metadata. */ +export type IndicatorFormatOptions = {value: string | number} & Record; + +/** Indicator item after normalization, with a required value and no legacy content or item-level color. */ +export type NormalizedIndicatorWidgetConfigItem = Omit< + IndicatorWidgetConfigItem, + 'content' | 'color' | 'value' +> & { + value: NonNullable; +}; + +/** Indicator configuration with normalized items, ready for formatting. */ +export type NormalizedIndicatorWidgetConfig = Omit & { + data?: NormalizedIndicatorWidgetConfigItem[]; +}; + +/** Rendering props with primary and secondary values formatted as strings. */ +export type IndicatorItemProps = Pick< + NormalizedIndicatorWidgetConfigItem, + 'title' | 'size' | 'nowrap' +> & { + value: Pick & { + value: string; + }; + secondaryValue?: Omit< + NonNullable, + 'value' | 'formatNumber' | 'numberFormat' + > & {value: string}; }; diff --git a/src/plugins/shared/format-number/format-number.test.ts b/src/plugins/shared/format-number/format-number.test.ts index bbbaea9b..c0d42909 100644 --- a/src/plugins/shared/format-number/format-number.test.ts +++ b/src/plugins/shared/format-number/format-number.test.ts @@ -1,4 +1,4 @@ -import {formatNumber} from './format-number'; +import {formatBytes, formatDuration, formatNumber} from './format-number'; import {i18nInstance} from './i18n/i18n'; import type {FormatNumberOptions} from './types'; @@ -10,8 +10,49 @@ describe('plugins/shared', () => { [NaN, undefined, 'NaN'], ['0.2211556', undefined, '0.2211556'], ['0.2211556', {precision: 4}, '0.2212'], + [1.005, {precision: 2}, '1.01'], + [2.675, {precision: 2}, '2.68'], + [-1.005, {precision: 2}, '-1.01'], + [0.01005, {format: 'percent', precision: 2}, '1.01%'], + [0.145, {format: 'percent', precision: 0}, '15%'], + [-0.145, {format: 'percent', precision: 0}, '-15%'], + [0.285, {format: 'percent', precision: 0, lang: 'ru-RU'}, '29%'], + [1.005, {format: 'percent', precision: 0}, '101%'], + [12.345, {format: 'percent', unit: 'auto', precision: 2}, '1.23K%'], + [0.0001245, {format: 'percent', precision: 'auto'}, '0.0125%'], + [1005, {unit: 'k', precision: 2}, '1.01K'], + [1.005, {precision: 'auto'}, '1.01'], + [0.12345, {precision: 'auto'}, '0.1235'], + [1200, {lang: 'en-US'}, '1,200'], + [1234567, {lang: 'en-US', unit: 'auto', precision: 1}, '1.2M'], + [1234567, {lang: 'ru-RU', unit: 'auto', precision: 1}, '1,2M'], + [1234567, {lang: 'de-DE', unit: 'auto', precision: 1}, '1,2M'], + [12.4, {signDisplay: 'exceptZero'}, '+12.4'], + [-12.4, {signDisplay: 'exceptZero'}, '-12.4'], + [0, {signDisplay: 'exceptZero'}, '0'], + [0, {signDisplay: 'always'}, '+0'], + [-12.4, {signDisplay: 'never'}, '12.4'], + [12.4, {signDisplay: 'auto'}, '12.4'], + [0.124, {format: 'percent', precision: 1, signDisplay: 'exceptZero'}, '+12.4%'], + [0.0004, {format: 'percent', precision: 1, signDisplay: 'exceptZero'}, '0.0%'], + [-0.0004, {format: 'percent', precision: 1, signDisplay: 'exceptZero'}, '0.0%'], + [12.4, {labelMode: 'percent'}, '12.4%'], + [0.124, {format: 'percent', multiplier: 10}, '12.4%'], ])('formatNumber (args: {value: %p, options: %p})', (value, options, expected) => { const result = formatNumber(value as number, options); expect(result).toEqual(expected); }); + + test('localizes unit names independently of the number locale', () => { + expect(formatBytes(1536, {lang: 'ru-RU'})).toBe('1,5 КБ'); + expect(formatBytes(1536, {lang: 'en-US'})).toBe('1.5 KB'); + expect(formatBytes(1536, {lang: 'de-DE'})).toBe('1,5 KB'); + expect(formatDuration(1500, {lang: 'ru-RU'})).toBe('1,5 с'); + expect(i18nInstance.lang).toBe('en'); + }); + + test('preserves the shared locale when formatting fails', () => { + expect(() => formatNumber(1.005, {lang: 'ru-RU', precision: -1})).toThrow(RangeError); + expect(i18nInstance.lang).toBe('en'); + }); }); diff --git a/src/plugins/shared/format-number/format-number.ts b/src/plugins/shared/format-number/format-number.ts index 187c854c..aef3988c 100644 --- a/src/plugins/shared/format-number/format-number.ts +++ b/src/plugins/shared/format-number/format-number.ts @@ -10,8 +10,7 @@ function getUnitRate(value: number, exponent: number, unitsI18nKeys: string[]) { let resultUnitRate = 1; while ( Math.abs(value / Math.pow(exponent, resultUnitRate)) >= 1 && - resultUnitRate < 10 && - i18n(unitsI18nKeys[resultUnitRate]) + resultUnitRate < unitsI18nKeys.length ) { resultUnitRate++; } @@ -28,36 +27,56 @@ const unitFormatter = ({ unitsI18nKeys: string[]; unitDelimiterI18nKey: string; }) => { - return function formatUnit(value: number, options: FormatOptions = {}) { - const {precision, unitRate, showRankDelimiter = true, lang} = options; - - const i18nLang = i18nInstance.lang as string; - if (lang) { - i18nInstance.setLang(lang); - } + return function formatUnit( + value: number, + options: FormatOptions = {}, + format: 'number' | 'percent' = 'number', + ) { + const {precision, unitRate, showRankDelimiter = true, lang, signDisplay} = options; + const locale = lang ?? (i18nInstance.lang as string); + const isPercent = format === 'percent'; const resultUnitRate = - typeof unitRate === 'number' ? unitRate : getUnitRate(value, exponent, unitsI18nKeys); + typeof unitRate === 'number' + ? unitRate + : getUnitRate(isPercent ? value * 100 : value, exponent, unitsI18nKeys); - let result: number | string = value / Math.pow(exponent, resultUnitRate); + const scaledValue = value / Math.pow(exponent, resultUnitRate); + let maximumFractionDigits = 20; if (typeof precision === 'number') { - result = Number(result.toFixed(precision)); - } else if (precision === 'auto' && result % 1 !== 0) { - result = Number(result.toFixed(Math.abs(result) > 1 ? 2 : 4)); + maximumFractionDigits = precision; + } else if (precision === 'auto') { + maximumFractionDigits = Math.abs(scaledValue) > (isPercent ? 0.01 : 1) ? 2 : 4; } - - result = new Intl.NumberFormat(lang ?? i18nLang, { + const formatter = new Intl.NumberFormat(locale, { + style: isPercent ? 'percent' : 'decimal', minimumFractionDigits: typeof precision === 'number' ? precision : 0, - maximumFractionDigits: 20, + maximumFractionDigits, useGrouping: showRankDelimiter, - }).format(result); - - const unit = i18n(unitsI18nKeys[resultUnitRate]); - const delimiter = i18n(unitDelimiterI18nKey); - - i18nInstance.setLang(i18nLang); - - return `${result}${delimiter}${unit}`; + signDisplay, + }); + const result = isPercent + ? formatter + .formatToParts(scaledValue) + .filter( + ({type, value: part}) => + type !== 'percentSign' && (type !== 'literal' || part.trim() !== ''), + ) + .map(({value: part}) => part) + .join('') + : formatter.format(scaledValue); + + const unitsLang = new Intl.Locale(locale).language === 'ru' ? 'ru' : 'en'; + const i18nLang = i18nInstance.lang as string; + i18nInstance.setLang(unitsLang); + try { + const unit = i18n(unitsI18nKeys[resultUnitRate]); + const delimiter = i18n(unitDelimiterI18nKey); + + return `${result}${delimiter}${unit}`; + } finally { + i18nInstance.setLang(i18nLang); + } }; }; @@ -118,7 +137,7 @@ export const formatNumber = (value: number | string, options: FormatNumberOption let prePostfix = ''; if (format === 'percent') { - changedMultiplier = 100; + changedMultiplier = 1; prePostfix = '%'; } @@ -126,10 +145,14 @@ export const formatNumber = (value: number | string, options: FormatNumberOption prePostfix = '%'; } - const formattedValue = baseFormatNumber(Number(value) * changedMultiplier, { - ...options, - unitRate: unitRate ?? NUMBER_UNIT_RATE_BY_UNIT[unit ?? 'default'], - }); + const formattedValue = baseFormatNumber( + Number(value) * changedMultiplier, + { + ...options, + unitRate: unitRate ?? NUMBER_UNIT_RATE_BY_UNIT[unit ?? 'default'], + }, + format, + ); return `${prefix}${formattedValue}${prePostfix}${postfix}`; }; diff --git a/src/plugins/shared/format-number/types.ts b/src/plugins/shared/format-number/types.ts index 25f32fb4..cf28c9c5 100644 --- a/src/plugins/shared/format-number/types.ts +++ b/src/plugins/shared/format-number/types.ts @@ -2,6 +2,7 @@ export type FormatOptions = { precision?: number | 'auto'; unitRate?: number; showRankDelimiter?: boolean; + signDisplay?: Intl.NumberFormatOptions['signDisplay']; lang?: string; labelMode?: string; }; diff --git a/src/types/index.ts b/src/types/index.ts index 6aeff40f..de3c1d51 100644 --- a/src/types/index.ts +++ b/src/types/index.ts @@ -1,6 +1,7 @@ import React from 'react'; import {ChartKitError} from '../libs'; +import type {IndicatorWidgetConfig} from '../plugins/indicator/types'; import type {ChartKitWidget} from './widget'; @@ -45,7 +46,7 @@ export type ChartKitRenderPluginLoader = () => React.ReactNode; export type ChartKitProps = { type: T; - data: ChartKitWidget[T]['data']; + data: ChartKitWidget[T]['data'] | (T extends 'indicator' ? IndicatorWidgetConfig : never); id?: string; isMobile?: boolean; onLoad?: (data?: ChartKitOnLoadData) => void; diff --git a/src/types/widget.ts b/src/types/widget.ts index 6db15806..ec62fdcf 100644 --- a/src/types/widget.ts +++ b/src/types/widget.ts @@ -2,7 +2,7 @@ import type {ChartData} from '@gravity-ui/charts'; import type {SplitLayoutType} from '../components/SplitPane/types'; import type {Highcharts, HighchartsWidgetData, StringParams} from '../plugins/highcharts/types'; -import type {IndicatorWidgetData} from '../plugins/indicator/types'; +import type {IndicatorWidgetData} from '../plugins/indicator/public-types'; import type {CustomTooltipProps, Yagr, YagrWidgetData} from '../plugins/yagr/types'; export interface ChartKitWidget { diff --git a/test-utils/tester.html b/test-utils/tester.html new file mode 100644 index 00000000..9d1e2968 --- /dev/null +++ b/test-utils/tester.html @@ -0,0 +1,24 @@ + + + + + + + ChartKit browser tests + + + + diff --git a/vitest.config.ts b/vitest.config.ts index 28ca981a..3d0fe88c 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -16,6 +16,7 @@ export default defineConfig({ }, browser: { enabled: true, + testerHtmlPath: 'test-utils/tester.html', headless: true, provider: playwright({}), instances: [ @@ -95,6 +96,9 @@ export default defineConfig({ { extends: true, plugins: [react()], + optimizeDeps: { + include: ['@gravity-ui/icons'], + }, test: { name: 'visual', include: ['src/**/*.visual.test.ts?(x)'],