mdt-charts 1.27.2 → 1.27.4

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

@@ -1,5 +1,5 @@
 import { Block } from "../../../engine/block/block";
-import { OptionsModelData, Orient, TwoDimensionalChartModel, TwoDimensionalValueLabels, ValueLabelAnchor, ValueLabelDominantBaseline, ValueLabelsStyleModel } from "../../../model/model";
+import { OptionsModelData, Orient, TwoDimChartValueLabelsOptions, TwoDimensionalChartModel, TwoDimensionalValueLabels, ValueLabelAnchor, ValueLabelDominantBaseline, ValueLabelsStyleModel } from "../../../model/model";
 import { MdtChartsDataRow, MdtChartsDataSource } from "../../../config/config";
 import { Scales, ScalesWithSecondary } from "../../../engine/features/scale/scale";
 export interface ValueLabelsOptions {
@@ -27,9 +27,10 @@ export declare class ChartValueLabels {
     static readonly valueLabelClass: string;
     private readonly renderPipeline;
     private readonly attrsProvider;
+    private options;
     constructor(globalOptions: ValueLabelsOptions, chart: TwoDimensionalChartModel);
     render(scales: Scales, data: MdtChartsDataRow[]): void;
-    update(scales: Scales, newData: MdtChartsDataRow[]): Promise<void[]>;
+    update(scales: Scales, newData: MdtChartsDataRow[], updatedOptions: TwoDimChartValueLabelsOptions): Promise<void[]>;
     private renderByGroupIndex;
     private updateByGroupIndex;
     private getAllValueLabelsOfChart;

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

@@ -13,6 +13,7 @@ export class ChartValueLabels {
         this.chart = chart;
         this.renderPipeline = new Pipeline();
         this.attrsProvider = new ValueLabelsAttrsProvider();
+        this.options = chart.valueLabels;
         this.renderPipeline.push((valueLabels, { style }) => {
             valueLabels.attr("fill", "currentColor").style("font-size", style.fontSize).style("color", style.color);
             if (style.cssClassName)
@@ -33,8 +34,9 @@ export class ChartValueLabels {
             });
         }
     }
-    update(scales, newData) {
+    update(scales, newData, updatedOptions) {
         const updatePromises = [];
+        this.options = updatedOptions;
         if (this.chart.isSegmented) {
             const preparedData = getStackedData(newData, this.chart);
             preparedData.forEach((segment, segmentIndex) => {
@@ -53,21 +55,21 @@ export class ChartValueLabels {
     renderByGroupIndex(scales, groupIndex, data, valueFieldName, datumField, dataRowAccessor) {
         let valueLabels = this.getAllValueLabelsOfChart(groupIndex).data(data).enter().append("text");
         valueLabels = this.renderPipeline.execute(valueLabels, { style: this.globalOptions.canvas.style });
-        const attrs = this.attrsProvider.getAttrs(this.globalOptions, this.chart.valueLabels, scales, datumField, dataRowAccessor);
-        this.setAttrs(valueLabels, attrs, valueFieldName, this.chart.valueLabels.format, dataRowAccessor);
+        const attrs = this.attrsProvider.getAttrs(this.globalOptions, this.options, scales, datumField, dataRowAccessor);
+        this.setAttrs(valueLabels, attrs, valueFieldName, this.options.format, dataRowAccessor);
         this.setClasses(valueLabels, this.chart.cssClasses, groupIndex);
     }
     updateByGroupIndex(scales, groupIndex, data, valueFieldName, datumField, dataRowAccessor) {
         return new Promise((resolve) => {
             const valueLabels = this.getAllValueLabelsOfChart(groupIndex).data(data);
             valueLabels.exit().remove();
-            const attrs = this.attrsProvider.getAttrs(this.globalOptions, this.chart.valueLabels, scales, datumField, dataRowAccessor);
+            const attrs = this.attrsProvider.getAttrs(this.globalOptions, this.options, scales, datumField, dataRowAccessor);
             let newValueLabels = valueLabels.enter().append("text");
             newValueLabels = this.renderPipeline.execute(newValueLabels, { style: this.globalOptions.canvas.style });
             const mergedValueLabels = newValueLabels.merge(valueLabels);
-            this.setAttrs(newValueLabels, attrs, valueFieldName, this.chart.valueLabels.format, dataRowAccessor);
+            this.setAttrs(newValueLabels, attrs, valueFieldName, this.options.format, dataRowAccessor);
             this.setClasses(mergedValueLabels, this.chart.cssClasses, groupIndex);
-            this.setAttrs(valueLabels, attrs, valueFieldName, this.chart.valueLabels.format, dataRowAccessor, true, resolve);
+            this.setAttrs(valueLabels, attrs, valueFieldName, this.options.format, dataRowAccessor, true, resolve);
         });
     }
     getAllValueLabelsOfChart(vfIndex) {
@@ -129,7 +131,7 @@ export class CanvasValueLabels {
             this.toggleOldValueLabelsVisibility();
         const chartsUpdatePromises = chartsWithLabels.map((chart, index) => {
             const chartScales = this.getChartScales(scales, chart);
-            return this.chartsValueLabels[index].update(chartScales, data[dataOptions.dataSource]);
+            return this.chartsValueLabels[index].update(chartScales, data[dataOptions.dataSource], chart.valueLabels);
         });
         Promise.all(chartsUpdatePromises).then(() => {
             const newValueLabels = this.getAllValueLabels();

package/lib/model/featuresModel/scaleModel/scaleModel.js

@@ -37,7 +37,7 @@ export class ScaleModel {
     getScaleSecondaryLinear(dataRows, configReader) {
         var _a;
         return {
-            domain: getScaleLinearDomain(this.options.axis.value.domain, dataRows, this.options, "secondary"),
+            domain: getScaleLinearDomain(this.options.axis.valueSecondary.domain, dataRows, this.options, "secondary"),
             range: {
                 start: 0,
                 end: getScaleValueRangePeek(this.options.orientation, this.canvasModel)

package/lib/model/margin/twoDim/twoDimMarginModel.js

@@ -56,13 +56,13 @@ export class TwoDimMarginModel {
         }
         else {
             const scaleModel = new ScaleModel(this.configReader.options, modelInstance.canvasModel).getScaleLinear(modelInstance.dataModel.repository.getRawRows(), this.configReader);
-            labelsTexts = this.getValueAxisLabels(scaleModel, modelInstance).map((v) => this.configReader.getAxisLabelFormatter()(v).toString());
+            labelsTexts = this.getValueAxisLabels(scaleModel).map((v) => this.configReader.getAxisLabelFormatter()(v).toString());
         }
         return AxisModel.getLabelSize(this.designerConfig.canvas.axisLabel.maxSize.main, labelsTexts);
     }
     getMaxLabelSizeSecondary(modelInstance) {
         const scaleModel = new ScaleModel(this.configReader.options, modelInstance.canvasModel).getScaleSecondaryLinear(modelInstance.dataModel.repository.getRawRows(), this.configReader);
-        const labelsTexts = this.getValueAxisLabels(scaleModel, modelInstance).map((v) => this.configReader.getSecondaryAxisLabelFormatter()(v).toString());
+        const labelsTexts = this.getValueAxisLabels(scaleModel).map((v) => this.configReader.getSecondaryAxisLabelFormatter()(v).toString());
         return AxisModel.getLabelSize(this.designerConfig.canvas.axisLabel.maxSize.main, labelsTexts);
     }
     recalcVerticalMarginByAxisLabelHeight(labelHeight, canvasModel) {
@@ -112,16 +112,14 @@ export class TwoDimMarginModel {
         };
         canvasModel.increaseMarginSide(axisMarginMapping[keyAxisOrient], valueLabelFontSize + OFFSET_SIZE_PX);
     }
-    getValueAxisLabels(scaleModel, modelInstance) {
+    getValueAxisLabels(scaleModel) {
         const scale = Scale.getScaleValue(scaleModel);
         const ticksPolicy = AxisModel.getTickAmountPolicy(this.configReader.options.orientation, this.configReader.options.axis.value, scaleModel);
-        let outputValues;
+        let outputValues = [];
         if (ticksPolicy.type === "constant")
             outputValues = ticksPolicy.values;
         else if (ticksPolicy.type === "amount")
             outputValues = scale.ticks(ticksPolicy.amount);
-        else
-            outputValues = this.configReader.getBiggestValueAndDecremented(modelInstance.dataModel.repository);
         return outputValues;
     }
 }

package/lib/model/modelInstance/configReader.d.ts

@@ -1,6 +1,5 @@
 import { AxisLabelFormatter, MdtChartsConfig, MdtChartsField, MdtChartsFieldName, MdtChartsTwoDimensionalOptions, TwoDimensionalChartType, TwoDimensionalValueGroup, ValueLabelsFormatter } from "../../config/config";
 import { DesignerConfig } from "../../designer/designerConfig";
-import { DataRepositoryModel } from "../../model/modelInstance/dataModel/dataRepository";
 import { ValueLabelsStyleModel } from "../model";
 interface BaseConfigReader {
     getValueFields(): MdtChartsField[];
@@ -11,8 +10,6 @@ export declare class TwoDimConfigReader implements BaseConfigReader {
     readonly options: MdtChartsTwoDimensionalOptions;
     constructor(config: MdtChartsConfig, designerConfig: DesignerConfig);
     getValueFields(): MdtChartsField[];
-    getBiggestValueAndDecremented(repository: DataRepositoryModel): number[];
-    getBiggestValueAndDecrementedSecondary(repository: DataRepositoryModel): number[];
     getFieldsBySegments(valueGroup: TwoDimensionalValueGroup): MdtChartsFieldName[][];
     getAxisLabelFormatter(): AxisLabelFormatter;
     getSecondaryAxisLabelFormatter(): AxisLabelFormatter;
@@ -26,7 +23,6 @@ export declare class TwoDimConfigReader implements BaseConfigReader {
     areValueLabelsOn(): boolean;
     areValueLabelsNeedIncreaseMargin(): boolean;
     getValueLabelsStyleModel(): ValueLabelsStyleModel;
-    private calculateBiggestValueAndDecremented;
     private calculateAxisLabelFormatter;
 }
 export declare class PolarConfigReader implements BaseConfigReader {

package/lib/model/modelInstance/configReader.js

@@ -1,4 +1,3 @@
-import { getResolvedDomain } from "../../model/featuresModel/scaleModel/scaleDomainService";
 export function getConfigReader(config, designerConfig) {
     if (config.options.type === "2d")
         return new TwoDimConfigReader(config, designerConfig);
@@ -18,12 +17,6 @@ export class TwoDimConfigReader {
         });
         return fields;
     }
-    getBiggestValueAndDecremented(repository) {
-        return this.calculateBiggestValueAndDecremented(repository, this.options.axis.value.domain, this.getFieldsBySegments("main"));
-    }
-    getBiggestValueAndDecrementedSecondary(repository) {
-        return this.calculateBiggestValueAndDecremented(repository, this.options.axis.valueSecondary.domain, this.getFieldsBySegments("secondary"));
-    }
     getFieldsBySegments(valueGroup) {
         const segments = [];
         const valueGroupCharts = this.options.charts.filter((chart) => { var _a; return ((_a = chart.data.valueGroup) !== null && _a !== void 0 ? _a : "main") === valueGroup; });
@@ -90,13 +83,6 @@ export class TwoDimConfigReader {
             cssClassName: (_h = (_g = this.options.valueLabels) === null || _g === void 0 ? void 0 : _g.style) === null || _h === void 0 ? void 0 : _h.cssClassName
         };
     }
-    calculateBiggestValueAndDecremented(repository, domain, fields) {
-        const resolvedDomain = getResolvedDomain(domain, repository.getRawRows());
-        if (resolvedDomain && resolvedDomain.end !== -1) {
-            return [resolvedDomain.end, resolvedDomain.end - 1];
-        }
-        return repository.getBiggestValueAndDecremented(fields);
-    }
     calculateAxisLabelFormatter(axisValue) {
         var _a, _b;
         if ((_a = axisValue.labels) === null || _a === void 0 ? void 0 : _a.format)

package/package.json

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