mdt-charts 1.37.3 → 1.38.1

package/lib/config/config.d.ts

@@ -334,11 +334,13 @@ export interface TwoDimensionalChartData {
     valueFields: TwoDimValueField[];
     valueGroup?: TwoDimensionalValueGroup;
 }
-export declare type ValueLabelsPositionOptions = {
-    mode: "afterHead" | "beforeHead";
+export interface ValueLabelsWithOffsetOptions {
     /** @default 10 */
     offsetSize?: number;
-} | {
+}
+export declare type ValueLabelsPositionOptions = ({
+    mode?: "afterHead" | "beforeHead" | "afterStart";
+} & ValueLabelsWithOffsetOptions) | {
     mode?: "center";
 };
 export declare type ValueLabelsPositionMode = ValueLabelsPositionOptions["mode"];

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

@@ -115,9 +115,7 @@ export class Tooltip {
             tooltipArrow = TooltipComponentsManager.renderTooltipArrow(tooltipBlock.getEl());
         if (tooltipSettings.position === "followCursor") {
             elements.on("mousemove", function (e) {
-                const pointerCoordinate = !pointer(e, block.getSvg().node())[0]
-                    ? e.detail.pointer
-                    : pointer(e, block.getSvg().node());
+                const pointerCoordinate = e instanceof CustomEvent ? e.detail.pointer : pointer(e, block.getSvg().node());
                 const tooltipCoordinate = TooltipHelper.getTooltipCursorCoordinate(pointerCoordinate, block.getSvg().node().getBoundingClientRect(), tooltipBlock.getEl().node().getBoundingClientRect());
                 tooltipBlock.setCoordinate(tooltipCoordinate);
             });

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

@@ -8,12 +8,12 @@ export class ValueLabelsAttrsProvider {
         };
         const orient = globalOptions.canvas.keyAxisOrient;
         if (orient === "left" || orient === "right") {
-            attrs.x = (d) => valueLabels.handleX(scales.value(valueLabels.handleScaledValue(d, datumField)), fieldIndexInChart);
+            attrs.x = (d) => valueLabels.handleX(scales.value(valueLabels.handleValueBeforeScale(d, datumField)), fieldIndexInChart);
             attrs.y = (d) => valueLabels.handleY(scales.key(dataRowAccessor(d)[globalOptions.data.keyFieldName]), fieldIndexInChart);
         }
         else if (orient === "bottom" || orient === "top") {
             attrs.x = (d) => valueLabels.handleX(scales.key(dataRowAccessor(d)[globalOptions.data.keyFieldName]), fieldIndexInChart);
-            attrs.y = (d) => valueLabels.handleY(scales.value(valueLabels.handleScaledValue(d, datumField)), fieldIndexInChart);
+            attrs.y = (d) => valueLabels.handleY(scales.value(valueLabels.handleValueBeforeScale(d, datumField)), fieldIndexInChart);
         }
         return attrs;
     }

package/lib/model/featuresModel/valueLabelsModel/valueLabelsModel.d.ts

@@ -19,7 +19,7 @@ export declare class ValueLabelCoordinateCalculator {
     private getOverrideFieldIndex;
 }
 export declare function calculateValueLabelAlignment(keyAxisOrient: Orient, positionMode?: ValueLabelsPositionMode, rotation?: ValueLabelsRotationOptions): ValueLabelAlignment;
-export declare function handleScaledValue(dataRow: MdtChartsDataRow, datumField: string, isSegmented: boolean, positionMode?: ValueLabelsPositionMode): number;
+export declare function handleValueBeforeScale(dataRow: MdtChartsDataRow, datumField: string, isSegmented: boolean, positionMode?: ValueLabelsPositionMode): number;
 export declare function hasCollisionLeftSide(labelClientRect: BoundingRect, margin: BlockMargin): boolean;
 export declare function hasCollisionRightSide(labelClientRect: BoundingRect, blockSize: Size, margin: BlockMargin): boolean;
 export declare function hasCollisionTopSide(labelClientRect: BoundingRect, margin: BlockMargin): boolean;

package/lib/model/featuresModel/valueLabelsModel/valueLabelsModel.js

@@ -7,10 +7,13 @@ export class ValueLabelCoordinateCalculator {
         this.isSegmented = isSegmented;
         this.shiftCoordinateByKeyScale = shiftCoordinateByKeyScale;
         let offsetAbsSize = VALUE_LABEL_OFFSET_ABS_SIZE_PX;
-        if (((positionOptions === null || positionOptions === void 0 ? void 0 : positionOptions.mode) === "beforeHead" || (positionOptions === null || positionOptions === void 0 ? void 0 : positionOptions.mode) === "afterHead") &&
+        if ((!(positionOptions === null || positionOptions === void 0 ? void 0 : positionOptions.mode) ||
+            (positionOptions === null || positionOptions === void 0 ? void 0 : positionOptions.mode) === "beforeHead" ||
+            (positionOptions === null || positionOptions === void 0 ? void 0 : positionOptions.mode) === "afterHead" ||
+            (positionOptions === null || positionOptions === void 0 ? void 0 : positionOptions.mode) === "afterStart") &&
             (positionOptions === null || positionOptions === void 0 ? void 0 : positionOptions.offsetSize) != null)
-            offsetAbsSize = positionOptions === null || positionOptions === void 0 ? void 0 : positionOptions.offsetSize;
-        if (!(positionOptions === null || positionOptions === void 0 ? void 0 : positionOptions.mode) || positionOptions.mode === "afterHead")
+            offsetAbsSize = positionOptions.offsetSize;
+        if (!(positionOptions === null || positionOptions === void 0 ? void 0 : positionOptions.mode) || positionOptions.mode === "afterHead" || positionOptions.mode === "afterStart")
             this.offsetSizePx = offsetAbsSize;
         else if (positionOptions.mode === "beforeHead")
             this.offsetSizePx = -offsetAbsSize;
@@ -44,7 +47,7 @@ export class ValueLabelCoordinateCalculator {
 export function calculateValueLabelAlignment(keyAxisOrient, positionMode, rotation) {
     if (rotation === null || rotation === void 0 ? void 0 : rotation.angle)
         return { dominantBaseline: "middle", textAnchor: "middle" };
-    if (!positionMode || positionMode === "afterHead") {
+    if (!positionMode || positionMode === "afterHead" || positionMode === "afterStart") {
         switch (keyAxisOrient) {
             case "top":
                 return { dominantBaseline: "hanging", textAnchor: "middle" };
@@ -70,14 +73,18 @@ export function calculateValueLabelAlignment(keyAxisOrient, positionMode, rotati
     }
     return { dominantBaseline: "middle", textAnchor: "middle" };
 }
-export function handleScaledValue(dataRow, datumField, isSegmented, positionMode) {
+export function handleValueBeforeScale(dataRow, datumField, isSegmented, positionMode) {
     if (!positionMode || positionMode === "afterHead" || positionMode === "beforeHead")
         return dataRow[datumField];
     if (positionMode === "center") {
         if (isSegmented)
             return dataRow[datumField] - (dataRow[datumField] - dataRow["0"]) / 2;
-        else
-            return dataRow[datumField] / 2;
+        return dataRow[datumField] / 2;
+    }
+    if (positionMode === "afterStart") {
+        if (isSegmented)
+            return dataRow["0"];
+        return 0;
     }
     throw new Error("Invalid position mode");
 }

package/lib/model/model.d.ts

@@ -474,7 +474,7 @@ export interface TwoDimChartValueLabelsOptions {
     forFields: MdtChartsFieldName[];
     dominantBaseline: DominantBaseline;
     setContent: ValueLabelsInnerContentSetter;
-    handleScaledValue: (dataRow: MdtChartsDataRow, datumField: string) => number;
+    handleValueBeforeScale: (dataRow: MdtChartsDataRow, datumField: string) => number;
     rotation?: ValueLabelsRotationOptions;
     handleElement?: ValueLabelsHandleElement;
 }

package/lib/model/notations/twoDimensionalModel.js

@@ -4,7 +4,7 @@ import { AxisModel } from "../featuresModel/axis/axisModel";
 import { ScaleAxisRecalcer } from "../featuresModel/scaleModel/scaleAxisRecalcer";
 import { ScaleModel } from "../featuresModel/scaleModel/scaleModel";
 import { calculateBarIndexes, getAreaViewOptions, getBarsAmount, getBarViewOptions, getLegendMarkerOptions, LINE_CHART_DEFAULT_WIDTH, parseDashStyles, parseShape } from "./twoDimensional/styles";
-import { calculateValueLabelAlignment, handleScaledValue, ValueLabelCoordinateCalculator } from "../../model/featuresModel/valueLabelsModel/valueLabelsModel";
+import { calculateValueLabelAlignment, handleValueBeforeScale, ValueLabelCoordinateCalculator } from "../../model/featuresModel/valueLabelsModel/valueLabelsModel";
 import { TwoDimensionalModelHelper } from "../helpers/twoDimensionalModelHelper";
 import { TitleConfigReader } from "../modelInstance/titleConfigReader";
 import { createRecordOverflowModel } from "../featuresModel/recordOverflowModel/recordOverflowModel";
@@ -236,9 +236,9 @@ export class TwoDimensionalModel {
                     },
                     handleX: (scaledValue, fieldIndex) => valueLabelsCoordinateCalculator.getValueLabelX(scaledValue, fieldIndex),
                     handleY: (scaledValue, fieldIndex) => valueLabelsCoordinateCalculator.getValueLabelY(scaledValue, fieldIndex),
-                    handleScaledValue: (dataRow, datumField) => {
+                    handleValueBeforeScale: (dataRow, datumField) => {
                         var _a, _b;
-                        return handleScaledValue(dataRow, datumField, chart.isSegmented, (_b = (_a = chart.valueLabels) === null || _a === void 0 ? void 0 : _a.position) === null || _b === void 0 ? void 0 : _b.mode);
+                        return handleValueBeforeScale(dataRow, datumField, chart.isSegmented, (_b = (_a = chart.valueLabels) === null || _a === void 0 ? void 0 : _a.position) === null || _b === void 0 ? void 0 : _b.mode);
                     },
                     textAnchor: valueLabelsAlignment.textAnchor,
                     dominantBaseline: valueLabelsAlignment.dominantBaseline,

package/package.json

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