mdt-charts 1.29.0 → 1.30.0

package/lib/model/helpers/twoDimensionalModelHelper.d.ts

@@ -1,40 +1,12 @@
-import {
-	ChartOrientation,
-	MdtChartsDataRow,
-	MdtChartsTwoDimensionalChart,
-	MdtChartsTwoDimensionalValueLabels
-} from "../../config/config";
-import {
-	GradientDef,
-	MarkDotDatumItem,
-	Orient,
-	TwoDimensionalChartModel,
-	TwoDimensionalValueLabels,
-	ValueLabelsStyleModel
-} from "../model";
+import { ChartOrientation, MdtChartsDataRow, MdtChartsTwoDimensionalChart, MdtChartsTwoDimensionalValueLabels } from "../../config/config";
+import { GradientDef, MarkDotDatumItem, Orient, TwoDimensionalChartModel, TwoDimensionalValueLabels, ValueLabelsStyleModel } from "../model";
 import { CanvasModel } from "../modelInstance/canvasModel/canvasModel";
 export declare class TwoDimensionalModelHelper {
-	static shouldMarkerShow(
-		chart: MdtChartsTwoDimensionalChart,
-		dataRows: MdtChartsDataRow[],
-		valueFieldName: string,
-		currentRow: MarkDotDatumItem,
-		keyFieldName: string
-	): boolean;
-	static getGradientDefs(
-		charts: TwoDimensionalChartModel[],
-		keyAxisOrient: Orient,
-		chartOrient: ChartOrientation,
-		chartBlockId: number
-	): GradientDef[];
-	private static getGradientItems;
-	private static calculateOpacityItem;
-	private static getGradientItemColor;
-	static getValueLabels(
-		valueLabels: MdtChartsTwoDimensionalValueLabels,
-		canvasModel: CanvasModel,
-		chartOrientation: ChartOrientation,
-		styleModel: ValueLabelsStyleModel
-	): TwoDimensionalValueLabels;
-	private static getChartBlockSidesOptions;
+    static shouldMarkerShow(chart: MdtChartsTwoDimensionalChart, dataRows: MdtChartsDataRow[], valueFieldName: string, currentRow: MarkDotDatumItem, keyFieldName: string): boolean;
+    static getGradientDefs(charts: TwoDimensionalChartModel[], keyAxisOrient: Orient, chartOrient: ChartOrientation, chartBlockId: number): GradientDef[];
+    private static getGradientItems;
+    private static calculateOpacityItem;
+    private static getGradientItemColor;
+    static getValueLabels(valueLabels: MdtChartsTwoDimensionalValueLabels, canvasModel: CanvasModel, chartOrientation: ChartOrientation, styleModel: ValueLabelsStyleModel): TwoDimensionalValueLabels;
+    private static getChartBlockSidesOptions;
 }

package/lib/model/helpers/twoDimensionalModelHelper.js

@@ -1,150 +1,128 @@
 import { getGradientId } from "../../model/notations/twoDimensional/styles";
