scichart 3.1.348 → 3.2.434

package/Charting/Visuals/Axis/CategoryAxisBase.js

@@ -139,8 +139,8 @@ var CategoryAxisBase = /** @class */ (function (_super) {
      * @inheritDoc
      */
     CategoryAxisBase.prototype.delete = function () {
-        _super.prototype.delete.call(this);
         this.defaultBaseXValues = (0, Deleter_1.deleteSafe)(this.defaultBaseXValues);
+        _super.prototype.delete.call(this);
     };
     /**
      * @inheritDoc
@@ -155,8 +155,8 @@ var CategoryAxisBase = /** @class */ (function (_super) {
         // For reasons passing understanding, the native Category Coord Calculators operate in reverse to the linear ones
         // The order is switched so they match the values of shouldFlipCC
         var coordCalc = this.isXAxis !== this.flippedCoordinates
-            ? new CategoryCoordinateCalculator_1.CategoryCoordinateCalculator(this.webAssemblyContext2D, size, 0, 0, min, max, this.offset)
-            : new FlippedCategoryCoordinateCalculator_1.FlippedCategoryCoordinateCalculator(this.webAssemblyContext2D, size, 0, 0, min, max, this.offset);
+            ? new CategoryCoordinateCalculator_1.CategoryCoordinateCalculator(this.webAssemblyContext2D, size, min, max, this.offset)
+            : new FlippedCategoryCoordinateCalculator_1.FlippedCategoryCoordinateCalculator(this.webAssemblyContext2D, size, min, max, this.offset);
         this.setBaseXValues(coordCalc, renderableSeries);
         return coordCalc;
     };
@@ -221,7 +221,7 @@ var CategoryAxisBase = /** @class */ (function (_super) {
         }
         else {
             // Not stacked renderable series
-            if (!(renderableSeries === null || renderableSeries === void 0 ? void 0 : renderableSeries.dataSeries)) {
+            if (!(renderableSeries === null || renderableSeries === void 0 ? void 0 : renderableSeries.dataSeries) || renderableSeries.dataSeries.count() < 10) {
                 if (!coordCalc.baseXValues)
                     coordCalc.baseXValues = this.generateDefaultXValuesForCategoryAxis();
                 return;

package/Charting/Visuals/Axis/DeltaCalculator/DateTimeDeltaCalculator.js

@@ -98,21 +98,26 @@ var DateTimeDeltaCalculator = /** @class */ (function (_super) {
         var _this = this;
         var diff = max - min;
         this.prevIndex = undefined;
-        var calculateDelta = function (deltas, index) {
-            var _a;
-            var delta = deltas[index];
+        var calculateDelta = function (index) {
+            var _a, _b;
+            var delta = _this.possibleDeltasProperty[index];
             var ticksCount = Math.floor(diff / delta);
-            if (ticksCount < ((_a = _this.minTicks) !== null && _a !== void 0 ? _a : maxTicks / 3) && index > 0 && index !== _this.prevIndex) {
+            if (ticksCount < ((_a = _this.minTicks) !== null && _a !== void 0 ? _a : maxTicks / 3) && index === 0 && index !== _this.prevIndex) {
                 if (!_this.prevIndex)
                     _this.prevIndex = index;
-                return calculateDelta(deltas, index - 1);
+                return _super.prototype.getDeltaFromRange.call(_this, min, max, minorsPerMajor, maxTicks).max;
             }
-            if (ticksCount > maxTicks && index < deltas.length - 1 && index !== _this.prevIndex) {
+            if (ticksCount < ((_b = _this.minTicks) !== null && _b !== void 0 ? _b : maxTicks / 3) && index > 0 && index !== _this.prevIndex) {
                 if (!_this.prevIndex)
                     _this.prevIndex = index;
-                return calculateDelta(deltas, index + 1);
+                return calculateDelta(index - 1);
             }
-            else if (ticksCount > maxTicks && index === deltas.length - 1) {
+            if (ticksCount > maxTicks && index < _this.possibleDeltasProperty.length - 1 && index !== _this.prevIndex) {
+                if (!_this.prevIndex)
+                    _this.prevIndex = index;
+                return calculateDelta(index + 1);
+            }
+            else if (ticksCount > maxTicks && index === _this.possibleDeltasProperty.length - 1) {
                 var yearDelta = _super.prototype.getDeltaFromRange.call(_this, min / delta, max / delta, minorsPerMajor, maxTicks);
                 return yearDelta.max * delta;
             }
@@ -123,7 +128,7 @@ var DateTimeDeltaCalculator = /** @class */ (function (_super) {
                 return delta;
             }
         };
-        var delta = calculateDelta(this.possibleDeltasProperty, this.currIndex);
+        var delta = calculateDelta(this.currIndex);
         return new NumberRange_1.NumberRange(delta / minorsPerMajor, delta);
     };
     return DateTimeDeltaCalculator;

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

@@ -19,6 +19,11 @@ export declare abstract class DeltaCalculator {
      * @param axis The Axis we are attached to.
      */
     attachedToAxis(axis: AxisCore): void;
+    /**
+     * Called when the {@link DeltaCalculator} is detached from {@link AxisCore | Axis}
+     * @param axis The Axis we are attached to.
+     */
+    detachedFromAxis(): void;
     /**
      * Gets a Delta from a visiblerange and with the provided properties
      * @param min the {@link AxisCore.visibleRange} minimum

package/Charting/Visuals/Axis/DeltaCalculator/DeltaCalculator.js

@@ -20,6 +20,13 @@ var DeltaCalculator = /** @class */ (function () {
     DeltaCalculator.prototype.attachedToAxis = function (axis) {
         this.parentAxis = axis;
     };
+    /**
+     * Called when the {@link DeltaCalculator} is detached from {@link AxisCore | Axis}
+     * @param axis The Axis we are attached to.
+     */
+    DeltaCalculator.prototype.detachedFromAxis = function () {
+        this.parentAxis = undefined;
+    };
     return DeltaCalculator;
 }());
 exports.DeltaCalculator = DeltaCalculator;

package/Charting/Visuals/Axis/LabelProvider/LabelCache.d.ts

@@ -1,5 +1,5 @@
-import { TTextStyle } from "../AxisCore";
-import { LabelInfo } from "./LabelProviderBase2D";
+import type { TTextStyle } from "../AxisCore";
+import type { LabelInfo } from "./LabelProviderBase2D";
 export declare type TCachedLabelStyle = TTextStyle & {
     providerId: string;
     rotation?: number;

package/Charting/Visuals/Axis/LabelProvider/LabelCache.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.labelCache = void 0;
 var Deleter_1 = require("../../../../Core/Deleter");
+var logger_1 = require("../../../../utils/logger");
 var labelCacheByTextAndStyle = new Map();
 var styleCache = {};
 var lastStyleId = 0;
@@ -69,8 +70,14 @@ var clearCacheByStyle = function (styleId) {
         var _b = parseCacheKey(keyStr), text = _b.text, keyStyleId = _b.styleId;
         if (keyStyleId === styleId) {
             var label = labelCacheByTextAndStyle.get(keyStr);
-            (0, Deleter_1.deleteSafe)(label.bitmapTexture);
             labelCacheByTextAndStyle.delete(keyStr);
+            try {
+                (0, Deleter_1.deleteSafe)(label.bitmapTexture);
+            }
+            catch (error) {
+                // WasmContext is probably disposed
+                logger_1.Logger.debug(error);
+            }
         }
     }
 };

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

@@ -1,3 +1,4 @@
+import { DeletableEntity } from "../../../../Core/DeletableEntity";
 import { ELabelProviderType } from "../../../../types/LabelProviderType";
 import { ENumericFormat } from "../../../../types/NumericFormat";
 import { AxisCore } from "../AxisCore";
@@ -18,7 +19,7 @@ export declare type TFormatLabelFn = (dataValue: number) => string;
 /**
  * @summary A base class for Label Providers - types which allow programmatic overriding of Axis labels
  */
-export declare abstract class LabelProvider {
+export declare abstract class LabelProvider extends DeletableEntity {
     abstract readonly type: ELabelProviderType | string;
     /**
      * The parent {@link AxisCore}. This will be set once {@link attachedToAxis} is called
@@ -41,6 +42,11 @@ export declare abstract class LabelProvider {
      * @param axis The Axis we are attached to.
      */
     attachedToAxis(axis: AxisCore): void;
+    /**
+     * Called when the {@link LabelProvider} is detached from an {@link AxisCore | Axis}
+     * @param axis The Axis we are attached to.
+     */
+    detachedFromAxis(): void;
     /**
      * Called once when an axis drawing pass begins. Use this method to do one-time setup
      */

package/Charting/Visuals/Axis/LabelProvider/LabelProvider.js

@@ -1,20 +1,39 @@
 "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.LabelProvider = void 0;
+var DeletableEntity_1 = require("../../../../Core/DeletableEntity");
 /**
  * @summary A base class for Label Providers - types which allow programmatic overriding of Axis labels
  */
-var LabelProvider = /** @class */ (function () {
+var LabelProvider = /** @class */ (function (_super) {
+    __extends(LabelProvider, _super);
     /**
      *
      */
     function LabelProvider(options) {
-        this.numericFormatProperty = options === null || options === void 0 ? void 0 : options.labelFormat;
-        this.precisionProperty = options === null || options === void 0 ? void 0 : options.labelPrecision;
-        this.cursorNumericFormatProperty = options === null || options === void 0 ? void 0 : options.cursorLabelFormat;
-        this.cursorPrecisionProperty = options === null || options === void 0 ? void 0 : options.cursorLabelPrecision;
-        this.prefixProperty = options === null || options === void 0 ? void 0 : options.labelPrefix;
-        this.postfixProperty = options === null || options === void 0 ? void 0 : options.labelPostfix;
+        var _this = _super.call(this) || this;
+        _this.numericFormatProperty = options === null || options === void 0 ? void 0 : options.labelFormat;
+        _this.precisionProperty = options === null || options === void 0 ? void 0 : options.labelPrecision;
+        _this.cursorNumericFormatProperty = options === null || options === void 0 ? void 0 : options.cursorLabelFormat;
+        _this.cursorPrecisionProperty = options === null || options === void 0 ? void 0 : options.cursorLabelPrecision;
+        _this.prefixProperty = options === null || options === void 0 ? void 0 : options.labelPrefix;
+        _this.postfixProperty = options === null || options === void 0 ? void 0 : options.labelPostfix;
+        return _this;
     }
     /**
      * Called when the {@link LabelProvider} is attached to an {@link AxisCore | Axis}
@@ -23,6 +42,13 @@ var LabelProvider = /** @class */ (function () {
     LabelProvider.prototype.attachedToAxis = function (axis) {
         this.parentAxis = axis;
     };
+    /**
+     * Called when the {@link LabelProvider} is detached from an {@link AxisCore | Axis}
+     * @param axis The Axis we are attached to.
+     */
+    LabelProvider.prototype.detachedFromAxis = function () {
+        this.parentAxis = undefined;
+    };
     Object.defineProperty(LabelProvider.prototype, "numericFormat", {
         /**
          * Gets or sets numeric format to use. For a list of values, see {@link ENumericFormat}
@@ -163,5 +189,5 @@ var LabelProvider = /** @class */ (function () {
         }
     };
     return LabelProvider;
-}());
+}(DeletableEntity_1.DeletableEntity));
 exports.LabelProvider = LabelProvider;

package/Charting/Visuals/Axis/LabelProvider/LabelProviderBase2D.d.ts

@@ -1,4 +1,4 @@
-import { IDeletable } from "../../../../Core/IDeletable";
+import { ICacheable } from "../../../../Core/ICacheable";
 import { TSRTexture } from "../../../../types/TSciChart";
 import { TextureManager, TTextureObject } from "../../TextureManager/TextureManager";
 import { TTextStyle } from "../AxisCore";
@@ -40,7 +40,7 @@ export interface ILabel2DOptions extends ILabelOptions {
 /**
  * The {@link LabelProviderBase2D} provides base functionality for 2D label providers, including caching of label textures
  */
-export declare abstract class LabelProviderBase2D extends LabelProvider implements IDeletable {
+export declare abstract class LabelProviderBase2D extends LabelProvider implements ICacheable {
     useCache: boolean;
     /** Whether to use cached labels from other axes that have the same style.
      * You may need to set this false if you are overriding getLabelTexture without setting a unique style.
@@ -137,6 +137,8 @@ export declare abstract class LabelProviderBase2D extends LabelProvider implemen
      */
     getLabelTexture(labelText: string, textureManager: TextureManager, labelStyle: TTextStyle): TTextureObject;
     getNativeLabelInfo(labelText: string): LabelInfo;
+    invalidateCache(): void;
+    resetCache(): void;
     delete(): void;
     toJSON(): {
         type: string;

package/Charting/Visuals/Axis/LabelProvider/LabelProviderBase2D.js

@@ -156,7 +156,7 @@ var LabelProviderBase2D = /** @class */ (function (_super) {
                 this.styleId = LabelCache_1.labelCache.getStyleId(this.getCachedStyle());
             }
             else if (!LabelCache_1.labelCache.checkStyle(this.styleId, this.getCachedStyle())) {
-                this.delete();
+                this.resetCache();
                 this.styleId = LabelCache_1.labelCache.getStyleId(this.getCachedStyle());
             }
         }
@@ -362,13 +362,19 @@ var LabelProviderBase2D = /** @class */ (function (_super) {
     LabelProviderBase2D.prototype.getNativeLabelInfo = function (labelText) {
         return LabelCache_1.labelCache.getLabel(labelText, this.styleId);
     };
-    LabelProviderBase2D.prototype.delete = function () {
+    LabelProviderBase2D.prototype.invalidateCache = function () {
         if (this.styleId) {
             LabelCache_1.labelCache.freeStyle(this.styleId);
         }
         this.tickToText.clear();
         this.styleId = null;
     };
+    LabelProviderBase2D.prototype.resetCache = function () {
+        this.invalidateCache();
+    };
+    LabelProviderBase2D.prototype.delete = function () {
+        this.resetCache();
+    };
     LabelProviderBase2D.prototype.toJSON = function () {
         var json = _super.prototype.toJSON.call(this);
         var options = {

package/Charting/Visuals/Axis/LabelProvider/PieLabelProvider.d.ts

@@ -14,6 +14,7 @@ export declare class PieLabelProvider extends LabelProvider {
      */
     protected parentSurface: SciChartPieSurface;
     constructor(options?: ILabelOptions);
+    delete(): void;
     /**
      * Get the text to be used as the segmet label. This picks the raw value, or percentage depending on the chart's valueMode
      * then formats it using the {@link formatLabel} function.

package/Charting/Visuals/Axis/LabelProvider/PieLabelProvider.js

@@ -50,6 +50,7 @@ var PieLabelProvider = /** @class */ (function (_super) {
         };
         return _this;
     }
+    PieLabelProvider.prototype.delete = function () { };
     /**
      * Get the text to be used as the segmet label. This picks the raw value, or percentage depending on the chart's valueMode
      * then formats it using the {@link formatLabel} function.

package/Charting/Visuals/HeatmapLegend.d.ts

@@ -6,6 +6,7 @@ import { IThemePartial, IThemeProvider } from "../Themes/IThemeProvider";
 import { IAxisBase2dOptions } from "./Axis/AxisBase2D";
 import { HeatmapColorMap, IHeatmapColorMapOptions } from "./RenderableSeries/HeatmapColorMap";
 import { SciChartSurface, TWebAssemblyChart } from "./SciChartSurface";
+import { DeletableEntity } from "../../Core/DeletableEntity";
 export interface IHeatmapLegendOptions {
     /**
      * Optional - options applied to the yaxis used in the inner {@link SciChartSurface} in the {@link HeatmapLegend} control
@@ -38,7 +39,7 @@ export declare type THeatmapLegend = {
  * @remarks This control will expand to fit its parent Div. Suggest placing the div to the right and floating 100px wide to
  * create a good effect.
  */
-export declare class HeatmapLegend implements IDeletable {
+export declare class HeatmapLegend extends DeletableEntity implements IDeletable {
     /**
      * Asynchronously creates a {@link HeatmapLegend} and @link TSciChart | WebAssembly Context} to occupy the div by element ID in your DOM.
      * @remarks This method is async and must be awaited
@@ -47,7 +48,7 @@ export declare class HeatmapLegend implements IDeletable {
      */
     static create(divElement: string | HTMLDivElement, options?: IHeatmapLegendOptions): Promise<THeatmapLegend>;
     private readonly SIZE;
-    private readonly wasmContext;
+    private wasmContext;
     private sciChartSurface;
     /**
      * Creates a new HeatmapLegend wrapping a SciChartSurface. Use the {@link HeatmapLegend.create()} function to create this asynchronously

package/Charting/Visuals/HeatmapLegend.js

@@ -1,4 +1,19 @@
 "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 __());
+    };
+})();
 var __assign = (this && this.__assign) || function () {
     __assign = Object.assign || function(t) {
         for (var s, i = 1, n = arguments.length; i < n; i++) {
@@ -57,6 +72,7 @@ var HeatmapColorMap_1 = require("./RenderableSeries/HeatmapColorMap");
 var UniformHeatmapRenderableSeries_1 = require("./RenderableSeries/UniformHeatmapRenderableSeries");
 var SciChartSurface_1 = require("./SciChartSurface");
 var Deleter_1 = require("../../Core/Deleter");
+var DeletableEntity_1 = require("../../Core/DeletableEntity");
 /**
  * @summary The HeatmapLegend displays a control which hosts a {@link SciChartSurface} in a specific Div on the chart.
  * The legend contains a gradient fill and can be used in conjunction with {@link UniformHeatmapRenderableSeries},
@@ -65,35 +81,38 @@ var Deleter_1 = require("../../Core/Deleter");
  * @remarks This control will expand to fit its parent Div. Suggest placing the div to the right and floating 100px wide to
  * create a good effect.
  */
-var HeatmapLegend = /** @class */ (function () {
+var HeatmapLegend = /** @class */ (function (_super) {
+    __extends(HeatmapLegend, _super);
     /**
      * Creates a new HeatmapLegend wrapping a SciChartSurface. Use the {@link HeatmapLegend.create()} function to create this asynchronously
      * @param sciChartSurface
      * @param options
      */
     function HeatmapLegend(sciChartSurface, options) {
+        var _this = this;
         var _a, _b, _c, _d, _e, _f, _g;
-        this.SIZE = 100;
+        _this = _super.call(this) || this;
+        _this.SIZE = 100;
         Guard_1.Guard.notNull(sciChartSurface, "sciChartSurface");
-        this.sciChartSurface = sciChartSurface;
-        this.wasmContext = sciChartSurface.webAssemblyContext2D;
+        _this.sciChartSurface = sciChartSurface;
+        _this.wasmContext = sciChartSurface.webAssemblyContext2D;
         var minimum = (_b = (_a = options === null || options === void 0 ? void 0 : options.colorMap) === null || _a === void 0 ? void 0 : _a.minimum) !== null && _b !== void 0 ? _b : 0;
         var maximum = (_d = (_c = options === null || options === void 0 ? void 0 : options.colorMap) === null || _c === void 0 ? void 0 : _c.maximum) !== null && _d !== void 0 ? _d : 100;
-        var gradientStops = (_f = (_e = options === null || options === void 0 ? void 0 : options.colorMap) === null || _e === void 0 ? void 0 : _e.gradientStops) !== null && _f !== void 0 ? _f : this.getDefaultGradientStops();
+        var gradientStops = (_f = (_e = options === null || options === void 0 ? void 0 : options.colorMap) === null || _e === void 0 ? void 0 : _e.gradientStops) !== null && _f !== void 0 ? _f : _this.getDefaultGradientStops();
         // Add an XAxis and YAxis. Ensure properties are set via options
-        sciChartSurface.xAxes.add(new NumericAxis_1.NumericAxis(this.wasmContext, __assign({}, this.getDefaultXAxisOptions())));
-        sciChartSurface.yAxes.add(new NumericAxis_1.NumericAxis(this.wasmContext, __assign(__assign(__assign({}, this.getDefaultYAxisOptions()), options === null || options === void 0 ? void 0 : options.yAxisOptions), { visibleRange: new NumberRange_1.NumberRange(minimum, maximum) })));
+        sciChartSurface.xAxes.add(new NumericAxis_1.NumericAxis(_this.wasmContext, __assign({}, _this.getDefaultXAxisOptions())));
+        sciChartSurface.yAxes.add(new NumericAxis_1.NumericAxis(_this.wasmContext, __assign(__assign(__assign({}, _this.getDefaultYAxisOptions()), options === null || options === void 0 ? void 0 : options.yAxisOptions), { visibleRange: new NumberRange_1.NumberRange(minimum, maximum) })));
         // Create a 1D array of size 100, 1. This will be filled with values from 0...99 which will
         // be mapped to colours according to the colorMap below.
-        var zValues = this.getZValues(minimum, maximum);
+        var zValues = _this.getZValues(minimum, maximum);
         // Add a heatmap with 1D data. This contains a 1x100 array of values equal to 0...99.
         // the values are mapped ot a colormap with the same gradient stops as the 3d chart. result is a 3d chart heat legend
-        sciChartSurface.renderableSeries.add(new UniformHeatmapRenderableSeries_1.UniformHeatmapRenderableSeries(this.wasmContext, {
-            dataSeries: new UniformHeatmapDataSeries_1.UniformHeatmapDataSeries(this.wasmContext, {
+        sciChartSurface.renderableSeries.add(new UniformHeatmapRenderableSeries_1.UniformHeatmapRenderableSeries(_this.wasmContext, {
+            dataSeries: new UniformHeatmapDataSeries_1.UniformHeatmapDataSeries(_this.wasmContext, {
                 xStart: 0,
                 xStep: 1,
                 yStart: minimum,
-                yStep: (maximum - minimum) / this.SIZE,
+                yStep: (maximum - minimum) / _this.SIZE,
                 zValues: zValues
             }),
             useLinearTextureFiltering: true,
@@ -103,6 +122,7 @@ var HeatmapLegend = /** @class */ (function () {
                 gradientStops: gradientStops
             })
         }));
+        return _this;
     }
     /**
      * Asynchronously creates a {@link HeatmapLegend} and @link TSciChart | WebAssembly Context} to occupy the div by element ID in your DOM.
@@ -131,6 +151,7 @@ var HeatmapLegend = /** @class */ (function () {
      */
     HeatmapLegend.prototype.delete = function () {
         this.sciChartSurface = (0, Deleter_1.deleteSafe)(this.sciChartSurface);
+        this.wasmContext = undefined;
     };
     Object.defineProperty(HeatmapLegend.prototype, "innerSciChartSurface", {
         /**
@@ -188,5 +209,5 @@ var HeatmapLegend = /** @class */ (function () {
         return legendHeatmapData;
     };
     return HeatmapLegend;
-}());
+}(DeletableEntity_1.DeletableEntity));
 exports.HeatmapLegend = HeatmapLegend;

package/Charting/Visuals/Helpers/NativeObject.d.ts

@@ -1,12 +1,15 @@
+import { DeletableEntity } from "../../../Core/DeletableEntity";
 import { IDeletable } from "../../../Core/IDeletable";
 import { SCRTColorVertex, SCRTFontKey, SCRTRectVertex, TSciChart, TSRTextBounds, TSRVector4, VectorColorVertex, VectorRectVertex } from "../../../types/TSciChart";
+import { TSciChart3D } from "../../../types/TSciChart3D";
 import { TTextStyle } from "../Axis/AxisCore";
-export declare class FontKey implements IDeletable {
+export declare class FontKey extends DeletableEntity implements IDeletable {
     readonly firstLoadTime: number;
     readonly nativeKey: SCRTFontKey;
     constructor(nativeKey: SCRTFontKey);
     delete(): void;
 }
+export declare const deleteCache: (wasmContext: TSciChart | TSciChart3D) => void;
 export declare const freeCache: (wasmContext: TSciChart) => IDeletable;
 /**
  * Returns an empty vector of Rectangles
@@ -17,9 +20,9 @@ export declare const freeCache: (wasmContext: TSciChart) => IDeletable;
 export declare const getVectorRectVertex: (wasmContext: TSciChart, maxSize?: number) => VectorRectVertex;
 export declare const getVectorColorVertex: (wasmContext: TSciChart, maxSize?: number) => VectorColorVertex;
 export declare const getVertex: (wasmContext: TSciChart, x: number, y: number, colour?: number) => SCRTColorVertex;
-export declare const getTextBounds: (wasmContext: TSciChart) => TSRTextBounds;
+export declare const getTextBounds: (wasmContext: TSciChart | TSciChart3D) => TSRTextBounds;
 export declare const getNativeRect: (wasmContext: TSciChart, xTopLeft: number, yTopLeft: number, xBottomRight: number, yBottomRight: number) => SCRTRectVertex;
-export declare const getVector4: (wasmContext: TSciChart, x: number, y: number, z: number, w: number) => TSRVector4;
+export declare const getVector4: (wasmContext: TSciChart | TSciChart3D, x: number, y: number, z: number, w: number) => TSRVector4;
 /**
  * get a fontKey required to aquire a native font
  * @param webAssemblyContext
@@ -28,5 +31,5 @@ export declare const getVector4: (wasmContext: TSciChart, x: number, y: number,
  * without disrupting global font rendering
  * @returns
  */
-export declare const getFontKey: (webAssemblyContext: TSciChart, labelStyle: TTextStyle, advanced?: boolean, transformed?: boolean) => SCRTFontKey;
-export declare const getAllFontKeys: (webAssemblyContext: TSciChart) => SCRTFontKey[];
+export declare const getFontKey: (webAssemblyContext: TSciChart | TSciChart3D, labelStyle: TTextStyle, advanced?: boolean, transformed?: boolean) => SCRTFontKey;
+export declare const getAllFontKeys: (webAssemblyContext: TSciChart | TSciChart3D) => SCRTFontKey[];

package/Charting/Visuals/Helpers/NativeObject.js

@@ -1,19 +1,38 @@
 "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.getAllFontKeys = exports.getFontKey = exports.getVector4 = exports.getNativeRect = exports.getTextBounds = exports.getVertex = exports.getVectorColorVertex = exports.getVectorRectVertex = exports.freeCache = exports.FontKey = void 0;
+exports.getAllFontKeys = exports.getFontKey = exports.getVector4 = exports.getNativeRect = exports.getTextBounds = exports.getVertex = exports.getVectorColorVertex = exports.getVectorRectVertex = exports.freeCache = exports.deleteCache = exports.FontKey = void 0;
+var DeletableEntity_1 = require("../../../Core/DeletableEntity");
 var Deleter_1 = require("../../../Core/Deleter");
 var LabelCache_1 = require("../Axis/LabelProvider/LabelCache");
 var SciChartDefaults_1 = require("../SciChartDefaults");
-var FontKey = /** @class */ (function () {
+var FontKey = /** @class */ (function (_super) {
+    __extends(FontKey, _super);
     function FontKey(nativeKey) {
-        this.firstLoadTime = Date.now();
-        this.nativeKey = nativeKey;
+        var _this = _super.call(this) || this;
+        _this.firstLoadTime = Date.now();
+        _this.nativeKey = nativeKey;
+        return _this;
     }
     FontKey.prototype.delete = function () {
         (0, Deleter_1.deleteSafe)(this.nativeKey);
     };
     return FontKey;
-}());
+}(DeletableEntity_1.DeletableEntity));
 exports.FontKey = FontKey;
 var objectCache = new Map();
 var getCache = function (wasmContext) {
@@ -32,24 +51,26 @@ var getCache = function (wasmContext) {
     }
     return objectCache.get(canvasId);
 };
+var deleteCache = function (wasmContext) {
+    if (!wasmContext.canvas)
+        return;
+    var canvasId = wasmContext.canvas.id;
+    var cache = objectCache.get(canvasId);
+    if (cache) {
+        (0, Deleter_1.deleteSafe)(cache.vecRects);
+        (0, Deleter_1.deleteSafe)(cache.vecColorVertex);
+        (0, Deleter_1.deleteSafe)(cache.vertex);
+        (0, Deleter_1.deleteSafe)(cache.rect);
+        (0, Deleter_1.deleteSafe)(cache.vector4);
+        (0, Deleter_1.deleteSafe)(cache.textBounds);
+        cache.keyCache.forEach(function (key) { return (0, Deleter_1.deleteSafe)(key); });
+    }
+    objectCache.delete(canvasId);
+};
+exports.deleteCache = deleteCache;
 var freeCache = function (wasmContext) {
     return {
-        delete: function () {
-            if (!wasmContext.canvas)
-                return;
-            var canvasId = wasmContext.canvas.id;
-            var cache = objectCache.get(canvasId);
-            if (cache) {
-                (0, Deleter_1.deleteSafe)(cache.vecRects);
-                (0, Deleter_1.deleteSafe)(cache.vecColorVertex);
-                (0, Deleter_1.deleteSafe)(cache.vertex);
-                (0, Deleter_1.deleteSafe)(cache.rect);
-                (0, Deleter_1.deleteSafe)(cache.vector4);
-                (0, Deleter_1.deleteSafe)(cache.textBounds);
-                cache.keyCache.forEach(function (key) { return (0, Deleter_1.deleteSafe)(key); });
-            }
-            objectCache.delete(canvasId);
-        }
+        delete: function () { return (0, exports.deleteCache)(wasmContext); }
     };
 };
 exports.freeCache = freeCache;

package/Charting/Visuals/Helpers/drawLabel.js

@@ -42,7 +42,9 @@ var drawLineAnnotation = function (currentAxis, renderContext, labelPlacement, d
     var labelWidth = 0;
     var labelRect;
     var _a = getLineCoordinates(x1Coord, y1Coord, x2Coord, y2Coord, labelHeight, labelWidth, labelPlacement, currentAxis), x1LineCoord = _a.x1LineCoord, y1LineCoord = _a.y1LineCoord, x2LineCoord = _a.x2LineCoord, y2LineCoord = _a.y2LineCoord;
-    renderContext.drawLine(x1LineCoord, y1LineCoord, x2LineCoord, y2LineCoord, strokePen, viewRect);
+    if (strokePen) {
+        renderContext.drawLine(x1LineCoord, y1LineCoord, x2LineCoord, y2LineCoord, strokePen, viewRect);
+    }
     if (showLabel) {
         var _b = currentAxis.axisRenderer.createAnnotationLabelTexture(text, labelTextStyle, labelBackgroundColor, displayVertically, displayMirrored, opacity), bitmapTexture = _b.bitmapTexture, textureHeight = _b.textureHeight, textureWidth = _b.textureWidth;
         var _c = (0, exports.getLabelCoordinates)(currentAxis, labelPlacement, x1Coord, x2Coord, y1Coord, y2Coord, textureHeight, textureWidth, horizontalAlignment, verticalAlignment), xPosition = _c.xPosition, yPosition = _c.yPosition;

package/Charting/Visuals/I2DSurfaceOptions.d.ts

@@ -10,21 +10,6 @@ import { ISurfaceOptionsBase } from "./SciChartSurfaceBase";
  * Options passed to a {@link SciChartSurface} in the {@link SciChartSurface.create} function
  */
 export interface I2DSurfaceOptions extends ISurfaceOptionsBase {
-    /**
-     * Optional - the width aspect ratio of the {@link SciChartSurface}. By default SciChart will scale to fit the parent Div.
-     * However if height of the div is not provided it will use width/height aspect ratio to calculate the height. The default ratio is 3/2.
-     */
-    widthAspect?: number;
-    /**
-     * Optional - the height aspect ratio of the {@link SciChartSurface}. By default SciChart will scale to fit the parent Div.
-     * However if height of the div is not provided it will use width/height aspect ratio to calculate the height. The default ratio is 3/2.
-     */
-    heightAspect?: number;
-    /**
-     * Optional - the option of disabling / enabling scaling of the {@link SciChartSurface}.
-     * If false - the {@link SciChartSurface} will take the height and width of parent div without scaling.
-     */
-    disableAspect?: boolean;
     /**
      * Optional - Prove a layoutManager to customise the axis layout.  Use CentralAxesLayoutManager for an easy way to configure central axes.
      */