mdt-charts 1.29.0 → 1.30.0

package/lib/engine/features/tolltip/tooltipHelper.d.ts

@@ -6,43 +6,13 @@ import { Size } from "../../../config/config";
 import { TooltipCoordinate } from "./newTooltip/newTooltip";
 import { TooltipPreCoordinate } from "./newTooltip/newTooltipService";
 export declare class TooltipHelper {
-	private static convexsize;
-	static getHorizontalPad(
-		coordinateX: number,
-		tooltipBlockWidth: number,
-		blockSize: Size,
-		translateX: number
-	): number;
-	static getVerticalPad(coordinateY: number, tooltipBlockHeight: number, translateY: number): number;
-	static getTooltipArrowPadding(tooltipBlockWidth: number, horizontalPad: number): number;
-	static getCoordinateByPointer(pointer: [number, number]): TooltipCoordinate;
-	static getTooltipFixedCoordinate(
-		scaleKey: AxisScale<any>,
-		margin: BlockMargin,
-		keyValue: string,
-		blockBoundingRect: DOMRect,
-		tooltipBoundingRect: DOMRect,
-		keyAxisOrient: Orient,
-		winWidth: number,
-		winHeight: number
-	): TooltipCoordinate;
-	static getTooltipCursorCoordinate(
-		pointer: [number, number],
-		blockBoundingRect: DOMRect,
-		tooltipBoundingRect: DOMRect
-	): TooltipCoordinate;
-	static getTooltipLineAttributes(
-		scaleKey: AxisScale<any>,
-		margin: BlockMargin,
-		key: string,
-		chartOrientation: ChartOrientation,
-		blockSize: Size
-	): TooltipLineAttributes;
-	static recalcToolTipCoordinateByViewPort(
-		blockBounding: DOMRect,
-		tooltipBounding: DOMRect,
-		preCoordinate: TooltipPreCoordinate,
-		winWidth: number,
-		winHeight: number
-	): TooltipCoordinate;
+    private static convexsize;
+    static getHorizontalPad(coordinateX: number, tooltipBlockWidth: number, blockSize: Size, translateX: number): number;
+    static getVerticalPad(coordinateY: number, tooltipBlockHeight: number, translateY: number): number;
+    static getTooltipArrowPadding(tooltipBlockWidth: number, horizontalPad: number): number;
+    static getCoordinateByPointer(pointer: [number, number]): TooltipCoordinate;
+    static getTooltipFixedCoordinate(scaleKey: AxisScale<any>, margin: BlockMargin, keyValue: string, blockBoundingRect: DOMRect, tooltipBoundingRect: DOMRect, keyAxisOrient: Orient, winWidth: number, winHeight: number): TooltipCoordinate;
+    static getTooltipCursorCoordinate(pointer: [number, number], blockBoundingRect: DOMRect, tooltipBoundingRect: DOMRect): TooltipCoordinate;
+    static getTooltipLineAttributes(scaleKey: AxisScale<any>, margin: BlockMargin, key: string, chartOrientation: ChartOrientation, blockSize: Size): TooltipLineAttributes;
+    static recalcToolTipCoordinateByViewPort(blockBounding: DOMRect, tooltipBounding: DOMRect, preCoordinate: TooltipPreCoordinate, winWidth: number, winHeight: number): TooltipCoordinate;
 }

package/lib/engine/features/tolltip/tooltipHelper.js