-import {
-	hasCollisionBottomSide,
-	hasCollisionLeftSide,
-	hasCollisionRightSide,
-	hasCollisionTopSide,
-	shiftCoordinateXLeft,
-	shiftCoordinateXRight,
-	shiftCoordinateYBottom,
-	shiftCoordinateYTop
-} from "../featuresModel/valueLabelsModel/valueLabelsModel";
+import { hasCollisionBottomSide, hasCollisionLeftSide, hasCollisionRightSide, hasCollisionTopSide, shiftCoordinateXLeft, shiftCoordinateXRight, shiftCoordinateYBottom, shiftCoordinateYTop } from "../featuresModel/valueLabelsModel/valueLabelsModel";
 export class TwoDimensionalModelHelper {
-	static shouldMarkerShow(chart, dataRows, valueFieldName, currentRow, keyFieldName) {
-		if (chart.markers.show || dataRows.length === 1) return true;
-		const rowIndex = dataRows.findIndex((row) => row[keyFieldName] === currentRow[keyFieldName]);
-		if (rowIndex === -1) return false;
-		const isFirst = rowIndex === 0;
-		const isLast = rowIndex === dataRows.length - 1;
-		const previousRow = dataRows[rowIndex - 1];
-		const nextRow = dataRows[rowIndex + 1];
-		const hasNullNeighborsRows =
-			!isFirst &&
-			!isLast &&
-			(previousRow === null || previousRow === void 0 ? void 0 : previousRow[valueFieldName]) === null &&
-			(nextRow === null || nextRow === void 0 ? void 0 : nextRow[valueFieldName]) === null;
-		return (
-			(isFirst && (nextRow === null || nextRow === void 0 ? void 0 : nextRow[valueFieldName]) === null) ||
-			(isLast &&
-				(previousRow === null || previousRow === void 0 ? void 0 : previousRow[valueFieldName]) === null) ||
-			hasNullNeighborsRows
-		);
-	}
-	static getGradientDefs(charts, keyAxisOrient, chartOrient, chartBlockId) {
-		let gradients = [];
-		charts.forEach((chart) => {
-			var _a;
-			if (chart.type === "area" && chart.areaViewOptions.fill.type === "gradient") {
-				(_a = chart.style.elementColors) === null || _a === void 0
-					? void 0
-					: _a.forEach((elementColor, subIndex) => {
-							const gradientId = getGradientId(chart.index, subIndex, chartBlockId);
-							gradients.push({
-								id: gradientId,
-								position: {
-									x1: 0,
-									y1: 0,
-									x2: chartOrient === "horizontal" ? 1 : 0,
-									y2: chartOrient === "horizontal" ? 0 : 1
-								},
-								items: this.getGradientItems(gradientId, elementColor, keyAxisOrient)
-							});
-					  });
-			}
-		});
-		return gradients;
-	}
-	static getGradientItems(gradientId, elementColor, keyAxisOrient) {
-		return [0, 1].map((itemIndex) => ({
-			id: gradientId + `-item-${itemIndex}`,
-			color: this.getGradientItemColor(itemIndex, keyAxisOrient, elementColor),
-			offset: itemIndex,
-			opacity: this.calculateOpacityItem(itemIndex, keyAxisOrient)
-		}));
-	}
-	static calculateOpacityItem(itemIndex, orientation) {
-		const maxOpacity = 0.3;
-		const minOpacity = 0;
-		if (orientation === "bottom" || orientation === "right") return itemIndex === 0 ? maxOpacity : minOpacity;
-		else return itemIndex === 0 ? minOpacity : maxOpacity;
-	}
-	static getGradientItemColor(itemIndex, orientation, elementColor) {
-		const maxColor = elementColor;
-		const minColor = "white";
-		if (orientation === "bottom" || orientation === "right") return itemIndex === 0 ? maxColor : minColor;
-		else return itemIndex === 0 ? minColor : maxColor;
-	}
-	static getValueLabels(valueLabels, canvasModel, chartOrientation, styleModel) {
-		var _a, _b;
-		const blockSidesOptions = this.getChartBlockSidesOptions(canvasModel);
-		const chartBlockConfig = {
-			vertical: {
-				left: {
-					mode: "shift",
-					hasCollision: blockSidesOptions.hasCollisionLeft,
-					shiftCoordinate: blockSidesOptions.shiftToRight
-				},
-				right: {
-					mode: "shift",
-					hasCollision: blockSidesOptions.hasCollisionRight,
-					shiftCoordinate: blockSidesOptions.shiftToLeft
-				},
-				top: {
-					mode: "none"
-				},
-				bottom: {
-					mode: "none"
-				}
-			},
-			horizontal: {
-				left: {
-					mode: "none"
-				},
-				right: {
-					mode: "none"
-				},
-				top: {
-					mode: "shift",
-					hasCollision: blockSidesOptions.hasCollisionTop,
-					shiftCoordinate: blockSidesOptions.shiftBottom
-				},
-				bottom: {
-					mode: "shift",
-					hasCollision: blockSidesOptions.hasCollisionBottom,
-					shiftCoordinate: blockSidesOptions.shiftTop
-				}
-			}
-		};
-		return {
-			collision: {
-				otherValueLables:
-					(_b =
-						(_a = valueLabels === null || valueLabels === void 0 ? void 0 : valueLabels.collision) ===
-							null || _a === void 0
-							? void 0
-							: _a.otherValueLabels) !== null && _b !== void 0
-						? _b
-						: {
-								mode: "none"
-						  },
-				chartBlock: chartBlockConfig[chartOrientation]
-			},
-			style: styleModel
-		};
-	}
-	static getChartBlockSidesOptions(canvasModel) {
-		return {
-			hasCollisionLeft: (labelClientRect) => hasCollisionLeftSide(labelClientRect, canvasModel.getMargin()),
-			shiftToLeft: (labelClientRect) =>
-				shiftCoordinateXLeft(labelClientRect, canvasModel.getBlockSize(), canvasModel.getMargin()),
-			hasCollisionRight: (labelClientRect) =>
-				hasCollisionRightSide(labelClientRect, canvasModel.getBlockSize(), canvasModel.getMargin()),
-			shiftToRight: (labelClientRect) => shiftCoordinateXRight(labelClientRect, canvasModel.getMargin()),
-			hasCollisionTop: (labelClientRect) => hasCollisionTopSide(labelClientRect, canvasModel.getMargin()),
-			shiftTop: (labelClientRect) => shiftCoordinateYTop(labelClientRect),
-			hasCollisionBottom: (labelClientRect) =>
-				hasCollisionBottomSide(labelClientRect, canvasModel.getBlockSize(), canvasModel.getMargin()),
-			shiftBottom: (labelClientRect) => shiftCoordinateYBottom(labelClientRect)
-		};
-	}
+    static shouldMarkerShow(chart, dataRows, valueFieldName, currentRow, keyFieldName) {
+        if (chart.markers.show || dataRows.length === 1)
+            return true;
+        const rowIndex = dataRows.findIndex((row) => row[keyFieldName] === currentRow[keyFieldName]);
+        if (rowIndex === -1)
+            return false;
+        const isFirst = rowIndex === 0;
+        const isLast = rowIndex === dataRows.length - 1;
+        const previousRow = dataRows[rowIndex - 1];
+        const nextRow = dataRows[rowIndex + 1];
+        const hasNullNeighborsRows = !isFirst && !isLast && (previousRow === null || previousRow === void 0 ? void 0 : previousRow[valueFieldName]) === null && (nextRow === null || nextRow === void 0 ? void 0 : nextRow[valueFieldName]) === null;
+        return ((isFirst && (nextRow === null || nextRow === void 0 ? void 0 : nextRow[valueFieldName]) === null) ||
+            (isLast && (previousRow === null || previousRow === void 0 ? void 0 : previousRow[valueFieldName]) === null) ||
+            hasNullNeighborsRows);
+    }
+    static getGradientDefs(charts, keyAxisOrient, chartOrient, chartBlockId) {
+        let gradients = [];
+        charts.forEach((chart) => {
+            var _a;
+            if (chart.type === "area" && chart.areaViewOptions.fill.type === "gradient") {
+                (_a = chart.style.elementColors) === null || _a === void 0 ? void 0 : _a.forEach((elementColor, subIndex) => {
+                    const gradientId = getGradientId(chart.index, subIndex, chartBlockId);
+                    gradients.push({
+                        id: gradientId,
+                        position: {
+                            x1: 0,
+                            y1: 0,
+                            x2: chartOrient === "horizontal" ? 1 : 0,
+                            y2: chartOrient === "horizontal" ? 0 : 1
+                        },
+                        items: this.getGradientItems(gradientId, elementColor, keyAxisOrient)
+                    });
+                });
+            }
+        });
+        return gradients;
+    }
+    static getGradientItems(gradientId, elementColor, keyAxisOrient) {
+        return [0, 1].map((itemIndex) => ({
+            id: gradientId + `-item-${itemIndex}`,
+            color: this.getGradientItemColor(itemIndex, keyAxisOrient, elementColor),
+            offset: itemIndex,
+            opacity: this.calculateOpacityItem(itemIndex, keyAxisOrient)
+        }));
+    }
+    static calculateOpacityItem(itemIndex, orientation) {
+        const maxOpacity = 0.3;
+        const minOpacity = 0;
+        if (orientation === "bottom" || orientation === "right")
+            return itemIndex === 0 ? maxOpacity : minOpacity;
+        else
+            return itemIndex === 0 ? minOpacity : maxOpacity;
+    }
+    static getGradientItemColor(itemIndex, orientation, elementColor) {
+        const maxColor = elementColor;
+        const minColor = "white";
+        if (orientation === "bottom" || orientation === "right")
+            return itemIndex === 0 ? maxColor : minColor;
+        else
+            return itemIndex === 0 ? minColor : maxColor;
+    }
+    static getValueLabels(valueLabels, canvasModel, chartOrientation, styleModel) {
+        var _a, _b;
+        const blockSidesOptions = this.getChartBlockSidesOptions(canvasModel);
+        const chartBlockConfig = {
+            vertical: {
+                left: {
+                    mode: "shift",
+                    hasCollision: blockSidesOptions.hasCollisionLeft,
+                    shiftCoordinate: blockSidesOptions.shiftToRight
+                },
+                right: {
+                    mode: "shift",
+                    hasCollision: blockSidesOptions.hasCollisionRight,
+                    shiftCoordinate: blockSidesOptions.shiftToLeft
+                },
+                top: {
+                    mode: "none"
+                },
+                bottom: {
+                    mode: "none"
+                }
+            },
+            horizontal: {
+                left: {
+                    mode: "none"
+                },
+                right: {
+                    mode: "none"
+                },
+                top: {
+                    mode: "shift",
+                    hasCollision: blockSidesOptions.hasCollisionTop,
+                    shiftCoordinate: blockSidesOptions.shiftBottom
+                },
+                bottom: {
+                    mode: "shift",
+                    hasCollision: blockSidesOptions.hasCollisionBottom,
+                    shiftCoordinate: blockSidesOptions.shiftTop
+                }
+            }
+        };
+        return {
+            collision: {
+                otherValueLables: (_b = (_a = valueLabels === null || valueLabels === void 0 ? void 0 : valueLabels.collision) === null || _a === void 0 ? void 0 : _a.otherValueLabels) !== null && _b !== void 0 ? _b : {
+                    mode: "none"
+                },
+                chartBlock: chartBlockConfig[chartOrientation]
+            },
+            style: styleModel
+        };
+    }
+    static getChartBlockSidesOptions(canvasModel) {
+        return {
+            hasCollisionLeft: (labelClientRect) => hasCollisionLeftSide(labelClientRect, canvasModel.getMargin()),
+            shiftToLeft: (labelClientRect) => shiftCoordinateXLeft(labelClientRect, canvasModel.getBlockSize(), canvasModel.getMargin()),
+            hasCollisionRight: (labelClientRect) => hasCollisionRightSide(labelClientRect, canvasModel.getBlockSize(), canvasModel.getMargin()),
+            shiftToRight: (labelClientRect) => shiftCoordinateXRight(labelClientRect, canvasModel.getMargin()),
+            hasCollisionTop: (labelClientRect) => hasCollisionTopSide(labelClientRect, canvasModel.getMargin()),
+            shiftTop: (labelClientRect) => shiftCoordinateYTop(labelClientRect),
+            hasCollisionBottom: (labelClientRect) => hasCollisionBottomSide(labelClientRect, canvasModel.getBlockSize(), canvasModel.getMargin()),
+            shiftBottom: (labelClientRect) => shiftCoordinateYBottom(labelClientRect)
+        };
+    }
 }

