scichart 2.0.2132 → 2.0.2179

package/Charting/Services/Workers/TextureWorkerSource.js

@@ -0,0 +1,133 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/** @ignore */
+var DEFAULT_HEIGHT = 1080;
+/** @ignore */
+var DEFAULT_WIDTH = 1920;
+var ELabelAlignment;
+(function (ELabelAlignment) {
+    ELabelAlignment["Auto"] = "Auto";
+    ELabelAlignment["Left"] = "Left";
+    ELabelAlignment["Right"] = "Right";
+    ELabelAlignment["Center"] = "Center";
+})(ELabelAlignment || (ELabelAlignment = {}));
+// @ts-ignore
+var canvas = new OffscreenCanvas(DEFAULT_WIDTH, DEFAULT_HEIGHT);
+// @ts-ignore
+var ctx = canvas.getContext("2d");
+/**
+ * Create a text texture supporting multiline and arbitrary rotation
+ * @param text
+ * @param textStyle
+ * @param rotation
+ * @param lineSpacing Expressed as a fraction of the font size. Default 1.1
+ * @param backgroundColor
+ * @param opacity
+ * @returns
+ */
+// tslint:disable-next-line: no-unused-expression
+var createTextTexture = function (text, textStyle, rotation, lineSpacing, backgroundColor, opacity) {
+    var fontStyle = textStyle.fontStyle, fontWeight = textStyle.fontWeight, fontFamily = textStyle.fontFamily, fontSizePx = textStyle.fontSize, padding = textStyle.padding, alignment = textStyle.alignment, color = textStyle.color;
+    // console.log("Creating label for", text[0], fontSizePx);
+    ctx.globalAlpha = opacity !== null && opacity !== void 0 ? opacity : 1;
+    ctx.textBaseline = "top";
+    ctx.fillStyle = color;
+    ctx.font = getFontString(fontStyle, fontWeight, fontSizePx, fontFamily);
+    var textureWidth = 0;
+    // const fontSizePt = Math.ceil(fontSizePx * PX_TO_PT);
+    var lineHeight = measureTextHeight(fontSizePx);
+    var extraLineHeight = lineHeight * (lineSpacing !== null && lineSpacing !== void 0 ? lineSpacing : 1.1);
+    var textureHeight = lineHeight + padding.top + padding.bottom;
+    for (var index = 0; index < text.length; index++) {
+        var line = text[index];
+        var lineWidth = measureTextWidth(line) + padding.left + padding.right;
+        if (lineWidth > textureWidth) {
+            textureWidth = lineWidth;
+        }
+        if (index > 0) {
+            textureHeight += extraLineHeight;
+        }
+    }
+    var y = padding.top;
+    var x = padding.left;
+    if (!textureWidth || !textureHeight) {
+        return undefined;
+    }
+    var newTextureWidth = textureWidth;
+    var newTextureHeight = textureHeight;
+    ctx.clearRect(0, 0, canvas.width, canvas.height);
+    if (backgroundColor) {
+        ctx.fillStyle = backgroundColor;
+        ctx.fillRect(0, 0, canvas.width, canvas.height);
+    }
+    // Save state
+    ctx.save();
+    if (rotation) {
+        // convert to radians
+        var rotationRad = (rotation * Math.PI) / 180;
+        // We need to Math.ceil to fix rotation for WebGL1
+        newTextureWidth = Math.ceil(textureWidth * Math.abs(Math.cos(rotationRad)) + textureHeight * Math.abs(Math.sin(rotationRad)));
+        newTextureHeight = Math.ceil(textureWidth * Math.abs(Math.sin(rotationRad)) + textureHeight * Math.abs(Math.cos(rotationRad)));
+        // translate to the center of rectangle
+        ctx.translate(newTextureWidth / 2, newTextureHeight / 2);
+        ctx.rotate(rotationRad);
+        // translate to the new origin that is located in the left top center of the texture
+        ctx.translate(-textureWidth / 2, -textureHeight / 2);
+    }
+    for (var _i = 0, text_1 = text; _i < text_1.length; _i++) {
+        var line = text_1[_i];
+        if (alignment === ELabelAlignment.Center || alignment === ELabelAlignment.Right) {
+            var lineWidth = measureTextWidth(line);
+            x =
+                alignment === ELabelAlignment.Right
+                    ? textureWidth - lineWidth - padding.right
+                    : (textureWidth - lineWidth) / 2;
+        }
+        ctx.fillText(line, Math.round(x), Math.round(y));
+        y += extraLineHeight;
+    }
+    ctx.strokeStyle = color;
+    ctx.restore();
+    // Useful for debugging rotated textures
+    // ctx.beginPath();
+    // ctx.rect(0, 0, newTextureWidth, newTextureHeight);
+    // ctx.stroke();
+    var imageData = ctx.getImageData(0, 0, newTextureWidth, newTextureHeight);
+    // console.log("Returning label for", text[0], fontSizePx);
+    return {
+        imageData: imageData,
+        textureWidth: newTextureWidth,
+        textureHeight: newTextureHeight
+    };
+};
+var measureTextHeight = function (fontSizePx) { return fontSizePx; };
+// @ts-ignore
+var measureTextWidth = function (text) {
+    var textMeasure = ctx.measureText(text);
+    return Math.ceil(textMeasure.width);
+};
+var getFontString = function (fontStyle, fontWeight, fontSize, fontFamily) {
+    if (!fontWeight)
+        return "".concat(fontStyle, " ").concat(fontSize, "px ").concat(fontFamily);
+    return "".concat(fontStyle, " ").concat(fontWeight, " ").concat(fontSize, "px ").concat(fontFamily);
+};
+// Handle incoming messages
+self.onmessage = function (msg) {
+    var _a = msg.data, id = _a.id, payload = _a.payload, method = _a.method;
+    var text = payload.text, textStyle = payload.textStyle, rotation = payload.rotation, lineSpacing = payload.lineSpacing, backgroundColor = payload.backgroundColor, opacity = payload.opacity;
+    try {
+        var result = createTextTexture(text, textStyle, rotation, lineSpacing, backgroundColor, opacity);
+        var reply = {
+            id: id,
+            payload: result
+        };
+        self.postMessage(reply);
+    }
+    catch (err) {
+        self.postMessage({
+            id: id,
+            err: err,
+            payload: undefined
+        });
+    }
+};

