scichart 2.0.2195 → 2.0.2204

package/Charting/ChartModifiers/CursorModifier.d.ts

@@ -1,6 +1,7 @@
 import { IIncludeSeries } from "../../Core/IIncludeSeries";
 import { Point } from "../../Core/Point";
 import { EChart2DModifierType } from "../../types/ChartModifierType";
+import { EMousePosition } from "../../types/MousePosition";
 import { SeriesInfo } from "../Model/ChartData/SeriesInfo";
 import { IThemeProvider } from "../Themes/IThemeProvider";
 import { CursorTooltipSvgAnnotation } from "../Visuals/Annotations/CursorTooltipSvgAnnotation";
@@ -176,6 +177,9 @@ export declare class CursorModifier extends ChartModifierBase2D implements IIncl
      * @inheritDoc
      */
     getIncludedRenderableSeries(): IRenderableSeries[];
+    /**
+     * Gets or sets the tooltipDataTemplate, which allows to customize content for the tooltip
+     */
     get tooltipDataTemplate(): TCursorTooltipDataTemplate;
     set tooltipDataTemplate(value: TCursorTooltipDataTemplate);
     /**
@@ -184,6 +188,11 @@ export declare class CursorModifier extends ChartModifierBase2D implements IIncl
      * @param mousePoint
      */
     hitTestRenderableSeries(rs: IRenderableSeries, mousePoint: Point): HitTestInfo;
