mdt-charts 1.15.4 → 1.15.6

package/lib/config/config.d.ts

@@ -86,8 +86,9 @@ export interface DataOptions {
     keyField: MdtChartsField;
     maxRecordsAmount?: number;
 }
+export declare type MdtChartsFieldName = string;
 export interface MdtChartsField {
-    name: string;
+    name: MdtChartsFieldName;
     format: DataType;
 }
 export interface MdtChartsValueField extends MdtChartsField {

package/lib/engine/features/axis/axisLabelDomHelper.js

@@ -38,12 +38,13 @@ export class AxisLabelHelper {
         }
     }
     static cropLabels(block, scale, scaleOptions, axisOptions, blockSize) {
+        var _a, _b, _c;
         const axisTextBlocks = block.getSvg().select(`.${axisOptions.cssClass}`).selectAll('text');
         let maxLabelSize;
         if ((axisOptions.orient === 'left' || axisOptions.orient === 'right') || (axisOptions.type === 'key' && axisOptions.labels.position === 'rotated'))
             maxLabelSize = axisOptions.labels.maxSize;
         else
-            maxLabelSize = scale.step() - 4;
+            maxLabelSize = ((_c = (_b = (_a = scale).step) === null || _b === void 0 ? void 0 : _b.call(_a)) !== null && _c !== void 0 ? _c : Infinity) - 4;
         DomHelper.cropSvgLabels(axisTextBlocks, maxLabelSize);
         if (scaleOptions.type === 'point' && axisOptions.labels.position === 'straight' && (axisOptions.orient === 'top' || axisOptions.orient === 'bottom')) {
             this.cropAndAlignExtremeLabels(block, maxLabelSize, axisOptions, blockSize);

package/lib/model/featuresModel/axisModel.js

@@ -82,7 +82,7 @@ export class AxisModel {
     }
     static getLabelSize(labelMaxWidth, labelTexts) {
         const LABEL_ELEMENT_HEIGHT_PX = 17;
-        const ONE_UPPER_SYMBOL_WIDTH_PX = 8.6;
+        const ONE_UPPER_SYMBOL_WIDTH_PX = 8;
         const longestLabelLength = Math.max(...labelTexts.map(t => ModelHelper.getStringScore(t)));
         const longestLabelWidth = ONE_UPPER_SYMBOL_WIDTH_PX * longestLabelLength;
         return {

package/lib/model/helpers/modelHelper.js

@@ -29,12 +29,18 @@ export class ModelHelper {
         // Number width == lower case letter width
         let score = 0;
         const upperLetterScore = 1;
-        const lowerLetterScore = 0.74;
+        const lowerLetterScore = 0.8;
+        const digitAndSymbolScore = 0.67;
+        const specialSmallSymbols = [",", ".", " "];
         for (let i = 0; i < word.length; i++) {
-            if (word[i].toUpperCase() === word[i] && parseFloat(word[i]).toString() !== word[i])
-                score += upperLetterScore;
+            if (parseFloat(word[i]).toString() !== word[i] && !specialSmallSymbols.includes(word[i]) && word[i].trim().length > 0) {
+                if (word[i].toUpperCase() === word[i])
+                    score += upperLetterScore;
+                else
+                    score += lowerLetterScore;
+            }
             else
-                score += lowerLetterScore;
+                score += digitAndSymbolScore;
         }
         return score;
     }

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

@@ -43,7 +43,8 @@ export class TwoDimMarginModel {
             labelsTexts = modelInstance.dataModel.repository.getValuesByKeyField();
         }
         else {
-            labelsTexts = modelInstance.dataModel.repository.getBiggestValueAndDecremented().map(v => this.configReader.getAxisLabelFormatter()(v));
+            labelsTexts = modelInstance.dataModel.repository.getBiggestValueAndDecremented(this.configReader.getFieldsBySegments())
+                .map(v => this.configReader.getAxisLabelFormatter()(v));
         }
         return AxisModel.getLabelSize(this.designerConfig.canvas.axisLabel.maxSize.main, labelsTexts);
     }

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

@@ -1,4 +1,4 @@
-import { AxisLabelFormatter, MdtChartsConfig, MdtChartsField, MdtChartsTwoDimensionalOptions, TwoDimensionalChartType } from "../../config/config";
+import { AxisLabelFormatter, MdtChartsConfig, MdtChartsField, MdtChartsFieldName, MdtChartsTwoDimensionalOptions, TwoDimensionalChartType } from "../../config/config";
 import { DesignerConfig } from "../../designer/designerConfig";
 interface BaseConfigReader {
     getValueFields(): MdtChartsField[];
@@ -9,6 +9,7 @@ export declare class TwoDimConfigReader implements BaseConfigReader {
     readonly options: MdtChartsTwoDimensionalOptions;
     constructor(config: MdtChartsConfig, designerConfig: DesignerConfig);
     getValueFields(): MdtChartsField[];
+    getFieldsBySegments(): MdtChartsFieldName[][];
     getAxisLabelFormatter(): AxisLabelFormatter;
     getLegendItemInfo(): {
         text: string;

package/lib/model/modelInstance/configReader.js

@@ -17,6 +17,16 @@ export class TwoDimConfigReader {
         });
         return fields;
     }
+    getFieldsBySegments() {
+        const segments = [];
+        this.options.charts.forEach(chart => {
+            if (!chart.isSegmented)
+                segments.push(...chart.data.valueFields.map(vf => [vf.name]));
+            else
+                segments.push(...[chart.data.valueFields.map(vf => vf.name)]);
+        });
+        return segments;
+    }
     getAxisLabelFormatter() {
         var _a, _b;
         if ((_a = this.options.axis.value.labels) === null || _a === void 0 ? void 0 : _a.format)

package/lib/model/modelInstance/dataModel/dataRepository.d.ts

@@ -1,4 +1,4 @@
-import { DataOptions, MdtChartsDataSource, MdtChartsField } from "../../../config/config";
+import { DataOptions, MdtChartsDataSource, MdtChartsField, MdtChartsFieldName } from "../../../config/config";
 export declare class DataRepositoryModel {
     private rawFullSource;
     private scopedFullSource;
@@ -7,7 +7,7 @@ export declare class DataRepositoryModel {
     private valueFields;
     initOptions(options: DataOptions, valueFields: MdtChartsField[]): void;
     getValuesByKeyField(): any[];
-    getBiggestValueAndDecremented(): number[];
+    getBiggestValueAndDecremented(segmentedFields?: MdtChartsFieldName[][]): [number, number];
     initRawFullSource(rawSource: MdtChartsDataSource): void;
     getRawRows(): import("../../../config/config").MdtChartsDataRow[];
     getFirstRow(): import("../../../config/config").MdtChartsDataRow;

package/lib/model/modelInstance/dataModel/dataRepository.js

@@ -7,10 +7,17 @@ export class DataRepositoryModel {
     getValuesByKeyField() {
         return this.getRawRows().map(dataRow => dataRow[this.keyField.name]);
     }
-    getBiggestValueAndDecremented() {
+    getBiggestValueAndDecremented(segmentedFields) {
         const values = [];
         this.getRawRows().forEach(row => {
-            this.valueFields.forEach(vf => values.push(row[vf.name]));
+            if (!segmentedFields) {
+                this.valueFields.forEach(vf => values.push(row[vf.name]));
+                return;
+            }
+            segmentedFields.forEach(fields => {
+                const valuesBySegment = fields.reduce((acc, f) => acc + row[f], 0);
+                values.push(valuesBySegment);
+            });
         });
         const biggest = Math.max(...values);
         return [biggest, biggest - 1];

package/package.json

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