@gravity-ui/chartkit 4.2.0 → 4.3.0

package/build/plugins/d3/renderer/components/AxisX.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
-import type { ChartOptions, ChartScale } from '../hooks';
+import type { ChartScale, PreparedAxis } from '../hooks';
 type Props = {
-    axis: ChartOptions['xAxis'];
+    axis: PreparedAxis;
     width: number;
     height: number;
     scale: ChartScale;

package/build/plugins/d3/renderer/components/AxisX.js

@@ -51,7 +51,10 @@ export const AxisX = ({ axis, width, height, scale }) => {
             xAxisGenerator = xAxisGenerator.ticks(ticksCount);
         }
         svgElement.call(xAxisGenerator).attr('class', b());
-        svgElement.select('.domain').attr('d', `M0,0V0H${width}`);
+        svgElement
+            .select('.domain')
+            .attr('d', `M0,0V0H${width}`)
+            .style('stroke', axis.lineColor || '');
         if (axis.labels.enabled) {
             svgElement.selectAll('.tick text').style('font-size', axis.labels.style.fontSize);
         }

package/build/plugins/d3/renderer/components/AxisY.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
-import type { ChartOptions, ChartScale } from '../hooks';
+import type { ChartScale, PreparedAxis } from '../hooks';
 type Props = {
-    axises: ChartOptions['yAxis'];
+    axises: PreparedAxis[];
     width: number;
     height: number;
     scale: ChartScale;

package/build/plugins/d3/renderer/components/AxisY.js

@@ -52,7 +52,10 @@ export const AxisY = ({ axises, width, height, scale }) => {
             yAxisGenerator = yAxisGenerator.ticks(ticksCount);
         }
         svgElement.call(yAxisGenerator).attr('class', b());
-        svgElement.select('.domain').attr('d', `M0,${height}H0V0`);
+        svgElement
+            .select('.domain')
+            .attr('d', `M0,${height}H0V0`)
+            .style('stroke', axis.lineColor || '');
         if (axis.labels.enabled) {
             svgElement
                 .selectAll('.tick text')

package/build/plugins/d3/renderer/components/Tooltip/index.js

@@ -1,4 +1,5 @@
 import React from 'react';
+import isNil from 'lodash/isNil';
 import { block } from '../../../../../utils/cn';
 import { DefaultContent } from './DefaultContent';
 const b = block('d3-tooltip');
@@ -32,13 +33,12 @@ export const Tooltip = (props) => {
         return undefined;
     }, [hovered, pointerPosition, size]);
     const content = React.useMemo(() => {
-        if (tooltip.renderer && hovered) {
-            return tooltip.renderer({ hovered });
+        var _a;
+        if (!hovered) {
+            return null;
         }
-        else if (hovered) {
-            return React.createElement(DefaultContent, { hovered: hovered, xAxis: xAxis, yAxis: yAxis });
-        }
-        return null;
+        const customTooltip = (_a = tooltip.renderer) === null || _a === void 0 ? void 0 : _a.call(tooltip, { hovered });
+        return isNil(customTooltip) ? (React.createElement(DefaultContent, { hovered: hovered, xAxis: xAxis, yAxis: yAxis })) : (customTooltip);
     }, [hovered, tooltip, xAxis, yAxis]);
     if (!position || !hovered) {
         return null;

package/build/plugins/d3/renderer/hooks/useChartOptions/x-axis.js

@@ -15,6 +15,7 @@ export const getPreparedXAxis = ({ xAxis }) => {
             numberFormat: get(xAxis, 'labels.numberFormat'),
             style: { fontSize: get(xAxis, 'labels.style.fontSize', DEFAULT_AXIS_LABEL_FONT_SIZE) },
         },
+        lineColor: get(xAxis, 'lineColor'),
         categories: get(xAxis, 'categories'),
         timestamps: get(xAxis, 'timestamps'),
         title: {

package/build/plugins/d3/renderer/hooks/useChartOptions/y-axis.js

@@ -20,6 +20,7 @@ export const getPreparedYAxis = ({ yAxis }) => {
             numberFormat: get(yAxis1, 'labels.numberFormat'),
             style: y1LabelsStyle,
         },
+        lineColor: get(yAxis1, 'lineColor'),
         categories: get(yAxis1, 'categories'),
         timestamps: get(yAxis1, 'timestamps'),
         title: {

package/build/types/widget-data/axis.d.ts

@@ -2,9 +2,9 @@ import type { FormatNumberOptions } from '../../plugins/shared';
 import type { BaseTextStyle } from './base';
 export type ChartKitWidgetAxisType = 'category' | 'datetime' | 'linear';
 export type ChartKitWidgetAxisLabels = {
-    /** Enable or disable the axis labels */
+    /** Enable or disable the axis labels. */
     enabled?: boolean;
-    /** The pixel padding for axis labels */
+    /** The pixel padding for axis labels. */
     padding?: number;
     dateFormat?: string;
     numberFormat?: FormatNumberOptions;
@@ -14,13 +14,16 @@ export type ChartKitWidgetAxis = {
     categories?: string[];
     timestamps?: number[];
     type?: ChartKitWidgetAxisType;
-    /** The axis labels show the number or category for each tick */
+    /** The axis labels show the number or category for each tick. */
     labels?: ChartKitWidgetAxisLabels;
+    /** The color of the line marking the axis itself. */
+    lineColor?: string;
     title?: {
         text?: string;
     };
-    /** The minimum value of the axis. If undefined the min value is automatically calculate */
+    /** The minimum value of the axis. If undefined the min value is automatically calculate. */
     min?: number;
+    /** The grid lines settings. */
     grid?: {
         /** Enable or disable the grid lines.
          *
@@ -36,7 +39,7 @@ export type ChartKitWidgetAxis = {
     /** Padding of the max value relative to the length of the axis.
      * A padding of 0.05 will make a 100px axis 5px longer.
      *
-     * Defaults to 0.05 for Y axis and to 0.01 for X axis
+     * Defaults to 0.05 for Y axis and to 0.01 for X axis.
      * */
     maxPadding?: number;
 };

package/build/types/widget-data/tooltip.d.ts

@@ -6,6 +6,7 @@ export type TooltipHoveredData<T = any> = {
 };
 export type ChartKitWidgetTooltip<T = any> = {
     enabled?: boolean;
+    /** Specifies the renderer for the tooltip. If returned null default tooltip renderer will be used. */
     renderer?: (data: {
         hovered: TooltipHoveredData<T>;
     }) => React.ReactElement;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/chartkit",
-  "version": "4.2.0",
+  "version": "4.3.0",
   "description": "React component used to render charts based on any sources you need",
   "license": "MIT",
   "repository": "git@github.com:gravity-ui/ChartKit.git",