package/lib/model/helpers/unitsFromConfigReader.js

@@ -1,7 +1,7 @@
 import { UnitsReader } from "./unitsReader";
 export function getPxPercentUnitByValue(value) {
-	const unitsReader = new UnitsReader();
-	const defaultUnit = "px";
-	const units = ["%", "px"];
-	return unitsReader.getUnitByValue(value, defaultUnit, units);
+    const unitsReader = new UnitsReader();
+    const defaultUnit = "px";
+    const units = ["%", "px"];
+    return unitsReader.getUnitByValue(value, defaultUnit, units);
 }

package/lib/model/helpers/unitsReader.d.ts

@@ -1,5 +1,5 @@
 import { UnitsFromConfig } from "../model";
 export declare class UnitsReader {
-	getUnitByValue<T extends string = UnitsFromConfig>(value: string | number, defaultUnit: T, units: T[]): T;
-	private getLastUnitFromString;
+    getUnitByValue<T extends string = UnitsFromConfig>(value: string | number, defaultUnit: T, units: T[]): T;
+    private getLastUnitFromString;
 }

package/lib/model/helpers/unitsReader.js

@@ -1,13 +1,15 @@
 export class UnitsReader {
-	getUnitByValue(value, defaultUnit, units) {
-		if (typeof value !== "string") return defaultUnit;
-		return this.getLastUnitFromString(value, units) || defaultUnit;
-	}
-	getLastUnitFromString(value, units) {
-		let resultUnit = null;
-		units.forEach((unit) => {
-			if (value.endsWith(unit)) resultUnit = unit;
-		});
-		return resultUnit;
-	}
+    getUnitByValue(value, defaultUnit, units) {
+        if (typeof value !== "string")
+            return defaultUnit;
+        return this.getLastUnitFromString(value, units) || defaultUnit;
+    }
+    getLastUnitFromString(value, units) {
+        let resultUnit = null;
+        units.forEach((unit) => {
+            if (value.endsWith(unit))
+                resultUnit = unit;
+        });
+        return resultUnit;
+    }
 }

