mdt-charts 1.27.3 → 1.27.4

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.3",
+	"version": "1.27.4",
 	"description": "",
 	"main": "lib/main.js",
 	"scripts": {