+    /**
+     * Returns current mouse position
+     */
+    getMousePosition(): EMousePosition;
+    /** @inheritDoc */
     toJSON(): {
         type: string;
         options: Required<Omit<IChartModifierBaseOptions, never>>;

package/Charting/ChartModifiers/CursorModifier.js

@@ -300,6 +300,9 @@ var CursorModifier = /** @class */ (function (_super) {
         return allSeries;
     };
     Object.defineProperty(CursorModifier.prototype, "tooltipDataTemplate", {
+        /**
+         * Gets or sets the tooltipDataTemplate, which allows to customize content for the tooltip
+         */
         get: function () {
             return this.tooltipDataTemplateProperty;
         },
@@ -321,6 +324,13 @@ var CursorModifier = /** @class */ (function (_super) {
         }
         return rs.hitTestProvider.hitTestXSlice(mousePoint.x, mousePoint.y);
     };
+    /**
+     * Returns current mouse position
+     */
+    CursorModifier.prototype.getMousePosition = function () {
+        return this.mousePosition;
+    };
+    /** @inheritDoc */
     CursorModifier.prototype.toJSON = function () {
         var json = _super.prototype.toJSON.call(this);
         var options = {

package/Charting/ChartModifiers/RolloverModifier.d.ts

@@ -51,6 +51,24 @@ export declare type TTooltipProps = {
     height: number;
     seriesInfo: SeriesInfo;
 };
+/**
+ * @ignore
+ * Defines the MousePosition enum constants, used by the {@link RolloverModifier}
+ */
+declare enum EMousePosition {
+    /**
+     * The mouse position is outside the main canvas
+     */
+    OutOfCanvas = "OutOfCanvas",
+    /**
+     * The mouse position is in the Axis area
+     */
+    AxisArea = "AxisArea",
+    /**
+     * The mouse position is in the Series area
+     */
+    SeriesArea = "SeriesArea"
+}
 /**
  * Optional parameters used to configure a {@link RolloverModifier} at construct time
  */
@@ -173,10 +191,16 @@ export declare class RolloverModifier extends ChartModifierBase2D implements IIn
      * @param mousePoint
      */
     hitTestRenderableSeries(rs: IRenderableSeries, mousePoint: Point): HitTestInfo;
+    /**
+     * Returns current mouse position
+     */
+    getMousePosition(): EMousePosition;
+    /** @inheritDoc */
     toJSON(): {
         type: string;
         options: Required<Omit<IChartModifierBaseOptions, never>>;
     };
+    /** @inheritDoc */
     protected notifyPropertyChanged(propertyName: string): void;
     private isVerticalChart;
     private removeSeriesAnnotationsFromParentSurface;
@@ -224,3 +248,4 @@ export declare const calcTooltipProps: (index: number, rs: IRenderableSeries, ro
  * @param pixelRatio
  */
 export declare const calcTooltipPositions: (tooltipArray: TTooltipProps[], allowTooltipOverlapping: boolean, tooltipPaddingTop: number, seriesViewRect: Rect, pixelRatio: number) => TTooltipProps[];
+export {};

package/Charting/ChartModifiers/RolloverModifier.js

@@ -346,6 +346,13 @@ var RolloverModifier = /** @class */ (function (_super) {
         }
         return rs.hitTestProvider.hitTestXSlice(mousePoint.x, mousePoint.y);
     };
+    /**
+     * Returns current mouse position
+     */
+    RolloverModifier.prototype.getMousePosition = function () {
+        return this.mousePosition;
+    };
+    /** @inheritDoc */
     RolloverModifier.prototype.toJSON = function () {
         var json = _super.prototype.toJSON.call(this);
         var options = {
@@ -361,6 +368,7 @@ var RolloverModifier = /** @class */ (function (_super) {
         Object.assign(json.options, options);
         return json;
     };
+    /** @inheritDoc */
     RolloverModifier.prototype.notifyPropertyChanged = function (propertyName) {
         _super.prototype.notifyPropertyChanged.call(this, propertyName);
         if (propertyName === constants_1.PROPERTY.X_AXIS_ID) {

package/Charting/Services/SciChartRenderer.js

@@ -80,7 +80,9 @@ var SciChartRenderer = /** @class */ (function () {
                 el.type === IAnnotation_1.EAnnotationType.RenderContextVerticalLineAnnotation ||
                 el.type === IAnnotation_1.EAnnotationType.RenderContextAxisMarkerAnnotation);
         });
-        this.drawRenderContextAnnotations(renderContextAnnotations, xyAxesById[0], xyAxesById[1], IAnnotation_1.EAnnotationLayer.BelowChart, renderContext, seriesViewRect);
+        renderContext.enqueueLayeredDraw(function () {
+            _this.drawRenderContextAnnotations(renderContextAnnotations, xyAxesById[0], xyAxesById[1], IAnnotation_1.EAnnotationLayer.BelowChart, renderContext, seriesViewRect);
+        }, RenderLayer_1.ERenderLayer.Third);
         // queue series rendering after grid lines and bands, but before the axes
         renderContext.enqueueLayeredDraw(function () { return _this.drawSeries(_this.sciChartSurface, _this.sciChartSurface.renderableSeries.asArray(), renderContext); }, RenderLayer_1.ERenderLayer.Third);
         // Execute rendering of queued elements

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

@@ -30,6 +30,7 @@ export declare class CursorTooltipSvgAnnotation extends SvgAnnotationBase {
     private tooltipLegendOffsetXProperty;
     private tooltipLegendOffsetYProperty;
     private svgLegend;
+    private previousMousePosition;
     /**
      * Creates an instance of the {@link CursorTooltipSvgAnnotation}
      * @param options

package/Charting/Visuals/Annotations/CursorTooltipSvgAnnotation.js

@@ -16,6 +16,7 @@ var __extends = (this && this.__extends) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CursorTooltipSvgAnnotation = void 0;
+var MousePosition_1 = require("../../../types/MousePosition");
 var constants_1 = require("./constants");
 var IAnnotation_1 = require("./IAnnotation");
 var SvgAnnotationBase_1 = require("./SvgAnnotationBase");
@@ -164,6 +165,11 @@ var CursorTooltipSvgAnnotation = /** @class */ (function (_super) {
      * @inheritDoc
      */
     CursorTooltipSvgAnnotation.prototype.update = function (xCalc, yCalc) {
+        var currentMousePosition = this.cursorModifier.getMousePosition();
+        if (this.previousMousePosition === currentMousePosition && currentMousePosition !== MousePosition_1.EMousePosition.SeriesArea) {
+            return;
+        }
+        this.previousMousePosition = this.cursorModifier.getMousePosition();
         if (this.svg) {
             this.delete();
         }

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

@@ -1,3 +1,4 @@
+import { CoordinateCalculatorBase } from "../../Numerics/CoordinateCalculators/CoordinateCalculatorBase";
 import { RolloverModifierRenderableSeriesProps } from "../RenderableSeries/RolloverModifier/RolloverModifierRenderableSeriesProps";
 import { EAnnotationType } from "./IAnnotation";
 import { SvgAnnotationBase } from "./SvgAnnotationBase";
@@ -5,6 +6,10 @@ export declare class RolloverMarkerSvgAnnotation extends SvgAnnotationBase {
     /** @inheritDoc */
     readonly type = EAnnotationType.SVG;
     private tooltipProps;
+    private previousMousePosition;
     constructor(renderableSeriesProps: RolloverModifierRenderableSeriesProps);
+    /** @inheritDoc */
+    update(xCalc: CoordinateCalculatorBase, yCalc: CoordinateCalculatorBase): void;
+    /** @inheritDoc */
     protected create(): void;
 }

package/Charting/Visuals/Annotations/RolloverMarkerSvgAnnotation.js

@@ -16,6 +16,7 @@ var __extends = (this && this.__extends) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RolloverMarkerSvgAnnotation = void 0;
+var MousePosition_1 = require("../../../types/MousePosition");
 var IAnnotation_1 = require("./IAnnotation");
 var SvgAnnotationBase_1 = require("./SvgAnnotationBase");
 var RolloverMarkerSvgAnnotation = /** @class */ (function (_super) {
@@ -32,6 +33,16 @@ var RolloverMarkerSvgAnnotation = /** @class */ (function (_super) {
         _this.yCoordShift = -4;
         return _this;
     }
+    /** @inheritDoc */
+    RolloverMarkerSvgAnnotation.prototype.update = function (xCalc, yCalc) {
+        var currentMousePosition = this.tooltipProps.rolloverModifier.getMousePosition();
+        if (this.previousMousePosition === currentMousePosition && currentMousePosition !== MousePosition_1.EMousePosition.SeriesArea) {
+            return;
+        }
+        this.previousMousePosition = this.tooltipProps.rolloverModifier.getMousePosition();
+        _super.prototype.update.call(this, xCalc, yCalc);
+    };
+    /** @inheritDoc */
     RolloverMarkerSvgAnnotation.prototype.create = function () {
         if (this.svg) {
             this.delete();

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

@@ -19,6 +19,7 @@ export declare class RolloverTooltipSvgAnnotation extends SvgAnnotationBase {
     height: number;
     private svgLegend;
     private seriesInfoProperty;
+    private previousMousePosition;
     /**
      * Creates an instance of the {@link RolloverTooltipSvgAnnotation}
      * @param renderableSeriesProps The {@link RolloverModifierRenderableSeriesProps | props} pass
@@ -33,18 +34,15 @@ export declare class RolloverTooltipSvgAnnotation extends SvgAnnotationBase {
      * Gets or sets seriesInfo {@link SeriesInfo} value on the tooltip
      */
     set seriesInfo(value: SeriesInfo);
-    /**
-     * @inheritDoc
-     */
+    /** @inheritDoc */
     delete(): void;
-    /**
-     * @inheritDoc
-     */
+    /** @inheritDoc */
     update(xCalc: CoordinateCalculatorBase, yCalc: CoordinateCalculatorBase): void;
-    updateSize(width: number, height: number): void;
     /**
-     * @inheritDoc
+     * Updates size of the tooltip
      */
+    updateSize(width: number, height: number): void;
+    /** @inheritDoc */
     protected create(xCalc: CoordinateCalculatorBase, yCalc: CoordinateCalculatorBase): void;
     private updateLegendTooltip;
 }

package/Charting/Visuals/Annotations/RolloverTooltipSvgAnnotation.js

@@ -16,6 +16,7 @@ var __extends = (this && this.__extends) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RolloverTooltipSvgAnnotation = void 0;
+var MousePosition_1 = require("../../../types/MousePosition");
 var IDataSeries_1 = require("../../Model/IDataSeries");
 var AnnotationBase_1 = require("./AnnotationBase");
 var constants_1 = require("./constants");
@@ -64,9 +65,7 @@ var RolloverTooltipSvgAnnotation = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    /**
-     * @inheritDoc
-     */
+    /** @inheritDoc */
     RolloverTooltipSvgAnnotation.prototype.delete = function () {
         var _a;
         if (!this.parentSurface || this.parentSurface.isDeleted)
@@ -76,23 +75,27 @@ var RolloverTooltipSvgAnnotation = /** @class */ (function (_super) {
             this.svgRoot.removeChild(this.svgLegend);
         }
     };
-    /**
-     * @inheritDoc
-     */
+    /** @inheritDoc */
     RolloverTooltipSvgAnnotation.prototype.update = function (xCalc, yCalc) {
+        var currentMousePosition = this.tooltipProps.rolloverModifier.getMousePosition();
+        if (this.previousMousePosition === currentMousePosition && currentMousePosition !== MousePosition_1.EMousePosition.SeriesArea) {
+            return;
+        }
+        this.previousMousePosition = this.tooltipProps.rolloverModifier.getMousePosition();
         if (this.svg) {
             this.delete();
         }
         _super.prototype.update.call(this, xCalc, yCalc);
         this.updateLegendTooltip();
     };
+    /**
+     * Updates size of the tooltip
+     */
     RolloverTooltipSvgAnnotation.prototype.updateSize = function (width, height) {
         this.width = width;
         this.height = height;
     };
-    /**
-     * @inheritDoc
-     */
+    /** @inheritDoc */
     RolloverTooltipSvgAnnotation.prototype.create = function (xCalc, yCalc) {
         var _a;
         var svgString;

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

@@ -72,7 +72,7 @@ var clearCacheByStyle = function (styleId) {
         }
     }
 };
-var maxSize = 100;
+var maxSize = 200;
 var minAge = 1000 * 60;
 var lastUsed = 0;
 var getMaxSize = function () { return maxSize; };
@@ -88,7 +88,7 @@ var pruneCache = function () {
     if (labelCacheByTextAndStyle.size > maxSize && lastUsed < latest) {
         try {
             // remove more than we need so we do this less.
-            var toRemove = (labelCacheByTextAndStyle.size - maxSize) * 2;
+            var toRemove = Math.min(Math.floor(labelCacheByTextAndStyle.size / 2), (labelCacheByTextAndStyle.size - maxSize) * 2);
             // Sort the items by LastUsed ascending
             var labels = Array.from(labelCacheByTextAndStyle.entries());
             labels.sort(function (a, b) { return a[1].lastUsed - b[1].lastUsed; });

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

@@ -148,11 +148,16 @@ var LabelProviderBase2D = /** @class */ (function (_super) {
                 var cachedLabel = void 0;
                 if (cachedLabelText) {
                     cachedLabel = LabelCache_1.labelCache.getLabel(cachedLabelText, this.styleId);
-                    labels.push(cachedLabelText);
+                    if (cachedLabel) {
+                        labels.push(cachedLabelText);
+                    }
                 }
-                else {
-                    var text = this.formatLabel(tick);
-                    this.tickToText.set(tick, text);
+                if (!cachedLabel) {
+                    var text = cachedLabelText;
+                    if (!cachedLabelText) {
+                        text = this.formatLabel(tick);
+                        this.tickToText.set(tick, text);
+                    }
                     var texture = this.getCachedLabelTexture(text, axis.axisRenderer.textureManager, axis.dpiAdjustedLabelStyle);
                     if (texture.textureWidth !== null) {
                         cachedLabel = new LabelInfo(tick, text, texture.bitmapTexture, texture.textureHeight, texture.textureWidth);

package/Charting/Visuals/RenderableSeries/BaseRenderableSeries.js

@@ -512,7 +512,8 @@ var BaseRenderableSeries = /** @class */ (function () {
     };
     /** @inheritDoc */
     BaseRenderableSeries.prototype.getDataSeriesName = function () {
-        return this.dataSeries.dataSeriesName;
+        var _a;
+        return (_a = this.dataSeries) === null || _a === void 0 ? void 0 : _a.dataSeriesName;
     };
     /** @inheritDoc */
     BaseRenderableSeries.prototype.getNativeXValues = function () {

package/Charting/Visuals/licenseManager2D.js

@@ -377,7 +377,9 @@ var applyLicense = function (licenseContext) {
     debug("Initial license status is " + licensingClasses_1.LicenseType[convertLicenseType(lt, licenseContext)]);
     // Get from global store
     var runtimelicense = getRuntimeLicenseKey();
-    if ((checkStatus === licensingClasses_1.LicenseCheckStatus.NoLicense || checkStatus === licensingClasses_1.LicenseCheckStatus.LicenseOK) &&
+    if ((checkStatus === licensingClasses_1.LicenseCheckStatus.NoLicense ||
+        checkStatus === licensingClasses_1.LicenseCheckStatus.LicenseOK ||
+        checkStatus === licensingClasses_1.LicenseCheckStatus.LookingForLicenseWizard) &&
         lt === licenseContext.SCRTLicenseType.LICENSE_TYPE_NO_LICENSE &&
         runtimelicense) {
         debug("Runtime license found");

package/Core/BuildStamp.d.ts

@@ -1,4 +1,4 @@
 import { TSciChart } from "../types/TSciChart";
 import { TSciChart3D } from "../types/TSciChart3D";
-export declare const libraryVersion = "2.0.2195";
+export declare const libraryVersion = "2.0.2204";
 export declare const checkBuildStamp: (wasmContext: TSciChart | TSciChart3D) => boolean;

package/Core/BuildStamp.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkBuildStamp = exports.libraryVersion = void 0;
-var buildStamp = "2022-01-05T00:00:00";
+var buildStamp = "2022-01-11T00:00:00";
 var result;
 // tslint:disable-next-line:no-var-requires
-exports.libraryVersion = "2.0.2195";
+exports.libraryVersion = "2.0.2204";
 var checkBuildStamp = function (wasmContext) {
     if (result !== undefined)
         return result;