@@ -2,119 +2,96 @@ import { Scale } from "../scale/scale";
 import { ARROW_DEFAULT_POSITION, TOOLTIP_ARROW_PADDING_X, TOOLTIP_ARROW_PADDING_Y } from "./tooltipDomHelper";
 import { TooltipService } from "./newTooltip/newTooltipService";
 export class TooltipHelper {
-	static getHorizontalPad(coordinateX, tooltipBlockWidth, blockSize, translateX) {
-		let pad = 0;
-		if (tooltipBlockWidth + coordinateX - TOOLTIP_ARROW_PADDING_X + translateX > blockSize.width)
-			pad = tooltipBlockWidth + coordinateX - TOOLTIP_ARROW_PADDING_X + translateX - blockSize.width;
-		return pad;
-	}
-	static getVerticalPad(coordinateY, tooltipBlockHeight, translateY) {
-		let pad = 0;
-		if (
-			coordinateY - TOOLTIP_ARROW_PADDING_Y - tooltipBlockHeight + translateY <
-			-tooltipBlockHeight - TOOLTIP_ARROW_PADDING_Y
-		)
-			pad = coordinateY;
-		return pad; // return zero or sub zero
-	}
-	static getTooltipArrowPadding(tooltipBlockWidth, horizontalPad) {
-		return horizontalPad > tooltipBlockWidth
-			? tooltipBlockWidth - ARROW_DEFAULT_POSITION - 20 * Math.sqrt(2)
-			: horizontalPad; // If tooltip arrow has coordinate outside svg, it take X position in end of tooltip block
-	}
-	static getCoordinateByPointer(pointer) {
-		const coordinate = {
-			left: null,
-			top: null,
-			right: null,
-			bottom: null
-		};
-		coordinate.left = pointer[0] + "px";
-		coordinate.top = pointer[1] + "px";
-		return coordinate;
-	}
-	static getTooltipFixedCoordinate(
-		scaleKey,
-		margin,
-		keyValue,
-		blockBoundingRect,
-		tooltipBoundingRect,
-		keyAxisOrient,
-		winWidth,
-		winHeight
-	) {
-		const coordinate = {
-			top: null,
-			left: null
-		};
-		if (keyAxisOrient === "bottom" || keyAxisOrient === "top") {
-			coordinate.left = Scale.getScaledValue(scaleKey, keyValue) + margin.left - tooltipBoundingRect.width / 2;
-			if (keyAxisOrient === "bottom") coordinate.top = margin.top - 5 - tooltipBoundingRect.height;
-			else coordinate.top = blockBoundingRect.height - margin.bottom;
-		}
-		if (keyAxisOrient === "left" || keyAxisOrient === "right") {
-			coordinate.top = Scale.getScaledValue(scaleKey, keyValue) + margin.top - tooltipBoundingRect.height / 2;
-			if (keyAxisOrient === "left") coordinate.left = blockBoundingRect.width - margin.right;
-			else coordinate.left = margin.left - tooltipBoundingRect.width;
-		}
-		return this.recalcToolTipCoordinateByViewPort(
-			blockBoundingRect,
-			tooltipBoundingRect,
-			coordinate,
-			winWidth,
-			winHeight
-		);
-	}
-	static getTooltipCursorCoordinate(pointer, blockBoundingRect, tooltipBoundingRect) {
-		const pad = 10;
-		const coordinate = {
-			top: pointer[1] + pad,
-			left: pointer[0] + pad
-		};
-		return this.recalcToolTipCoordinateByViewPort(
-			blockBoundingRect,
-			tooltipBoundingRect,
-			coordinate,
-			window.innerWidth,
-			window.innerHeight
-		);
-	}
-	static getTooltipLineAttributes(scaleKey, margin, key, chartOrientation, blockSize) {
-		const attributes = {
-			x1: 0,
-			x2: 0,
-			y1: 0,
-			y2: 0
-		};
-		if (chartOrientation === "vertical") {
-			attributes.x1 = Math.ceil(Scale.getScaledValue(scaleKey, key) + margin.left) - 0.5;
-			attributes.x2 = Math.ceil(Scale.getScaledValue(scaleKey, key) + margin.left) - 0.5;
-			attributes.y1 = margin.top - this.convexsize;
-			attributes.y2 = blockSize.height - margin.bottom + this.convexsize * 2;
-		} else {
-			attributes.x1 = margin.left - this.convexsize;
-			attributes.x2 = blockSize.width - margin.right + this.convexsize * 2;
-			attributes.y1 = Scale.getScaledValue(scaleKey, key) + margin.top;
-			attributes.y2 = Scale.getScaledValue(scaleKey, key) + margin.top;
-		}
-		return attributes;
-	}
-	static recalcToolTipCoordinateByViewPort(blockBounding, tooltipBounding, preCoordinate, winWidth, winHeight) {
-		const res = TooltipService.getTooltipByWindow(
-			tooltipBounding,
-			preCoordinate,
-			{
-				width: winWidth,
-				height: winHeight
-			},
-			blockBounding
-		);
-		return {
-			left: res.left + "px",
-			top: res.top + "px",
-			right: null,
-			bottom: null
-		};
-	}
+    static getHorizontalPad(coordinateX, tooltipBlockWidth, blockSize, translateX) {
+        let pad = 0;
+        if (tooltipBlockWidth + coordinateX - TOOLTIP_ARROW_PADDING_X + translateX > blockSize.width)
+            pad = tooltipBlockWidth + coordinateX - TOOLTIP_ARROW_PADDING_X + translateX - blockSize.width;
+        return pad;
+    }
+    static getVerticalPad(coordinateY, tooltipBlockHeight, translateY) {
+        let pad = 0;
+        if (coordinateY - TOOLTIP_ARROW_PADDING_Y - tooltipBlockHeight + translateY <
+            -tooltipBlockHeight - TOOLTIP_ARROW_PADDING_Y)
+            pad = coordinateY;
+        return pad; // return zero or sub zero
+    }
+    static getTooltipArrowPadding(tooltipBlockWidth, horizontalPad) {
+        return horizontalPad > tooltipBlockWidth
+            ? tooltipBlockWidth - ARROW_DEFAULT_POSITION - 20 * Math.sqrt(2)
+            : horizontalPad; // If tooltip arrow has coordinate outside svg, it take X position in end of tooltip block
+    }
+    static getCoordinateByPointer(pointer) {
+        const coordinate = {
+            left: null,
+            top: null,
+            right: null,
+            bottom: null
+        };
+        coordinate.left = pointer[0] + "px";
+        coordinate.top = pointer[1] + "px";
+        return coordinate;
+    }
+    static getTooltipFixedCoordinate(scaleKey, margin, keyValue, blockBoundingRect, tooltipBoundingRect, keyAxisOrient, winWidth, winHeight) {
+        const coordinate = {
+            top: null,
+            left: null
+        };
+        if (keyAxisOrient === "bottom" || keyAxisOrient === "top") {
+            coordinate.left = Scale.getScaledValue(scaleKey, keyValue) + margin.left - tooltipBoundingRect.width / 2;
+            if (keyAxisOrient === "bottom")
+                coordinate.top = margin.top - 5 - tooltipBoundingRect.height;
+            else
+                coordinate.top = blockBoundingRect.height - margin.bottom;
+        }
+        if (keyAxisOrient === "left" || keyAxisOrient === "right") {
+            coordinate.top = Scale.getScaledValue(scaleKey, keyValue) + margin.top - tooltipBoundingRect.height / 2;
+            if (keyAxisOrient === "left")
+                coordinate.left = blockBoundingRect.width - margin.right;
+            else
+                coordinate.left = margin.left - tooltipBoundingRect.width;
+        }
+        return this.recalcToolTipCoordinateByViewPort(blockBoundingRect, tooltipBoundingRect, coordinate, winWidth, winHeight);
+    }
+    static getTooltipCursorCoordinate(pointer, blockBoundingRect, tooltipBoundingRect) {
+        const pad = 10;
+        const coordinate = {
+            top: pointer[1] + pad,
+            left: pointer[0] + pad
+        };
+        return this.recalcToolTipCoordinateByViewPort(blockBoundingRect, tooltipBoundingRect, coordinate, window.innerWidth, window.innerHeight);
+    }
+    static getTooltipLineAttributes(scaleKey, margin, key, chartOrientation, blockSize) {
+        const attributes = {
+            x1: 0,
+            x2: 0,
+            y1: 0,
+            y2: 0
+        };
+        if (chartOrientation === "vertical") {
+            attributes.x1 = Math.ceil(Scale.getScaledValue(scaleKey, key) + margin.left) - 0.5;
+            attributes.x2 = Math.ceil(Scale.getScaledValue(scaleKey, key) + margin.left) - 0.5;
+            attributes.y1 = margin.top - this.convexsize;
+            attributes.y2 = blockSize.height - margin.bottom + this.convexsize * 2;
+        }
+        else {
+            attributes.x1 = margin.left - this.convexsize;
+            attributes.x2 = blockSize.width - margin.right + this.convexsize * 2;
+            attributes.y1 = Scale.getScaledValue(scaleKey, key) + margin.top;
+            attributes.y2 = Scale.getScaledValue(scaleKey, key) + margin.top;
+        }
+        return attributes;
+    }
+    static recalcToolTipCoordinateByViewPort(blockBounding, tooltipBounding, preCoordinate, winWidth, winHeight) {
+        const res = TooltipService.getTooltipByWindow(tooltipBounding, preCoordinate, {
+            width: winWidth,
+            height: winHeight
+        }, blockBounding);
+        return {
+            left: res.left + "px",
+            top: res.top + "px",
+            right: null,
+            bottom: null
+        };
+    }
 }
 TooltipHelper.convexsize = 5;

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

