scichart 3.1.348 → 3.2.434

package/Charting/Services/TitleRenderer.js

@@ -1,7 +1,23 @@
 "use strict";
+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 (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 __());
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAdjustedRotation = exports.TitleRendererBase = void 0;
 var app_1 = require("../../constants/app");
+var DeletableEntity_1 = require("../../Core/DeletableEntity");
 var Deleter_1 = require("../../Core/Deleter");
 var Rect_1 = require("../../Core/Rect");
 var TextPosition_1 = require("../../types/TextPosition");
@@ -12,32 +28,35 @@ var createNativeRect_1 = require("../Visuals/Helpers/createNativeRect");
 var NativeObject_1 = require("../Visuals/Helpers/NativeObject");
 var DpiHelper_1 = require("../Visuals/TextureManager/DpiHelper");
 var TextureManager_1 = require("../Visuals/TextureManager/TextureManager");
-var TitleRendererBase = /** @class */ (function () {
+var TitleRendererBase = /** @class */ (function (_super) {
+    __extends(TitleRendererBase, _super);
     function TitleRendererBase(webAssemblyContext) {
-        this.drawDebug = false;
-        this.useCache = true;
-        this.viewRectProperty = Rect_1.Rect.createZero();
+        var _this = _super.call(this) || this;
+        _this.drawDebug = false;
+        _this.useCache = true;
+        _this.viewRectProperty = Rect_1.Rect.createZero();
         /**
          * The height taken by the text with normal(horizontal) orientation including padding
          */
-        this.textHeight = 0;
+        _this.textHeight = 0;
         /**
          * The width taken by the text with normal(horizontal) orientation including padding
          */
-        this.textWidth = 0;
+        _this.textWidth = 0;
         /**
          * The height taken by the text considering current orientation orientation including padding
          */
-        this.desiredHeightProperty = 0;
+        _this.desiredHeightProperty = 0;
         /**
          * The width taken by the text considering current orientation orientation including padding
          */
-        this.desiredWidthProperty = 0;
-        this.useNativeTextProperty = false;
-        this.webAssemblyContext = webAssemblyContext;
-        this.textureManager = new TextureManager_1.TextureManager(webAssemblyContext);
-        this.onDpiChanged = this.onDpiChanged.bind(this);
-        DpiHelper_1.DpiHelper.dpiChanged.subscribe(this.onDpiChanged);
+        _this.desiredWidthProperty = 0;
+        _this.useNativeTextProperty = false;
+        _this.webAssemblyContext = webAssemblyContext;
+        _this.textureManager = new TextureManager_1.TextureManager(webAssemblyContext);
+        _this.onDpiChanged = _this.onDpiChanged.bind(_this);
+        DpiHelper_1.DpiHelper.dpiChanged.subscribe(_this.onDpiChanged);
+        return _this;
     }
     Object.defineProperty(TitleRendererBase.prototype, "viewRect", {
         /**
@@ -65,6 +84,8 @@ var TitleRendererBase = /** @class */ (function () {
     };
     TitleRendererBase.prototype.delete = function () {
         this.resetCache();
+        this.textureManager = (0, Deleter_1.deleteSafe)(this.textureManager);
+        this.webAssemblyContext = undefined;
         DpiHelper_1.DpiHelper.dpiChanged.unsubscribe(this.onDpiChanged);
     };
     TitleRendererBase.prototype.resetCache = function () {
@@ -236,7 +257,7 @@ var TitleRendererBase = /** @class */ (function () {
         }
     };
     return TitleRendererBase;
-}());
+}(DeletableEntity_1.DeletableEntity));
 exports.TitleRendererBase = TitleRendererBase;
 var getAdjustedRotation = function (rotation, position) {
     if (rotation !== undefined) {

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

@@ -3,7 +3,7 @@ import { SciChartSurface } from "../SciChartSurface";
 import { AnnotationBase } from "./AnnotationBase";
 import { IAnnotation } from "./IAnnotation";
 export declare class AdornerLayer {
-    readonly parentSurface: SciChartSurface;
+    parentSurface: SciChartSurface;
     private selectedAnnotationProperty;
     constructor(scs: SciChartSurface);
     selectAnnotation(args: ModifierMouseArgs): boolean;

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

@@ -1,9 +1,9 @@
+import { DeletableEntity } from "../../../Core/DeletableEntity";
 import { EventHandler } from "../../../Core/EventHandler";
 import { Point } from "../../../Core/Point";
 import { EXyDirection } from "../../../types/XyDirection";
 import { ModifierMouseArgs } from "../../ChartModifiers/ModifierMouseArgs";
 import { CoordinateCalculatorBase } from "../../Numerics/CoordinateCalculators/CoordinateCalculatorBase";
-import { SciChartSurface } from "../SciChartSurface";
 import { SciChartSurfaceBase } from "../SciChartSurfaceBase";
 import { TDpiChangedEventArgs } from "../TextureManager/DpiHelper";
 import { AnnotationClickEventArgs } from "./AnnotationClickEventArgs";
@@ -222,7 +222,7 @@ export declare enum ECoordinateMode {
 /**
  * Defines the base class to an Annotation - a type of marker, text label, line or custom UI overlay on a 2D Cartesian {@link SciChartSurface}
  */
-export declare abstract class AnnotationBase implements IAnnotation, IAdornerProvider {
+export declare abstract class AnnotationBase extends DeletableEntity implements IAnnotation, IAdornerProvider {
     dragStarted: EventHandler<void>;
     dragEnded: EventHandler<void>;
     dragDelta: EventHandler<AnnotationDragDeltaEventArgs>;
@@ -260,10 +260,10 @@ export declare abstract class AnnotationBase implements IAnnotation, IAdornerPro
     protected selectionBoxDeltaProperty: number;
     protected selectionBoxThicknessProperty: number;
     protected dragPointsProperty: readonly EDraggingGripPoint[];
+    protected parentSurfaceProperty: SciChartSurfaceBase;
     private opacityProperty;
     private annotationLayerProperty;
     private isEditableProperty;
-    private parentSurfaceProperty;
     private x1Property;
     private x2Property;
     private y1Property;
@@ -287,11 +287,11 @@ export declare abstract class AnnotationBase implements IAnnotation, IAdornerPro
     /**
      * Gets or sets current {@link EDraggingGripPoint}
      */
-    protected set adornerDraggingPoint(value: EDraggingGripPoint);
+    set adornerDraggingPoint(value: EDraggingGripPoint);
     /** @inheritDoc */
-    get parentSurface(): SciChartSurface;
+    get parentSurface(): SciChartSurfaceBase;
     /** @inheritDoc */
-    set parentSurface(parentSurface: SciChartSurface);
+    set parentSurface(parentSurface: SciChartSurfaceBase);
     /** @inheritDoc */
     get isEditable(): boolean;
     /** @inheritDoc */

package/Charting/Visuals/Annotations/AnnotationBase.js

@@ -1,7 +1,23 @@
 "use strict";
+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 (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 __());
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AnnotationBase = exports.ECoordinateMode = exports.EDraggingGripPoint = void 0;
 var classFactory_1 = require("../../../Builder/classFactory");
+var DeletableEntity_1 = require("../../../Core/DeletableEntity");
 var EventHandler_1 = require("../../../Core/EventHandler");
 var Guard_1 = require("../../../Core/Guard");
 var Point_1 = require("../../../Core/Point");
@@ -62,108 +78,112 @@ var ECoordinateMode;
 /**
  * Defines the base class to an Annotation - a type of marker, text label, line or custom UI overlay on a 2D Cartesian {@link SciChartSurface}
  */
-var AnnotationBase = /** @class */ (function () {
+var AnnotationBase = /** @class */ (function (_super) {
+    __extends(AnnotationBase, _super);
     /**
      * Creates an instance of the Annotation
      * @param options optional parameters of type {@link IAnnotationBaseOptions} used to configure the annotation at construct time
      */
     function AnnotationBase(options) {
+        var _this = this;
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
-        this.showWarning = true;
-        this.prevIsSelected = true;
+        _this = _super.call(this) || this;
+        _this.showWarning = true;
+        _this.prevIsSelected = true;
         /** the annotation absolute coordinates */
-        this.annotationBorders = {
+        _this.annotationBorders = {
             x1: 0,
             x2: 0,
             y1: 0,
             y2: 0
         };
-        this.typeMap = new Map();
-        this.isHiddenProperty = false;
-        this.annotationsGripsStrokeProperty = SciChartSurfaceBase_1.SciChartSurfaceBase.DEFAULT_THEME.annotationsGripsBorderBrush;
-        this.annotationsGripsFillProperty = SciChartSurfaceBase_1.SciChartSurfaceBase.DEFAULT_THEME.annotationsGripsBackroundBrush;
-        this.annotationsGripsRadiusProperty = constants_1.ADORNER_GRIP_RADIUS;
-        this.selectionBoxStrokeProperty = SciChartSurfaceBase_1.SciChartSurfaceBase.DEFAULT_THEME.annotationSelectionStroke;
-        this.selectionBoxDeltaProperty = 1.5;
-        this.selectionBoxThicknessProperty = 6;
-        this.dragPointsProperty = [
+        _this.typeMap = new Map();
+        _this.isHiddenProperty = false;
+        _this.annotationsGripsStrokeProperty = SciChartSurfaceBase_1.SciChartSurfaceBase.DEFAULT_THEME.annotationsGripsBorderBrush;
+        _this.annotationsGripsFillProperty = SciChartSurfaceBase_1.SciChartSurfaceBase.DEFAULT_THEME.annotationsGripsBackroundBrush;
+        _this.annotationsGripsRadiusProperty = constants_1.ADORNER_GRIP_RADIUS;
+        _this.selectionBoxStrokeProperty = SciChartSurfaceBase_1.SciChartSurfaceBase.DEFAULT_THEME.annotationSelectionStroke;
+        _this.selectionBoxDeltaProperty = 1.5;
+        _this.selectionBoxThicknessProperty = 6;
+        _this.dragPointsProperty = [
             EDraggingGripPoint.Body,
             EDraggingGripPoint.x1y1,
             EDraggingGripPoint.x2y2,
             EDraggingGripPoint.x2y1,
             EDraggingGripPoint.x1y2
         ];
-        this.annotationLayerProperty = IAnnotation_1.EAnnotationLayer.AboveChart;
-        this.isEditableProperty = false;
-        this.xAxisIdProperty = AxisCore_1.AxisCore.DEFAULT_AXIS_ID;
-        this.yAxisIdProperty = AxisCore_1.AxisCore.DEFAULT_AXIS_ID;
-        this.xCoordinateModeProperty = ECoordinateMode.DataValue;
-        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 : (0, guid_1.generateGuid)();
-        this.dragStarted = new EventHandler_1.EventHandler();
-        this.dragEnded = new EventHandler_1.EventHandler();
-        this.dragDelta = new EventHandler_1.EventHandler();
-        this.selectedChanged = new EventHandler_1.EventHandler();
-        this.clicked = new EventHandler_1.EventHandler();
-        this.annotationLayerProperty = (_b = options === null || options === void 0 ? void 0 : options.annotationLayer) !== null && _b !== void 0 ? _b : this.annotationLayerProperty;
-        this.resizeDirectionsProperty = (_c = options === null || options === void 0 ? void 0 : options.resizeDirections) !== null && _c !== void 0 ? _c : this.resizeDirectionsProperty;
-        this.isEditableProperty = (_d = options === null || options === void 0 ? void 0 : options.isEditable) !== null && _d !== void 0 ? _d : this.isEditableProperty;
-        this.isHiddenProperty = (_e = options === null || options === void 0 ? void 0 : options.isHidden) !== null && _e !== void 0 ? _e : this.isHiddenProperty;
-        this.x1Property = (_f = options === null || options === void 0 ? void 0 : options.x1) !== null && _f !== void 0 ? _f : this.x1Property;
-        this.y1Property = (_g = options === null || options === void 0 ? void 0 : options.y1) !== null && _g !== void 0 ? _g : this.y1Property;
-        this.x2Property = (_h = options === null || options === void 0 ? void 0 : options.x2) !== null && _h !== void 0 ? _h : this.x2Property;
-        this.y2Property = (_j = options === null || options === void 0 ? void 0 : options.y2) !== null && _j !== void 0 ? _j : this.y2Property;
-        this.xAxisIdProperty = (_k = options === null || options === void 0 ? void 0 : options.xAxisId) !== null && _k !== void 0 ? _k : this.xAxisIdProperty;
-        this.yAxisIdProperty = (_l = options === null || options === void 0 ? void 0 : options.yAxisId) !== null && _l !== void 0 ? _l : this.yAxisIdProperty;
-        this.xCoordinateModeProperty = (_m = options === null || options === void 0 ? void 0 : options.xCoordinateMode) !== null && _m !== void 0 ? _m : this.xCoordinateModeProperty;
-        this.yCoordinateModeProperty = (_o = options === null || options === void 0 ? void 0 : options.yCoordinateMode) !== null && _o !== void 0 ? _o : this.yCoordinateModeProperty;
-        this.isSelectedProperty = (_p = options === null || options === void 0 ? void 0 : options.isSelected) !== null && _p !== void 0 ? _p : this.isSelectedProperty;
-        this.opacityProperty = (_q = options === null || options === void 0 ? void 0 : options.opacity) !== null && _q !== void 0 ? _q : 1.0;
-        this.annotationsGripsStrokeProperty = (_r = options === null || options === void 0 ? void 0 : options.annotationsGripsStroke) !== null && _r !== void 0 ? _r : this.annotationsGripsStrokeProperty;
-        this.annotationsGripsFillProperty = (_s = options === null || options === void 0 ? void 0 : options.annotationsGripsFill) !== null && _s !== void 0 ? _s : this.annotationsGripsFillProperty;
-        this.annotationsGripsRadiusProperty = (_t = options === null || options === void 0 ? void 0 : options.annotationsGripsRadius) !== null && _t !== void 0 ? _t : this.annotationsGripsRadius;
-        this.selectionBoxStroke = (_u = options === null || options === void 0 ? void 0 : options.selectionBoxStroke) !== null && _u !== void 0 ? _u : this.selectionBoxStrokeProperty;
-        this.selectionBoxDelta = (_v = options === null || options === void 0 ? void 0 : options.selectionBoxDelta) !== null && _v !== void 0 ? _v : this.selectionBoxDeltaProperty;
-        this.selectionBoxThickness = (_w = options === null || options === void 0 ? void 0 : options.selectionBoxThickness) !== null && _w !== void 0 ? _w : this.selectionBoxThicknessProperty;
-        this.dragPointsProperty = (_x = options === null || options === void 0 ? void 0 : options.dragPoints) !== null && _x !== void 0 ? _x : this.dragPointsProperty;
+        _this.annotationLayerProperty = IAnnotation_1.EAnnotationLayer.AboveChart;
+        _this.isEditableProperty = false;
+        _this.xAxisIdProperty = AxisCore_1.AxisCore.DEFAULT_AXIS_ID;
+        _this.yAxisIdProperty = AxisCore_1.AxisCore.DEFAULT_AXIS_ID;
+        _this.xCoordinateModeProperty = ECoordinateMode.DataValue;
+        _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 : (0, guid_1.generateGuid)();
+        _this.dragStarted = new EventHandler_1.EventHandler();
+        _this.dragEnded = new EventHandler_1.EventHandler();
+        _this.dragDelta = new EventHandler_1.EventHandler();
+        _this.selectedChanged = new EventHandler_1.EventHandler();
+        _this.clicked = new EventHandler_1.EventHandler();
+        _this.annotationLayerProperty = (_b = options === null || options === void 0 ? void 0 : options.annotationLayer) !== null && _b !== void 0 ? _b : _this.annotationLayerProperty;
+        _this.resizeDirectionsProperty = (_c = options === null || options === void 0 ? void 0 : options.resizeDirections) !== null && _c !== void 0 ? _c : _this.resizeDirectionsProperty;
+        _this.isEditableProperty = (_d = options === null || options === void 0 ? void 0 : options.isEditable) !== null && _d !== void 0 ? _d : _this.isEditableProperty;
+        _this.isHiddenProperty = (_e = options === null || options === void 0 ? void 0 : options.isHidden) !== null && _e !== void 0 ? _e : _this.isHiddenProperty;
+        _this.x1Property = (_f = options === null || options === void 0 ? void 0 : options.x1) !== null && _f !== void 0 ? _f : _this.x1Property;
+        _this.y1Property = (_g = options === null || options === void 0 ? void 0 : options.y1) !== null && _g !== void 0 ? _g : _this.y1Property;
+        _this.x2Property = (_h = options === null || options === void 0 ? void 0 : options.x2) !== null && _h !== void 0 ? _h : _this.x2Property;
+        _this.y2Property = (_j = options === null || options === void 0 ? void 0 : options.y2) !== null && _j !== void 0 ? _j : _this.y2Property;
+        _this.xAxisIdProperty = (_k = options === null || options === void 0 ? void 0 : options.xAxisId) !== null && _k !== void 0 ? _k : _this.xAxisIdProperty;
+        _this.yAxisIdProperty = (_l = options === null || options === void 0 ? void 0 : options.yAxisId) !== null && _l !== void 0 ? _l : _this.yAxisIdProperty;
+        _this.xCoordinateModeProperty = (_m = options === null || options === void 0 ? void 0 : options.xCoordinateMode) !== null && _m !== void 0 ? _m : _this.xCoordinateModeProperty;
+        _this.yCoordinateModeProperty = (_o = options === null || options === void 0 ? void 0 : options.yCoordinateMode) !== null && _o !== void 0 ? _o : _this.yCoordinateModeProperty;
+        _this.isSelectedProperty = (_p = options === null || options === void 0 ? void 0 : options.isSelected) !== null && _p !== void 0 ? _p : _this.isSelectedProperty;
+        _this.opacityProperty = (_q = options === null || options === void 0 ? void 0 : options.opacity) !== null && _q !== void 0 ? _q : 1.0;
+        _this.annotationsGripsStrokeProperty = (_r = options === null || options === void 0 ? void 0 : options.annotationsGripsStroke) !== null && _r !== void 0 ? _r : _this.annotationsGripsStrokeProperty;
+        _this.annotationsGripsFillProperty = (_s = options === null || options === void 0 ? void 0 : options.annotationsGripsFill) !== null && _s !== void 0 ? _s : _this.annotationsGripsFillProperty;
+        _this.annotationsGripsRadiusProperty = (_t = options === null || options === void 0 ? void 0 : options.annotationsGripsRadius) !== null && _t !== void 0 ? _t : _this.annotationsGripsRadius;
+        _this.selectionBoxStroke = (_u = options === null || options === void 0 ? void 0 : options.selectionBoxStroke) !== null && _u !== void 0 ? _u : _this.selectionBoxStrokeProperty;
+        _this.selectionBoxDelta = (_v = options === null || options === void 0 ? void 0 : options.selectionBoxDelta) !== null && _v !== void 0 ? _v : _this.selectionBoxDeltaProperty;
+        _this.selectionBoxThickness = (_w = options === null || options === void 0 ? void 0 : options.selectionBoxThickness) !== null && _w !== void 0 ? _w : _this.selectionBoxThicknessProperty;
+        _this.dragPointsProperty = (_x = options === null || options === void 0 ? void 0 : options.dragPoints) !== null && _x !== void 0 ? _x : _this.dragPointsProperty;
         if (options === null || options === void 0 ? void 0 : options.onDragStarted) {
             if (typeof options.onDragStarted === "string") {
-                this.typeMap.set("onDragStarted", options.onDragStarted);
-                this.dragStarted.subscribe((0, classFactory_1.getFunction)(BaseType_1.EBaseType.OptionFunction, options.onDragStarted));
+                _this.typeMap.set("onDragStarted", options.onDragStarted);
+                _this.dragStarted.subscribe((0, classFactory_1.getFunction)(BaseType_1.EBaseType.OptionFunction, options.onDragStarted));
             }
             else {
-                this.dragStarted.subscribe(options.onDragStarted);
+                _this.dragStarted.subscribe(options.onDragStarted);
             }
         }
         if (options === null || options === void 0 ? void 0 : options.onDragEnded) {
             if (typeof options.onDragEnded === "string") {
-                this.typeMap.set("onDragEnded", options.onDragEnded);
-                this.dragEnded.subscribe((0, classFactory_1.getFunction)(BaseType_1.EBaseType.OptionFunction, options.onDragEnded));
+                _this.typeMap.set("onDragEnded", options.onDragEnded);
+                _this.dragEnded.subscribe((0, classFactory_1.getFunction)(BaseType_1.EBaseType.OptionFunction, options.onDragEnded));
             }
             else {
-                this.dragEnded.subscribe(options.onDragEnded);
+                _this.dragEnded.subscribe(options.onDragEnded);
             }
         }
         if (options === null || options === void 0 ? void 0 : options.onDrag) {
             if (typeof options.onDrag === "string") {
-                this.typeMap.set("onDrag", options.onDrag);
-                this.dragDelta.subscribe((0, classFactory_1.getFunction)(BaseType_1.EBaseType.OptionFunction, options.onDrag));
+                _this.typeMap.set("onDrag", options.onDrag);
+                _this.dragDelta.subscribe((0, classFactory_1.getFunction)(BaseType_1.EBaseType.OptionFunction, options.onDrag));
             }
             else {
-                this.dragDelta.subscribe(options.onDrag);
+                _this.dragDelta.subscribe(options.onDrag);
             }
         }
         if (options === null || options === void 0 ? void 0 : options.onClick) {
             if (typeof options.onClick === "string") {
-                this.typeMap.set("onClick", options.onClick);
-                this.clicked.subscribe((0, classFactory_1.getFunction)(BaseType_1.EBaseType.OptionFunction, options.onClick));
+                _this.typeMap.set("onClick", options.onClick);
+                _this.clicked.subscribe((0, classFactory_1.getFunction)(BaseType_1.EBaseType.OptionFunction, options.onClick));
             }
             else {
-                this.clicked.subscribe(options.onClick);
+                _this.clicked.subscribe(options.onClick);
             }
         }
+        return _this;
     }
     Object.defineProperty(AnnotationBase.prototype, "annotationLayer", {
         /** @inheritDoc */
@@ -991,5 +1011,5 @@ var AnnotationBase = /** @class */ (function () {
         };
     };
     return AnnotationBase;
-}());
+}(DeletableEntity_1.DeletableEntity));
 exports.AnnotationBase = AnnotationBase;

package/Charting/Visuals/Annotations/CursorTooltipSvgAnnotation.js

@@ -201,6 +201,10 @@ var CursorTooltipSvgAnnotation = /** @class */ (function (_super) {
             this.svgRoot.removeChild(this.svg);
         }
         this.setSvg(undefined);
+        if (this.svgLegend) {
+            this.svgRoot.removeChild(this.svgLegend);
+            this.svgLegend = undefined;
+        }
     };
     /**
      * @inheritDoc

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

@@ -1,5 +1,4 @@
 import { IDeletable } from "../../../Core/IDeletable";
-import { SciChartSurface } from "../SciChartSurface";
 import { SciChartSurfaceBase } from "../SciChartSurfaceBase";
 import { INotifyOnDpiChanged } from "../TextureManager/DpiHelper";
 import { ECoordinateMode } from "./AnnotationBase";
@@ -21,7 +20,13 @@ export declare enum EAnnotationLayer {
      * The Grid lines and Axis Bands will show over the annotation,
      * so consider setting {@link AxisCore.axisBandsFill} to a semi-transparent color to avoid this.
      */
-    BelowChart = "BelowChart"
+    BelowChart = "BelowChart",
+    /**
+     * The {@link IAnnotation | Annotation} will be displayed below the chart grid lines, bands, and axes.
+     * @remarks
+     * Use this for custom background behind the chart.
+     */
+    Background = "Background"
 }
 /**
  * Defines the type of {@link IAnnotation | Annotation}.
@@ -249,9 +254,9 @@ export interface IAnnotation extends IDeletable, INotifyOnDpiChanged {
      */
     isHidden: boolean;
     /**
-     * @description the parent SciChartSurface for this annotation
+     * @description the parent SciChartSurfaceBase for this annotation
      */
-    parentSurface: SciChartSurface;
+    parentSurface: SciChartSurfaceBase;
     /**
      * @description if true, the chart is vertical
      */

package/Charting/Visuals/Annotations/IAnnotation.js

@@ -21,6 +21,12 @@ var EAnnotationLayer;
      * so consider setting {@link AxisCore.axisBandsFill} to a semi-transparent color to avoid this.
      */
     EAnnotationLayer["BelowChart"] = "BelowChart";
+    /**
+     * The {@link IAnnotation | Annotation} will be displayed below the chart grid lines, bands, and axes.
+     * @remarks
+     * Use this for custom background behind the chart.
+     */
+    EAnnotationLayer["Background"] = "Background";
 })(EAnnotationLayer = exports.EAnnotationLayer || (exports.EAnnotationLayer = {}));
 /**
  * Defines the type of {@link IAnnotation | Annotation}.

package/Charting/Visuals/Annotations/LineAnnotation.js

@@ -281,7 +281,9 @@ var LineAnnotation = /** @class */ (function (_super) {
         var borderY1 = this.getY1Coordinate(xCalc, yCalc);
         var borderY2 = this.getY2Coordinate(xCalc, yCalc);
         this.setAnnotationBorders(borderX1, borderX2, borderY1, borderY2);
-        renderContext.drawLine(borderX1, borderY1, borderX2, borderY2, strokePen, viewRect);
+        if (strokePen) {
+            renderContext.drawLine(borderX1, borderY1, borderX2, borderY2, strokePen, viewRect);
+        }
         // This code is a bit silly, but I'm leaving it just in case anyone is currently relying on it.
         // It will get sorted in the big annotation refactor
         if (this.showLabel) {

package/Charting/Visuals/Annotations/NativeTextAnnotation.js

@@ -407,6 +407,10 @@ var NativeTextAnnotation = /** @class */ (function (_super) {
         if (scaleChanged) {
             font.SetScale(oldScale);
         }
+        if (this.annotationLayer !== IAnnotation_1.EAnnotationLayer.AboveChart) {
+            // If the annotation needs to be drawn below anything, draw it now, as by default fonts are all ended at the end of the render cycle
+            font.End();
+        }
         this.updateAdornerInner();
     };
     NativeTextAnnotation.prototype.onDragStarted = function (args) {

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

@@ -1,6 +1,7 @@
 import { Rect } from "../../../Core/Rect";
 import { IRenderContext2D } from "../../Drawing/IRenderContext2D";
 import { CoordinateCalculatorBase } from "../../Numerics/CoordinateCalculators/CoordinateCalculatorBase";
+import { SciChartSurface } from "../SciChartSurface";
 import { AnnotationBase, IAnnotationBaseOptions } from "./AnnotationBase";
 /**
  * The Base class for an {@link AnnotationBase | Annotation} which draws using SciChart's built-in WebGL2
@@ -15,6 +16,10 @@ export declare abstract class RenderContextAnnotationBase extends AnnotationBase
      * @param options optional parameters of type {@link IAnnotationBaseOptions} which configure the annotation at construction time
      */
     protected constructor(options?: IAnnotationBaseOptions);
+    /** @inheritDoc */
+    get parentSurface(): SciChartSurface;
+    /** @inheritDoc */
+    set parentSurface(parentSurface: SciChartSurface);
     /**
      * @description draws the annotation with RenderContext.
      * May be overriden in derived classes for fast drawing direct on render surface

package/Charting/Visuals/Annotations/RenderContextAnnotationBase.js

@@ -17,6 +17,7 @@ var __extends = (this && this.__extends) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RenderContextAnnotationBase = void 0;
 var AnnotationBase_1 = require("./AnnotationBase");
+var constants_1 = require("./constants");
 /**
  * The Base class for an {@link AnnotationBase | Annotation} which draws using SciChart's built-in WebGL2
  * WebAssembly {@link WebGL2RenderingContext | RenderContext}, enabling fast drawing at expense of
@@ -34,6 +35,21 @@ var RenderContextAnnotationBase = /** @class */ (function (_super) {
         _this.isSvgAnnotation = false;
         return _this;
     }
+    Object.defineProperty(RenderContextAnnotationBase.prototype, "parentSurface", {
+        /** @inheritDoc */
+        get: function () {
+            return this.parentSurfaceProperty;
+        },
+        /** @inheritDoc */
+        set: function (parentSurface) {
+            if (this.parentSurfaceProperty !== parentSurface) {
+                this.parentSurfaceProperty = parentSurface;
+                this.notifyPropertyChanged(constants_1.PROPERTY.PARENT_SURFACE);
+            }
+        },
+        enumerable: false,
+        configurable: true
+    });
     return RenderContextAnnotationBase;
 }(AnnotationBase_1.AnnotationBase));
 exports.RenderContextAnnotationBase = RenderContextAnnotationBase;

package/Charting/Visuals/Annotations/RolloverTooltipSvgAnnotation.js

@@ -221,6 +221,12 @@ var defaultTooltipDataTemplate = function (seriesInfo, tooltipTitle, tooltipLabe
         }
         valuesWithLabels.push("Z: ".concat(heatmapSeriesInfo.formattedZValue));
     }
+    else if (seriesInfo.dataSeriesType === IDataSeries_1.EDataSeriesType.Xyz) {
+        // Bubble Series
+        var xyzSeriesInfo = seriesInfo;
+        addValueWithLabel(valuesWithLabels, xyzSeriesInfo.formattedXValue, xyzSeriesInfo.formattedYValue, tooltipLabelX, tooltipLabelY);
+        valuesWithLabels.push("Z: ".concat(xyzSeriesInfo.formattedZValue));
+    }
     else {
         // Line Series
         var xySeriesInfo = seriesInfo;

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

@@ -41,6 +41,7 @@ export declare enum PROPERTY {
     TOOLTIP_LEGEND_OFFSET_X = "TOOLTIP_LEGEND_OFFSET_X",
     TOOLTIP_LEGEND_OFFSET_Y = "TOOLTIP_LEGEND_OFFSET_Y",
     TOOLTIP_LEGEND_TEMPLATE = "TOOLTIP_LEGEND_TEMPLATE",
+    TOOLTIP_DATA_TEMPLATE = "TOOLTIP_DATA_TEMPLATE",
     TOOLTIP_SVG_TEMPLATE = "TOOLTIP_SVG_TEMPLATE",
     VERTICAL_ANCHOR_POINT = "VERTICAL_ANCHOR_POINT",
     X1 = "X1",

package/Charting/Visuals/Annotations/constants.js

@@ -45,6 +45,7 @@ var PROPERTY;
     PROPERTY["TOOLTIP_LEGEND_OFFSET_X"] = "TOOLTIP_LEGEND_OFFSET_X";
     PROPERTY["TOOLTIP_LEGEND_OFFSET_Y"] = "TOOLTIP_LEGEND_OFFSET_Y";
     PROPERTY["TOOLTIP_LEGEND_TEMPLATE"] = "TOOLTIP_LEGEND_TEMPLATE";
+    PROPERTY["TOOLTIP_DATA_TEMPLATE"] = "TOOLTIP_DATA_TEMPLATE";
     PROPERTY["TOOLTIP_SVG_TEMPLATE"] = "TOOLTIP_SVG_TEMPLATE";
     PROPERTY["VERTICAL_ANCHOR_POINT"] = "VERTICAL_ANCHOR_POINT";
     PROPERTY["X1"] = "X1";

package/Charting/Visuals/Axis/AxisBase2D.d.ts

@@ -151,6 +151,11 @@ export interface IAxisBase2dOptions extends IAxisCoreOptions {
      */
     axisThickness?: number;
     backgroundColor?: string;
+    /**
+     * Sets the offset from the seriesViewRect in the direction of the axis.  This overrides the value set internally during layout,
+     * which is 0 for normal axes, but is used to position stacked axes.
+     */
+    overrideOffset?: number;
 }
 /**
  * The base class for 2D Chart Axis within SciChart - High Performance {@link https://www.scichart.com/javascript-chart-features | JavaScript Charts}.
@@ -164,11 +169,11 @@ export interface IAxisBase2dOptions extends IAxisCoreOptions {
  */
 export declare abstract class AxisBase2D extends AxisCore implements IThemeable {
     /**
-     * Gets or sets a {@link LabelProvider} - a class which is responsible for formatting axis labels and cursor labels from numeric values
+     * Gets or sets a {@link LabelProviderBase2D} - a class which is responsible for formatting axis labels and cursor labels from numeric values
      */
     get labelProvider(): LabelProviderBase2D;
     /**
-     * Gets or sets a {@link LabelProvider} - a class which is responsible for formatting axis labels and cursor labels from numeric values
+     * Gets or sets a {@link LabelProviderBase2D} - a class which is responsible for formatting axis labels and cursor labels from numeric values
      */
     set labelProvider(labelProvider: LabelProviderBase2D);
     /**
@@ -258,14 +263,14 @@ export declare abstract class AxisBase2D extends AxisCore implements IThemeable
      * Stacked axes without a defined length will have the remaining unreserved spaced split between them.
      * @remarks The axis length doesn't include border sizes
      */
-    get stackedAxisLength(): TStackedAxisLength;
+    get stackedAxisLength(): TStackedAxisLength | undefined;
     /** Gets or sets the length of a stacked axis as an absolute number or percentage, e.g. 100, or "30%".
      * A plain number will be interpreted as a number of pixels.
      * A number with % will take that percentage of the total length.
      * Stacked axes without a defined length will have the remaining unreserved spaced split between them.
      * @remarks The axis length doesn't include border sizes
      */
-    set stackedAxisLength(value: TStackedAxisLength);
+    set stackedAxisLength(value: TStackedAxisLength | undefined);
     /**
      * Called internally - Gets or sets the length the current Axis. E.g. width of horizontal axis or height of vertical axis.
      */
@@ -277,7 +282,12 @@ export declare abstract class AxisBase2D extends AxisCore implements IThemeable
      */
     get offset(): number;
     /**
-     * Gets or sets the offset of the axis position
+     * set an offset value that overrides the one used by layout calculation
+     */
+    overrideOffset(value: number): void;
+    /**
+     * Called internally by layout strategies when switching between stacked and non-stacked axes.
+     * If you want to set a manual offset, call {@link overrideOffset}
      */
     set offset(value: number);
     /**
@@ -321,7 +331,7 @@ export declare abstract class AxisBase2D extends AxisCore implements IThemeable
     /**
      * Gets the {@link AxisTitleRenderer} instance responsible for drawing the axis title
      */
-    readonly axisTitleRenderer: AxisTitleRenderer;
+    axisTitleRenderer: AxisTitleRenderer;
     /**
      * Gets the {@link AxisLayoutState} class which manages layout
      */
@@ -334,7 +344,7 @@ export declare abstract class AxisBase2D extends AxisCore implements IThemeable
      * The {@link TSciChart | SciChart 2D WebAssembly Context} containing native methods and
      * access to our WebGL2 Engine and WebAssembly numerical methods
      */
-    protected readonly webAssemblyContext2D: TSciChart;
+    protected webAssemblyContext2D: TSciChart;
     protected axisRendererProperty: AxisRenderer;
     protected autoRangeAnimationProperty: IAutoRangeAnimationOptions;
     private labelStyleProperty;
@@ -355,6 +365,7 @@ export declare abstract class AxisBase2D extends AxisCore implements IThemeable
     private solidBrushCacheBorder;
     private axisLengthProperty;
     private offsetProperty;
+    private offsetOverrideProperty;
     private tickCache;
     private backgroundColorProperty;
     private dpiAdjustedLabelStyleCache;
@@ -371,6 +382,10 @@ export declare abstract class AxisBase2D extends AxisCore implements IThemeable
      * Called when the {@link AxisBase2D} is attached to an {@link SciChartSurface}
      */
     onAttach(parentSurface: SciChartSurface, isXAxis: boolean, isPrimaryAxis: boolean): void;
+    /**
+     * Called when the {@link AxisBase2D} is detached from an {@link SciChartSurface}
+     */
+    onDetach(): void;
     /**
      * Called internally - measures the axis as part of the layout phase
      */
@@ -410,7 +425,7 @@ export declare abstract class AxisBase2D extends AxisCore implements IThemeable
      * @param xRanges (optional) if provided, we use previously calculated XAxis ranges
      * keyed by AxisId rather than calculate them again
      */
-    getWindowedYRange(xRanges: Dictionary<NumberRange>): NumberRange;
+    getWindowedYRange(xRanges: Dictionary<NumberRange> | undefined): NumberRange;
     /**
      * Programmatically scrolls the axis by a number of pixels
      * @param pixelsToScroll The number of pixels to scroll