@gravity-ui/charts 1.43.0 → 1.43.1

package/dist/esm/hooks/useShapes/line/prepare-data.js

@@ -1,4 +1,4 @@
-import { getLabelsSize, getTextSizeFn } from '../../../core/utils';
+import { filterOverlappingLabels, getLabelsSize, getTextSizeFn } from '../../../core/utils';
 import { getFormattedValue } from '../../../core/utils/format';
 import { getXValue, getYValue } from '../utils';
 async function getHtmlLabel(point, series, xMax) {
@@ -16,7 +16,7 @@ async function getHtmlLabel(point, series, xMax) {
 }
 export const prepareLineData = async (args) => {
     var _a, _b, _c, _d;
-    const { series, xAxis, yAxis, xScale, yScale, split, isOutsideBounds, isRangeSlider } = args;
+    const { series, xAxis, yAxis, xScale, yScale, split, isOutsideBounds, isRangeSlider, otherLayers, } = args;
     const [_xMin, xRangeMax] = xScale.range();
     const xMax = xRangeMax;
     const acc = [];
@@ -44,8 +44,8 @@ export const prepareLineData = async (args) => {
                 series: s,
             };
         });
-        const htmlElements = [];
-        const labels = [];
+        let htmlElements = [];
+        let svgLabels = [];
         if (s.dataLabels.enabled && !isRangeSlider) {
             if (s.dataLabels.html) {
                 const list = await Promise.all(points.reduce((result, p) => {
@@ -83,11 +83,15 @@ export const prepareLineData = async (args) => {
                             series: s,
                             active: true,
                         };
-                        labels.push(labelData);
+                        svgLabels.push(labelData);
                     }
                 }
             }
         }
+        if (!s.dataLabels.allowOverlap) {
+            svgLabels = filterOverlappingLabels(svgLabels, otherLayers.map((l) => l.svgLabels).flat());
+            htmlElements = filterOverlappingLabels(htmlElements, otherLayers.map((l) => l.htmlLabels).flat());
+        }
         let markers = [];
         const hasPerPointNormalMarkers = s.data.some((d) => { var _a, _b, _c; return (_c = (_b = (_a = d.marker) === null || _a === void 0 ? void 0 : _a.states) === null || _b === void 0 ? void 0 : _b.normal) === null || _c === void 0 ? void 0 : _c.enabled; });
         if (s.marker.states.normal.enabled || hasPerPointNormalMarkers) {
@@ -111,12 +115,12 @@ export const prepareLineData = async (args) => {
         const result = {
             points,
             markers,
-            labels,
+            svgLabels: svgLabels,
             series: s,
             hovered: false,
             active: true,
             id: s.id,
-            htmlElements,
+            htmlLabels: htmlElements,
             color: s.color,
             lineWidth: (_c = (isRangeSlider ? s.rangeSlider.lineWidth : undefined)) !== null && _c !== void 0 ? _c : s.lineWidth,
             dashStyle: s.dashStyle,

package/dist/esm/hooks/useShapes/line/types.d.ts

@@ -25,8 +25,8 @@ export type PreparedLineData = {
     series: PreparedLineSeries;
     hovered: boolean;
     active: boolean;
-    labels: LabelData[];
-    htmlElements: HtmlItem[];
+    svgLabels: LabelData[];
+    htmlLabels: HtmlItem[];
     color: string;
     dashStyle: DashStyle;
     linecap: LineCap;

package/dist/esm/types/chart-ui.d.ts

@@ -25,6 +25,10 @@ export interface HtmlItem {
     };
     style?: BaseTextStyle & React.CSSProperties;
 }
+export interface ShapeDataWithLabels {
+    svgLabels: LabelData[];
+    htmlLabels: HtmlItem[];
+}
 export interface ShapeDataWithHtmlItems {
     htmlElements: HtmlItem[];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/charts",
-  "version": "1.43.0",
+  "version": "1.43.1",
   "description": "A flexible JavaScript library for data visualization and chart rendering using React",
   "license": "MIT",
   "main": "dist/cjs/index.js",

package/dist/cjs/core/constants/misc.d.ts

@@ -1 +0,0 @@
-export declare const IS_TOUCH_ENABLED: boolean;

package/dist/cjs/core/constants/misc.js

@@ -1,7 +0,0 @@
-function isTouchEnabled() {
-    if (typeof window !== 'object') {
-        return false;
-    }
-    return 'ontouchstart' in window || navigator.maxTouchPoints > 0;
-}
-export const IS_TOUCH_ENABLED = isTouchEnabled();

package/dist/esm/core/constants/misc.d.ts

@@ -1 +0,0 @@
-export declare const IS_TOUCH_ENABLED: boolean;

package/dist/esm/core/constants/misc.js

@@ -1,7 +0,0 @@
-function isTouchEnabled() {
-    if (typeof window !== 'object') {
-        return false;
-    }
-    return 'ontouchstart' in window || navigator.maxTouchPoints > 0;
-}
-export const IS_TOUCH_ENABLED = isTouchEnabled();