package/lib/model/margin/marginModel.d.ts

@@ -3,11 +3,11 @@ import { DesignerConfig } from "../../designer/designerConfig";
 import { OtherCommonComponents } from "../model";
 import { ModelInstance } from "../modelInstance/modelInstance";
 export declare class MarginModel {
-	private designerConfig;
-	private config;
-	private twoDimModel;
-	constructor(designerConfig: DesignerConfig, config: MdtChartsConfig);
-	initMargin(otherComponents: OtherCommonComponents, modelInstance: ModelInstance): void;
-	recalcMarginByVerticalAxisLabel(modelInstance: ModelInstance): void;
-	private recalcMarginByTitle;
+    private designerConfig;
+    private config;
+    private twoDimModel;
+    constructor(designerConfig: DesignerConfig, config: MdtChartsConfig);
+    initMargin(otherComponents: OtherCommonComponents, modelInstance: ModelInstance): void;
+    recalcMarginByVerticalAxisLabel(modelInstance: ModelInstance): void;
+    private recalcMarginByTitle;
 }

package/lib/model/margin/marginModel.js

@@ -1,27 +1,24 @@
 import { TwoDimMarginModel } from "./twoDim/twoDimMarginModel";
 import { TwoDimConfigReader } from "../modelInstance/configReader";
 export class MarginModel {
-	constructor(designerConfig, config) {
-		this.designerConfig = designerConfig;
-		this.config = config;
-		//TODO: ensure
-		this.twoDimModel = new TwoDimMarginModel(
-			this.designerConfig,
-			new TwoDimConfigReader(this.config, this.designerConfig)
-		);
-	}
-	initMargin(otherComponents, modelInstance) {
-		const canvasModel = modelInstance.canvasModel;
-		canvasModel.initMargin(Object.assign({}, this.designerConfig.canvas.chartBlockMargin));
-		this.recalcMarginByTitle(canvasModel);
-		if (this.config.options.type === "2d") {
-			this.twoDimModel.recalcMargin(otherComponents, modelInstance);
-		}
-	}
-	recalcMarginByVerticalAxisLabel(modelInstance) {
-		this.twoDimModel.recalcMarginByVerticalAxisLabel(modelInstance);
-	}
-	recalcMarginByTitle(canvasModel) {
-		canvasModel.increaseMarginSide("top", canvasModel.titleCanvas.getAllNeededSpace());
-	}
+    constructor(designerConfig, config) {
+        this.designerConfig = designerConfig;
+        this.config = config;
+        //TODO: ensure
+        this.twoDimModel = new TwoDimMarginModel(this.designerConfig, new TwoDimConfigReader(this.config, this.designerConfig));
+    }
+    initMargin(otherComponents, modelInstance) {
+        const canvasModel = modelInstance.canvasModel;
+        canvasModel.initMargin(Object.assign({}, this.designerConfig.canvas.chartBlockMargin));
+        this.recalcMarginByTitle(canvasModel);
+        if (this.config.options.type === "2d") {
+            this.twoDimModel.recalcMargin(otherComponents, modelInstance);
+        }
+    }
+    recalcMarginByVerticalAxisLabel(modelInstance) {
+        this.twoDimModel.recalcMarginByVerticalAxisLabel(modelInstance);
+    }
+    recalcMarginByTitle(canvasModel) {
+        canvasModel.increaseMarginSide("top", canvasModel.titleCanvas.getAllNeededSpace());
+    }
 }