@@ -1,69 +1,49 @@
 import { Block } from "../../../engine/block/block";
-import {
-	OptionsModelData,
-	Orient,
-	TwoDimChartValueLabelsOptions,
-	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 {
-	elementAccessors: {
-		getBlock: () => Block;
-	};
-	data: {
-		keyFieldName: string;
-	};
-	canvas: {
-		keyAxisOrient: Orient;
-		valueLabels: TwoDimensionalValueLabels;
-		style: ValueLabelsStyleModel;
-	};
+    elementAccessors: {
+        getBlock: () => Block;
+    };
+    data: {
+        keyFieldName: string;
+    };
+    canvas: {
+        keyAxisOrient: Orient;
+        valueLabels: TwoDimensionalValueLabels;
+        style: ValueLabelsStyleModel;
+    };
 }
 export interface ValueLabelAttrs {
-	x: (data: MdtChartsDataRow) => number;
-	y: (data: MdtChartsDataRow) => number;
-	textAnchor: ValueLabelAnchor;
-	dominantBaseline: ValueLabelDominantBaseline;
+    x: (data: MdtChartsDataRow) => number;
+    y: (data: MdtChartsDataRow) => number;
+    textAnchor: ValueLabelAnchor;
+    dominantBaseline: ValueLabelDominantBaseline;
 }
 export declare class ChartValueLabels {
-	private readonly globalOptions;
-	private readonly chart;
-	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[], updatedOptions: TwoDimChartValueLabelsOptions): Promise<void[]>;
-	private renderByGroupIndex;
-	private updateByGroupIndex;
-	private getAllValueLabelsOfChart;
-	private setAttrs;
-	private setClasses;
+    private readonly globalOptions;
+    private readonly chart;
+    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[], updatedOptions: TwoDimChartValueLabelsOptions): Promise<void[]>;
+    private renderByGroupIndex;
+    private updateByGroupIndex;
+    private getAllValueLabelsOfChart;
+    private setAttrs;
+    private setClasses;
 }
 export declare class CanvasValueLabels {
-	private readonly options;
-	private chartsValueLabels;
-	constructor(options: ValueLabelsOptions);
-	render(
-		scales: ScalesWithSecondary,
-		charts: TwoDimensionalChartModel[],
-		data: MdtChartsDataSource,
-		dataOptions: OptionsModelData
-	): void;
-	update(
-		scales: ScalesWithSecondary,
-		charts: TwoDimensionalChartModel[],
-		data: MdtChartsDataSource,
-		dataOptions: OptionsModelData,
-		newCanvasOptions: TwoDimensionalValueLabels
-	): void;
-	private toggleOldValueLabelsVisibility;
-	private getAllValueLabels;
-	private getChartScales;
+    private readonly options;
+    private chartsValueLabels;
+    constructor(options: ValueLabelsOptions);
+    render(scales: ScalesWithSecondary, charts: TwoDimensionalChartModel[], data: MdtChartsDataSource, dataOptions: OptionsModelData): void;
+    update(scales: ScalesWithSecondary, charts: TwoDimensionalChartModel[], data: MdtChartsDataSource, dataOptions: OptionsModelData, newCanvasOptions: TwoDimensionalValueLabels): void;
+    private toggleOldValueLabelsVisibility;
+    private getAllValueLabels;
+    private getChartScales;
 }