mdt-charts 1.32.0 → 1.33.1

package/lib/engine/features/scale/scale.d.ts

@@ -11,7 +11,7 @@ export interface ScalesWithSecondary extends Scales {
 export declare class Scale {
     static getScales(scaleKey: ScaleKeyModel, scaleValue: ScaleValueModel, bandSettings: BarChartSettings): Scales;
     static getScalesWithSecondary(scaleKey: ScaleKeyModel, scaleValue: ScaleValueModel, scaleValueSecondary: ScaleValueModel, bandSettings: BarChartSettings): ScalesWithSecondary;
-    static getScaleValue(scaleValue: ScaleValueModel): ScaleLinear<number, number, never>;
+    static getScaleValue(scaleValue: ScaleValueModel): ScaleLinear<number, number, number>;
     static getScaleBandWidth(scale: AxisScale<any>): number;
     static getScaleStep(scale: AxisScale<any>): number;
     static getScaledValue(scale: AxisScale<any>, value: any): number;

package/lib/engine/features/scale/scale.js

@@ -64,7 +64,9 @@ export class Scale {
         return scale;
     }
     static getScaleLinear(domain, range) {
-        return scaleLinear().domain(domain).range([range.start, range.end]);
+        const scale = scaleLinear().domain(domain).range([range.start, range.end]);
+        scale.unknown(scale(0));
+        return scale;
     }
     static getScalePoint(domain, range) {
         return scalePoint().domain(domain).range([range.start, range.end]);

package/lib/engine/features/valueLabels/valueLabels.js

@@ -94,9 +94,22 @@ export class ChartValueLabels {
     setAttrs(valueLabels, attrs, valueFieldName, setContent, dataRowAccessor, animate = false, onEndAnimation) {
         const animationName = "labels-updating";
         let selection = valueLabels
-            .text((d) => setContent({ dataRow: dataRowAccessor(d), fieldName: valueFieldName }).textContent)
             .attr("dominant-baseline", attrs.dominantBaseline)
             .attr("text-anchor", attrs.textAnchor);
+        selection.each(function (d) {
+            select(this).selectAll("tspan").remove();
+            const content = setContent({ dataRow: dataRowAccessor(d), fieldName: valueFieldName });
+            content.rows.forEach((row, rowIndex) => {
+                const tspan = document.createElementNS("http://www.w3.org/2000/svg", "tspan");
+                // Pass empty string to count this element for correct working of dy
+                // https://stackoverflow.com/questions/34078357/empty-tspan-not-rendered-dy-value-ignored
+                tspan.textContent = row.toString() || " ";
+                if (rowIndex !== 0)
+                    tspan.setAttribute("dy", `1em`);
+                tspan.setAttribute("x", attrs.x(d).toString());
+                this.appendChild(tspan);
+            });
+        });
         if (animate) {
             selection = selection
                 .interrupt(animationName)

package/lib/model/featuresModel/scaleModel/scaleAxisRecalcer.d.ts

@@ -6,7 +6,7 @@ export declare const keyAxisLabelVerticalLog = "keyAxisLabel_vertical_margin_log
 export declare const keyAxisLabelHorizontalLog = "keyAxisLabel_horizontal_margin_log";
 export interface ScaleValueCalculatedInfo {
     scale: ScaleValueModel;
-    scaleFn: ScaleLinear<number, number, never>;
+    scaleFn: ScaleLinear<number, number, number>;
 }
 /**
  * Предназначен для получения нового scaleValue и уменьшения globalMargin, если ось ключей находится где-то внутри chartBlock, а не на его границе

package/lib/model/model.d.ts

@@ -403,7 +403,7 @@ export interface ValueLabelsInnerContentSetterOptions {
     fieldName: MdtChartsFieldName;
 }
 export declare type ValueLabelsInnerContentSetter = (options: ValueLabelsInnerContentSetterOptions) => {
-    textContent: string | number;
+    rows: (string | number)[];
 };
 export interface TwoDimChartValueLabelsOptions {
     show: boolean;

package/lib/model/notations/twoDimensionalModel.js

@@ -146,12 +146,14 @@ export class TwoDimensionalModel {
                     forFields: (_x = (_w = chart.valueLabels) === null || _w === void 0 ? void 0 : _w.renderForFields) !== null && _x !== void 0 ? _x : chart.data.valueFields.map((field) => field.name),
                     setContent: ({ dataRow, fieldName }) => {
                         var _a;
-                        if ((_a = chart.valueLabels) === null || _a === void 0 ? void 0 : _a.setContent)
-                            return chart.valueLabels.setContent({
+                        if ((_a = chart.valueLabels) === null || _a === void 0 ? void 0 : _a.setContent) {
+                            const content = chart.valueLabels.setContent({
                                 dataRow,
                                 field: chart.data.valueFields.find((field) => field.name === fieldName)
                             });
-                        return { textContent: configReader.getValueLabelFormatterForChart(index)(dataRow[fieldName]) };
+                            return { rows: content.textContent.toString().split("\n") };
+                        }
+                        return { rows: [configReader.getValueLabelFormatterForChart(index)(dataRow[fieldName])] };
                     }
                 },
                 areaViewOptions: getAreaViewOptions(chart, index, style, modelInstance.version.getVersionNumber()),

package/lib/style/charts-main.css

@@ -290,4 +290,4 @@
 /* Value Labels */
 .mdt-charts-value-label {
     letter-spacing: -0.4px;
-}
+}

package/lib/style/charts-main.less

@@ -290,4 +290,4 @@
 /* Value Labels */
 .mdt-charts-value-label {
     letter-spacing: -0.4px;
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mdt-charts",
-	"version": "1.32.0",
+	"version": "1.33.1",
 	"description": "",
 	"main": "lib/main.js",
 	"scripts": {