package/lib/model/margin/twoDim/twoDimMarginModel.d.ts

@@ -5,17 +5,17 @@ import { ModelInstance } from "../../modelInstance/modelInstance";
 export declare const AXIS_HORIZONTAL_LABEL_PADDING = 12;
 export declare const AXIS_VERTICAL_LABEL_PADDING = 8;
 export declare class TwoDimMarginModel {
-	private designerConfig;
-	private configReader;
-	private twoDimLegendModel;
-	constructor(designerConfig: DesignerConfig, configReader: TwoDimConfigReader);
-	recalcMargin(otherComponents: OtherCommonComponents, modelInstance: ModelInstance): void;
-	recalcMarginByVerticalAxisLabel(modelInstance: ModelInstance): void;
-	private getMaxLabelSize;
-	private getMaxLabelSizeSecondary;
-	private recalcVerticalMarginByAxisLabelHeight;
-	private recalcHorizontalMarginByAxisLabelWidth;
-	private recalcMarginBySecondaryAxisLabelSize;
-	private recalcVerticalMarginWithValueLabelsOn;
-	private getValueAxisLabels;
+    private designerConfig;
+    private configReader;
+    private twoDimLegendModel;
+    constructor(designerConfig: DesignerConfig, configReader: TwoDimConfigReader);
+    recalcMargin(otherComponents: OtherCommonComponents, modelInstance: ModelInstance): void;
+    recalcMarginByVerticalAxisLabel(modelInstance: ModelInstance): void;
+    private getMaxLabelSize;
+    private getMaxLabelSizeSecondary;
+    private recalcVerticalMarginByAxisLabelHeight;
+    private recalcHorizontalMarginByAxisLabelWidth;
+    private recalcMarginBySecondaryAxisLabelSize;
+    private recalcVerticalMarginWithValueLabelsOn;
+    private getValueAxisLabels;
 }