package/Charting/Themes/SciChartJSDarkTheme.js

@@ -3,10 +3,12 @@ var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());

package/Charting/Themes/SciChartJSDarkv2Theme.js

@@ -3,10 +3,12 @@ var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());

package/Charting/Themes/SciChartJSLightTheme.js

@@ -3,10 +3,12 @@ var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());

package/Charting/Visuals/Annotations/AnnotationBase.d.ts

@@ -327,7 +327,7 @@ export declare abstract class AnnotationBase implements IAnnotation, IAdornerPro
     onDpiChanged(args: TDpiChangedEventArgs): void;
     toJSON(): {
         type: EAnnotationType;
-        options: Required<Pick<IAnnotationBaseOptions, "opacity" | "id" | "annotationLayer" | "isHidden" | "resizeDirections" | "isEditable" | "x1" | "x2" | "y1" | "y2" | "xAxisId" | "xCoordinateMode" | "yAxisId" | "yCoordinateMode" | "isSelected" | "onDragStarted" | "onDragEnded" | "onDrag">>;
+        options: Required<Omit<IAnnotationBaseOptions, never>>;
     };
     /**
      * Returns annotationBorders

package/Charting/Visuals/Annotations/AnnotationBase.js

@@ -79,7 +79,7 @@ var AnnotationBase = /** @class */ (function () {
         this.yCoordinateModeProperty = ECoordinateMode.DataValue;
         this.isSelectedProperty = false;
         this.resizeDirectionsProperty = XyDirection_1.EXyDirection.XyDirection;
-        this.id = (_a = options === null || options === void 0 ? void 0 : options.id) !== null && _a !== void 0 ? _a : guid_1.generateGuid();
+        this.id = (_a = options === null || options === void 0 ? void 0 : options.id) !== null && _a !== void 0 ? _a : (0, guid_1.generateGuid)();
         this.dragStarted = new EventHandler_1.EventHandler();
         this.dragEnded = new EventHandler_1.EventHandler();
         this.dragDelta = new EventHandler_1.EventHandler();
@@ -100,7 +100,7 @@ var AnnotationBase = /** @class */ (function () {
         if (options === null || options === void 0 ? void 0 : options.onDragStarted) {
             if (typeof options.onDragStarted === "string") {
                 this.typeMap.set("onDragStarted", options.onDragStarted);
-                this.dragStarted.subscribe(classFactory_1.getFunction(BaseType_1.EBaseType.OptionFunction, options.onDragStarted));
+                this.dragStarted.subscribe((0, classFactory_1.getFunction)(BaseType_1.EBaseType.OptionFunction, options.onDragStarted));
             }
             else {
                 this.dragStarted.subscribe(options.onDragStarted);
@@ -109,7 +109,7 @@ var AnnotationBase = /** @class */ (function () {
         if (options === null || options === void 0 ? void 0 : options.onDragEnded) {
             if (typeof options.onDragEnded === "string") {
                 this.typeMap.set("onDragEnded", options.onDragEnded);
-                this.dragEnded.subscribe(classFactory_1.getFunction(BaseType_1.EBaseType.OptionFunction, options.onDragEnded));
+                this.dragEnded.subscribe((0, classFactory_1.getFunction)(BaseType_1.EBaseType.OptionFunction, options.onDragEnded));
             }
             else {
                 this.dragEnded.subscribe(options.onDragEnded);
@@ -118,7 +118,7 @@ var AnnotationBase = /** @class */ (function () {
         if (options === null || options === void 0 ? void 0 : options.onDrag) {
             if (typeof options.onDrag === "string") {
                 this.typeMap.set("onDrag", options.onDrag);
-                this.dragDelta.subscribe(classFactory_1.getFunction(BaseType_1.EBaseType.OptionFunction, options.onDrag));
+                this.dragDelta.subscribe((0, classFactory_1.getFunction)(BaseType_1.EBaseType.OptionFunction, options.onDrag));
             }
             else {
                 this.dragDelta.subscribe(options.onDrag);
@@ -132,8 +132,10 @@ var AnnotationBase = /** @class */ (function () {
         },
         /** @inheritDoc */
         set: function (annotationCanvas) {
-            this.annotationLayerProperty = annotationCanvas;
-            this.notifyPropertyChanged(constants_1.PROPERTY.ANNOTATION_CANVAS);
+            if (this.annotationLayerProperty !== annotationCanvas) {
+                this.annotationLayerProperty = annotationCanvas;
+                this.notifyPropertyChanged(constants_1.PROPERTY.ANNOTATION_CANVAS);
+            }
         },
         enumerable: false,
         configurable: true
@@ -145,8 +147,10 @@ var AnnotationBase = /** @class */ (function () {
         },
         /** @inheritDoc */
         set: function (parentSurface) {
-            this.parentSurfaceProperty = parentSurface;
-            this.notifyPropertyChanged(constants_1.PROPERTY.PARENT_SURFACE);
+            if (this.parentSurfaceProperty !== parentSurface) {
+                this.parentSurfaceProperty = parentSurface;
+                this.notifyPropertyChanged(constants_1.PROPERTY.PARENT_SURFACE);
+            }
         },
         enumerable: false,
         configurable: true
@@ -158,8 +162,10 @@ var AnnotationBase = /** @class */ (function () {
         },
         /** @inheritDoc */
         set: function (isEditable) {
-            this.isEditableProperty = isEditable;
-            this.notifyPropertyChanged(constants_1.PROPERTY.IS_EDITABLE);
+            if (this.isEditableProperty !== isEditable) {
+                this.isEditableProperty = isEditable;
+                this.notifyPropertyChanged(constants_1.PROPERTY.IS_EDITABLE);
+            }
         },
         enumerable: false,
         configurable: true
@@ -171,8 +177,10 @@ var AnnotationBase = /** @class */ (function () {
         },
         /** @inheritDoc */
         set: function (isHidden) {
-            this.isHiddenProperty = isHidden;
-            this.notifyPropertyChanged(constants_1.PROPERTY.IS_HIDDEN);
+            if (this.isHiddenProperty !== isHidden) {
+                this.isHiddenProperty = isHidden;
+                this.notifyPropertyChanged(constants_1.PROPERTY.IS_HIDDEN);
+            }
         },
         enumerable: false,
         configurable: true
@@ -184,8 +192,10 @@ var AnnotationBase = /** @class */ (function () {
         },
         /** @inheritDoc */
         set: function (xCoordinateMode) {
-            this.xCoordinateModeProperty = xCoordinateMode;
-            this.notifyPropertyChanged(constants_1.PROPERTY.X_COORDINATE_MODE);
+            if (this.xCoordinateModeProperty !== xCoordinateMode) {
+                this.xCoordinateModeProperty = xCoordinateMode;
+                this.notifyPropertyChanged(constants_1.PROPERTY.X_COORDINATE_MODE);
+            }
         },
         enumerable: false,
         configurable: true
@@ -197,8 +207,10 @@ var AnnotationBase = /** @class */ (function () {
         },
         /** @inheritDoc */
         set: function (yCoordinateMode) {
-            this.yCoordinateModeProperty = yCoordinateMode;
-            this.notifyPropertyChanged(constants_1.PROPERTY.Y_COORDINATE_MODE);
+            if (this.yCoordinateModeProperty !== yCoordinateMode) {
+                this.yCoordinateModeProperty = yCoordinateMode;
+                this.notifyPropertyChanged(constants_1.PROPERTY.Y_COORDINATE_MODE);
+            }
         },
         enumerable: false,
         configurable: true
@@ -210,8 +222,10 @@ var AnnotationBase = /** @class */ (function () {
         },
         /** @inheritDoc */
         set: function (x1) {
-            this.x1Property = x1;
-            this.notifyPropertyChanged(constants_1.PROPERTY.X1);
+            if (this.x1Property !== x1) {
+                this.x1Property = x1;
+                this.notifyPropertyChanged(constants_1.PROPERTY.X1);
+            }
         },
         enumerable: false,
         configurable: true
@@ -223,8 +237,10 @@ var AnnotationBase = /** @class */ (function () {
         },
         /** @inheritDoc */
         set: function (x2) {
-            this.x2Property = x2;
-            this.notifyPropertyChanged(constants_1.PROPERTY.X2);
+            if (this.x2Property !== x2) {
+                this.x2Property = x2;
+                this.notifyPropertyChanged(constants_1.PROPERTY.X2);
+            }
         },
         enumerable: false,
         configurable: true
@@ -236,8 +252,10 @@ var AnnotationBase = /** @class */ (function () {
         },
         /** @inheritDoc */
         set: function (y1) {
-            this.y1Property = y1;
-            this.notifyPropertyChanged(constants_1.PROPERTY.Y1);
+            if (this.y1Property !== y1) {
+                this.y1Property = y1;
+                this.notifyPropertyChanged(constants_1.PROPERTY.Y1);
+            }
         },
         enumerable: false,
         configurable: true
@@ -249,8 +267,10 @@ var AnnotationBase = /** @class */ (function () {
         },
         /** @inheritDoc */
         set: function (y2) {
-            this.y2Property = y2;
-            this.notifyPropertyChanged(constants_1.PROPERTY.Y2);
+            if (this.y2Property !== y2) {
+                this.y2Property = y2;
+                this.notifyPropertyChanged(constants_1.PROPERTY.Y2);
+            }
         },
         enumerable: false,
         configurable: true
@@ -262,8 +282,10 @@ var AnnotationBase = /** @class */ (function () {
         },
         /** @inheritDoc */
         set: function (xAxisId) {
-            this.xAxisIdProperty = xAxisId;
-            this.notifyPropertyChanged(constants_1.PROPERTY.XAXIS_ID);
+            if (this.xAxisIdProperty !== xAxisId) {
+                this.xAxisIdProperty = xAxisId;
+                this.notifyPropertyChanged(constants_1.PROPERTY.XAXIS_ID);
+            }
         },
         enumerable: false,
         configurable: true
@@ -275,8 +297,10 @@ var AnnotationBase = /** @class */ (function () {
         },
         /** @inheritDoc */
         set: function (yAxisId) {
-            this.yAxisIdProperty = yAxisId;
-            this.notifyPropertyChanged(constants_1.PROPERTY.YAXIS_ID);
+            if (this.yAxisIdProperty !== yAxisId) {
+                this.yAxisIdProperty = yAxisId;
+                this.notifyPropertyChanged(constants_1.PROPERTY.YAXIS_ID);
+            }
         },
         enumerable: false,
         configurable: true
@@ -298,8 +322,10 @@ var AnnotationBase = /** @class */ (function () {
         },
         /** @inheritDoc */
         set: function (value) {
-            this.resizeDirectionsProperty = value;
-            this.notifyPropertyChanged(constants_1.PROPERTY.RESIZE_DIRECTIONS);
+            if (this.resizeDirectionsProperty !== value) {
+                this.resizeDirectionsProperty = value;
+                this.notifyPropertyChanged(constants_1.PROPERTY.RESIZE_DIRECTIONS);
+            }
         },
         enumerable: false,
         configurable: true
@@ -311,8 +337,10 @@ var AnnotationBase = /** @class */ (function () {
         },
         /** @inheritDoc */
         set: function (value) {
-            this.isSelectedProperty = value;
-            this.notifyPropertyChanged(constants_1.PROPERTY.IS_SELECTED);
+            if (this.isSelectedProperty !== value) {
+                this.isSelectedProperty = value;
+                this.notifyPropertyChanged(constants_1.PROPERTY.IS_SELECTED);
+            }
         },
         enumerable: false,
         configurable: true
@@ -324,8 +352,10 @@ var AnnotationBase = /** @class */ (function () {
         },
         /** @inheritDoc */
         set: function (opacity) {
-            this.opacityProperty = opacity;
-            this.notifyPropertyChanged(constants_1.PROPERTY.OPACITY);
+            if (this.opacityProperty !== opacity) {
+                this.opacityProperty = opacity;
+                this.notifyPropertyChanged(constants_1.PROPERTY.OPACITY);
+            }
         },
         enumerable: false,
         configurable: true
@@ -358,7 +388,7 @@ var AnnotationBase = /** @class */ (function () {
         this.deleteAdorner();
     };
     AnnotationBase.prototype.clickToSelect = function (args) {
-        var xyPoint = translate_1.translateFromCanvasToSeriesViewRect(args.mousePoint, this.parentSurface.seriesViewRect, true);
+        var xyPoint = (0, translate_1.translateFromCanvasToSeriesViewRect)(args.mousePoint, this.parentSurface.seriesViewRect, true);
         if (!xyPoint) {
             return false;
         }
@@ -373,7 +403,7 @@ var AnnotationBase = /** @class */ (function () {
     };
     AnnotationBase.prototype.checkIsClickedOnAnnotation = function (x, y) {
         // We multiply by PIXEL_RATIO to get coordinates on the scaled canvas
-        var xyPoint = translate_1.translateFromCanvasToSeriesViewRect(new Point_1.Point(x * DpiHelper_1.DpiHelper.PIXEL_RATIO, y * DpiHelper_1.DpiHelper.PIXEL_RATIO), this.parentSurface.seriesViewRect, true);
+        var xyPoint = (0, translate_1.translateFromCanvasToSeriesViewRect)(new Point_1.Point(x * DpiHelper_1.DpiHelper.PIXEL_RATIO, y * DpiHelper_1.DpiHelper.PIXEL_RATIO), this.parentSurface.seriesViewRect, true);
         if (!xyPoint)
             return false;
         return this.checkIsClickedOnAnnotationInternal(xyPoint.x, xyPoint.y);
@@ -450,8 +480,8 @@ var AnnotationBase = /** @class */ (function () {
         var x2 = this.isSvgAnnotation ? borders.x2 * DpiHelper_1.DpiHelper.PIXEL_RATIO : borders.x2;
         var y1 = this.isSvgAnnotation ? borders.y1 * DpiHelper_1.DpiHelper.PIXEL_RATIO : borders.y1;
         var y2 = this.isSvgAnnotation ? borders.y2 * DpiHelper_1.DpiHelper.PIXEL_RATIO : borders.y2;
-        var point1 = translate_1.translateFromSeriesViewRectToCanvas(new Point_1.Point(x1, y1), this.parentSurface.seriesViewRect, true);
-        var point2 = translate_1.translateFromSeriesViewRectToCanvas(new Point_1.Point(x2, y2), this.parentSurface.seriesViewRect, true);
+        var point1 = (0, translate_1.translateFromSeriesViewRectToCanvas)(new Point_1.Point(x1, y1), this.parentSurface.seriesViewRect, true);
+        var point2 = (0, translate_1.translateFromSeriesViewRectToCanvas)(new Point_1.Point(x2, y2), this.parentSurface.seriesViewRect, true);
         return {
             x1: point1.x / DpiHelper_1.DpiHelper.PIXEL_RATIO,
             x2: point2.x / DpiHelper_1.DpiHelper.PIXEL_RATIO,
@@ -501,7 +531,7 @@ var AnnotationBase = /** @class */ (function () {
                     : value * calculator.viewportDimension;
             }
             default: {
-                throw new Error("AnnotationBase.getCoordinate with CoordinateMode." + coordinateMode + " is not implemented");
+                throw new Error("AnnotationBase.getCoordinate with CoordinateMode.".concat(coordinateMode, " is not implemented"));
             }
         }
     };
@@ -599,7 +629,7 @@ var AnnotationBase = /** @class */ (function () {
         var viewRect = this.parentSurface.seriesViewRect;
         var translatedPoint = !translateToSeriesViewRect
             ? point
-            : translate_1.translateFromCanvasToSeriesViewRect(point, viewRect, true);
+            : (0, translate_1.translateFromCanvasToSeriesViewRect)(point, viewRect, true);
         if (!translatedPoint) {
             return undefined;
         }
@@ -614,7 +644,7 @@ var AnnotationBase = /** @class */ (function () {
     AnnotationBase.prototype.getXYCoordinatesFromValues = function (xyDataPoint) {
         var viewRect = this.parentSurface.seriesViewRect;
         var pointWithAbsoluteCoordinates = this.getAbsoluteCoordinates(xyDataPoint);
-        var translatedPoint = translate_1.translateFromSeriesViewRectToCanvas(pointWithAbsoluteCoordinates, viewRect);
+        var translatedPoint = (0, translate_1.translateFromSeriesViewRectToCanvas)(pointWithAbsoluteCoordinates, viewRect);
         if (!translatedPoint) {
             return undefined;
         }

package/Charting/Visuals/Annotations/AxisMarkerAnnotation.d.ts

@@ -11,20 +11,47 @@ import { RenderContextAnnotationBase } from "./RenderContextAnnotationBase";
  * Options passed to the constructor of a {@link AxisMarkerAnnotation}, used to configure it at instantiation time
  */
 export interface IAxisMarkerAnnotationOptions extends IAnnotationBaseOptions {
+    /**
+     * Font size in pixels
+     */
     fontSize?: number;
+    /**
+     * Font family
+     */
     fontFamily?: string;
+    /**
+     * Font weight, e.g. bold
+     */
     fontWeight?: string;
+    /**
+     * Font style
+     */
     fontStyle?: string;
+    /**
+     * Text color, html code or string, e.g. #FF0000 or red
+     */
     color?: string;
     padding?: Thickness;
+    /**
+     * The axis marker color, html code or string, e.g. #FF0000 or red
+     */
     backgroundColor?: string;
+    /**
+     * Custom text on the label, by default the data value is displayed
+     */
     formattedValue?: string;
     /**
      * Sets the image to draw for {@link AxisMarkerAnnotation},
      * if not set the default AxisMarkerAnnotation is being used
      */
     image?: HTMLImageElement;
+    /**
+     * Image width
+     */
     imageWidth?: number;
+    /**
+     * Image height
+     */
     imageHeight?: number;
 }
 /**
@@ -170,7 +197,7 @@ export declare class AxisMarkerAnnotation extends RenderContextAnnotationBase {
     calcDragDistance(xyValues: Point): void;
     toJSON(): {
         type: EAnnotationType;
-        options: Required<Pick<IAnnotationBaseOptions, "opacity" | "id" | "annotationLayer" | "isHidden" | "resizeDirections" | "isEditable" | "x1" | "x2" | "y1" | "y2" | "xAxisId" | "xCoordinateMode" | "yAxisId" | "yCoordinateMode" | "isSelected" | "onDragStarted" | "onDragEnded" | "onDrag">>;
+        options: Required<Omit<IAnnotationBaseOptions, never>>;
     };
     protected checkIsClickedOnAnnotationInternal(x: number, y: number): boolean;
     protected updateAdornerInner(): void;

package/Charting/Visuals/Annotations/AxisMarkerAnnotation.js

@@ -3,10 +3,12 @@ var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -330,9 +332,9 @@ var AxisMarkerAnnotation = /** @class */ (function (_super) {
                 fontStyle: this.fontStyleProperty,
                 color: this.colorProperty
             };
-            var res = drawLabel_1.drawAxisMarkerAnnotation(axisWithMarker, renderContext, this.formattedValueProperty, annotationAbsoluteCoord, x1Coord, y1Coord, textStyle, this.backgroundColorProperty, this.opacity, this.image, this.imageWidth, this.imageHeight);
-            var point1 = translate_1.translateFromCanvasToSeriesViewRect(new Point_1.Point(res.xPosition, res.yPosition), viewRect, true);
-            var point2 = translate_1.translateFromCanvasToSeriesViewRect(new Point_1.Point(res.xPosition + res.textureWidth, res.yPosition + res.textureHeight), viewRect, true);
+            var res = (0, drawLabel_1.drawAxisMarkerAnnotation)(axisWithMarker, renderContext, this.formattedValueProperty, annotationAbsoluteCoord, x1Coord, y1Coord, textStyle, this.backgroundColorProperty, this.opacity, this.image, this.imageWidth, this.imageHeight);
+            var point1 = (0, translate_1.translateFromCanvasToSeriesViewRect)(new Point_1.Point(res.xPosition, res.yPosition), viewRect, true);
+            var point2 = (0, translate_1.translateFromCanvasToSeriesViewRect)(new Point_1.Point(res.xPosition + res.textureWidth, res.yPosition + res.textureHeight), viewRect, true);
             this.setAnnotationBorders(point1.x, point2.x, point1.y, point2.y);
             this.updateAdornerInner();
         }
@@ -343,11 +345,11 @@ var AxisMarkerAnnotation = /** @class */ (function (_super) {
     AxisMarkerAnnotation.prototype.onDragStarted = function (args) {
         _super.prototype.onDragStarted.call(this, args);
         var _a = this.calculateAdornerCenter(), x = _a.x, y = _a.y;
-        var xyMousePoint = translate_1.translateFromCanvasToSeriesViewRect(new Point_1.Point(args.mousePoint.x, args.mousePoint.y), this.parentSurface.seriesViewRect, true);
-        var xyAdorner = translate_1.translateFromCanvasToSeriesViewRect(new Point_1.Point(x * DpiHelper_1.DpiHelper.PIXEL_RATIO, y * DpiHelper_1.DpiHelper.PIXEL_RATIO), this.parentSurface.seriesViewRect, true);
+        var xyMousePoint = (0, translate_1.translateFromCanvasToSeriesViewRect)(new Point_1.Point(args.mousePoint.x, args.mousePoint.y), this.parentSurface.seriesViewRect, true);
+        var xyAdorner = (0, translate_1.translateFromCanvasToSeriesViewRect)(new Point_1.Point(x * DpiHelper_1.DpiHelper.PIXEL_RATIO, y * DpiHelper_1.DpiHelper.PIXEL_RATIO), this.parentSurface.seriesViewRect, true);
         if (xyMousePoint) {
             if (xyAdorner) {
-                var dist = pointUtil_1.calcDistance(xyAdorner.x, xyAdorner.y, xyMousePoint.x, xyMousePoint.y);
+                var dist = (0, pointUtil_1.calcDistance)(xyAdorner.x, xyAdorner.y, xyMousePoint.x, xyMousePoint.y);
                 if (dist < constants_1.ADORNER_GRIP_RADIUS * DpiHelper_1.DpiHelper.PIXEL_RATIO) {
                     this.adornerDraggingPoint = AnnotationBase_1.EDraggingGripPoint.Point1;
                     return true;
@@ -390,7 +392,7 @@ var AxisMarkerAnnotation = /** @class */ (function (_super) {
     };
     AxisMarkerAnnotation.prototype.checkIsClickedOnAnnotationInternal = function (x, y) {
         var _a = this.getAnnotationBorders(true), x1 = _a.x1, x2 = _a.x2, y1 = _a.y1, y2 = _a.y2;
-        return pointUtil_1.testIsInBounds(x, y, x1, y2, x2, y1);
+        return (0, pointUtil_1.testIsInBounds)(x, y, x1, y2, x2, y1);
     };
     AxisMarkerAnnotation.prototype.updateAdornerInner = function () {
         this.deleteAdorner();
@@ -422,5 +424,5 @@ var svgStringAdornerTemplate = function (x1, y1, x2, y2, x, y) {
     var adornerFill = "#CDCDCD22";
     var adornerStroke = "#CDCDCD99";
     var delta = 1;
-    return "<svg xmlns=\"http://www.w3.org/2000/svg\">\n  <line x1=\"" + (x1 - delta) + "\" y1=\"" + y1 + "\" x2=\"" + (x2 + delta) + "\" y2=\"" + y1 + "\" stroke=\"" + colorLine + "\" stroke-width=\"" + 2 * delta + "\" />\n  <line x1=\"" + x2 + "\" y1=\"" + (y1 + delta) + "\" x2=\"" + x2 + "\" y2=\"" + (y2 - delta) + "\" stroke=\"" + colorLine + "\" stroke-width=\"" + 2 * delta + "\" />\n  <line x1=\"" + (x1 - delta) + "\" y1=\"" + y2 + "\" x2=\"" + (x2 + delta) + "\" y2=\"" + y2 + "\" stroke=\"" + colorLine + "\" stroke-width=\"" + 2 * delta + "\" />\n  <line x1=\"" + x1 + "\" y1=\"" + (y1 + delta) + "\" x2=\"" + x1 + "\" y2=\"" + (y2 - delta) + "\" stroke=\"" + colorLine + "\" stroke-width=\"" + 2 * delta + "\" />\n  <circle cx=\"" + x + "\" cy=\"" + y + "\" r=\"" + constants_1.ADORNER_GRIP_RADIUS + "\" fill=\"" + adornerFill + "\" stroke=\"" + adornerStroke + "\"/>\n</svg>";
+    return "<svg xmlns=\"http://www.w3.org/2000/svg\">\n  <line x1=\"".concat(x1 - delta, "\" y1=\"").concat(y1, "\" x2=\"").concat(x2 + delta, "\" y2=\"").concat(y1, "\" stroke=\"").concat(colorLine, "\" stroke-width=\"").concat(2 * delta, "\" />\n  <line x1=\"").concat(x2, "\" y1=\"").concat(y1 + delta, "\" x2=\"").concat(x2, "\" y2=\"").concat(y2 - delta, "\" stroke=\"").concat(colorLine, "\" stroke-width=\"").concat(2 * delta, "\" />\n  <line x1=\"").concat(x1 - delta, "\" y1=\"").concat(y2, "\" x2=\"").concat(x2 + delta, "\" y2=\"").concat(y2, "\" stroke=\"").concat(colorLine, "\" stroke-width=\"").concat(2 * delta, "\" />\n  <line x1=\"").concat(x1, "\" y1=\"").concat(y1 + delta, "\" x2=\"").concat(x1, "\" y2=\"").concat(y2 - delta, "\" stroke=\"").concat(colorLine, "\" stroke-width=\"").concat(2 * delta, "\" />\n  <circle cx=\"").concat(x, "\" cy=\"").concat(y, "\" r=\"").concat(constants_1.ADORNER_GRIP_RADIUS, "\" fill=\"").concat(adornerFill, "\" stroke=\"").concat(adornerStroke, "\"/>\n</svg>");
 };

package/Charting/Visuals/Annotations/BoxAnnotation.d.ts

@@ -90,7 +90,7 @@ export declare class BoxAnnotation extends RenderContextAnnotationBase {
     onDpiChanged(args: TDpiChangedEventArgs): void;
     toJSON(): {
         type: EAnnotationType;
-        options: Required<Pick<IAnnotationBaseOptions, "opacity" | "id" | "annotationLayer" | "isHidden" | "resizeDirections" | "isEditable" | "x1" | "x2" | "y1" | "y2" | "xAxisId" | "xCoordinateMode" | "yAxisId" | "yCoordinateMode" | "isSelected" | "onDragStarted" | "onDragEnded" | "onDrag">>;
+        options: Required<Omit<IAnnotationBaseOptions, never>>;
     };
     protected checkIsClickedOnAnnotationInternal(x: number, y: number): boolean;
     protected notifyPropertyChanged(propertyName: string): void;