scichart 2.0.2126 → 2.0.2144

package/Charting/Visuals/RenderableSeries/Animations/ScatterAnimation.js

@@ -15,7 +15,7 @@ var __extends = (this && this.__extends) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ScatterAnimation = void 0;
 var AnimationType_1 = require("../../../../types/AnimationType");
-var BaseAnimation_1 = require("./BaseAnimation");
+var SeriesAnimation_1 = require("./SeriesAnimation");
 var BaseAnimationStyle_1 = require("./BaseAnimationStyle");
 var ScatterAnimation = /** @class */ (function (_super) {
     __extends(ScatterAnimation, _super);
@@ -30,5 +30,5 @@ var ScatterAnimation = /** @class */ (function (_super) {
         return _this;
     }
     return ScatterAnimation;
-}(BaseAnimation_1.BaseAnimation));
+}(SeriesAnimation_1.SeriesAnimation));
 exports.ScatterAnimation = ScatterAnimation;

package/Charting/Visuals/RenderableSeries/Animations/{BaseAnimation.d.ts → SeriesAnimation.d.ts}

@@ -1,3 +1,4 @@
+import { IAnimation } from "../../../../Core/Animations/AnimationFiniteStateMachine";
 import { TEasingFn } from "../../../../Core/Animations/EasingFunctions";
 import { EAnimationType } from "../../../../types/AnimationType";
 import { DoubleVector, TSciChart } from "../../../../types/TSciChart";
@@ -11,12 +12,12 @@ export interface IBaseAnimationOptions {
     ease?: TEasingFn | string;
 }
 /**
- * @summary Defines the base class for Animations in SciChart's High Performance Real-time
+ * @summary Defines the base class for Renderable Series Animations in SciChart's High Performance Real-time
  * {@link https://www.scichart.com/javascript-chart-features | JavaScript Charts}
  * @remarks
  * An Animation defines the animation that should take place on the start up e.g. as a Wave, Sweep, Fade animation etc...
  */
-export declare abstract class BaseAnimation {
+export declare abstract class SeriesAnimation implements IAnimation {
     /**
      * Returns the type of the animation. See {@link EAnimationType} for a list of values
      */

package/Charting/Visuals/RenderableSeries/Animations/{BaseAnimation.js → SeriesAnimation.js}

@@ -1,19 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseAnimation = void 0;
+exports.SeriesAnimation = void 0;
 var EasingFunctions_1 = require("../../../../Core/Animations/EasingFunctions");
 var parseColor_1 = require("../../../../utils/parseColor");
 var animationHelpers_1 = require("./animationHelpers");
 var BaseAnimationStyle_1 = require("./BaseAnimationStyle");
 var PointMarkerStyle_1 = require("./PointMarkerStyle");
 /**
- * @summary Defines the base class for Animations in SciChart's High Performance Real-time
+ * @summary Defines the base class for Renderable Series Animations in SciChart's High Performance Real-time
  * {@link https://www.scichart.com/javascript-chart-features | JavaScript Charts}
  * @remarks
  * An Animation defines the animation that should take place on the start up e.g. as a Wave, Sweep, Fade animation etc...
  */
-var BaseAnimation = /** @class */ (function () {
-    function BaseAnimation(options) {
+var SeriesAnimation = /** @class */ (function () {
+    function SeriesAnimation(options) {
         var _a, _b, _c, _d;
         /**
          * The animation delay
@@ -44,7 +44,7 @@ var BaseAnimation = /** @class */ (function () {
         this.ease = (_d = options === null || options === void 0 ? void 0 : options.ease) !== null && _d !== void 0 ? _d : this.ease;
     }
     /** Convert the object to a definition that can be serialized to JSON, or used directly with the builder api */
-    BaseAnimation.prototype.toJSON = function () {
+    SeriesAnimation.prototype.toJSON = function () {
         var options = {
             delay: this.delay,
             duration: this.duration,
@@ -61,7 +61,7 @@ var BaseAnimation = /** @class */ (function () {
      * @param progress Current animation progress
      * @param noZeroLine Sets zeroLine = 0, is used for XyzDataSeries
      */
-    BaseAnimation.prototype.calculateAnimationValues = function (wasmContext, originalValues, animationValues, progress, noZeroLine) {
+    SeriesAnimation.prototype.calculateAnimationValues = function (wasmContext, originalValues, animationValues, progress, noZeroLine) {
         if (noZeroLine === void 0) { noZeroLine = false; }
         // TODO: override in child class
     };
@@ -73,7 +73,7 @@ var BaseAnimation = /** @class */ (function () {
      * @param interpolatedValues The vector which will be updated with interpolated values
      * @param progress Current animation progress
      */
-    BaseAnimation.prototype.calculateDataSeriesAnimationValues = function (wasmContext, initialValues, finalValues, interpolatedValues, progress) {
+    SeriesAnimation.prototype.calculateDataSeriesAnimationValues = function (wasmContext, initialValues, finalValues, interpolatedValues, progress) {
         var size = initialValues.size();
         if (size !== finalValues.size()) {
             throw new Error("DoubleVectors with initialValues and initialValues must have the same length");
@@ -87,7 +87,7 @@ var BaseAnimation = /** @class */ (function () {
      * Returns {@link BaseAnimationStyle} object which is being used to create initial styles
      * @param renderableSeries The renderable series
      */
-    BaseAnimation.prototype.getSeriesStyle = function (renderableSeries) {
+    SeriesAnimation.prototype.getSeriesStyle = function (renderableSeries) {
         var _a, _b;
         var rs = renderableSeries;
         if (rs.isStacked)
@@ -105,7 +105,7 @@ var BaseAnimation = /** @class */ (function () {
      * @param initialStyles The initial styles
      * @param animationProgress The animation progress, should be between 0 and 1
      */
-    BaseAnimation.prototype.updateSeriesProperties = function (renderableSeries, initialStyles, animationProgress) {
+    SeriesAnimation.prototype.updateSeriesProperties = function (renderableSeries, initialStyles, animationProgress) {
         var _a, _b, _c, _d, _e;
         var rs = renderableSeries;
         var pointMarker = rs.pointMarker;
@@ -151,7 +151,7 @@ var BaseAnimation = /** @class */ (function () {
             }
         }
     };
-    Object.defineProperty(BaseAnimation.prototype, "isStyleAnimation", {
+    Object.defineProperty(SeriesAnimation.prototype, "isStyleAnimation", {
         /**
          * Return flag if it is styles animation
          */
@@ -161,7 +161,7 @@ var BaseAnimation = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(BaseAnimation.prototype, "isDataSeriesAnimation", {
+    Object.defineProperty(SeriesAnimation.prototype, "isDataSeriesAnimation", {
         /**
          * Return flag if it is dataSeries animation
          */
@@ -171,6 +171,6 @@ var BaseAnimation = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
-    return BaseAnimation;
+    return SeriesAnimation;
 }());
-exports.BaseAnimation = BaseAnimation;
+exports.SeriesAnimation = SeriesAnimation;

package/Charting/Visuals/RenderableSeries/Animations/SweepAnimation.d.ts

@@ -1,9 +1,9 @@
 import { EAnimationType } from "../../../../types/AnimationType";
 import { DoubleVector, TSciChart } from "../../../../types/TSciChart";
-import { BaseAnimation, IBaseAnimationOptions } from "./BaseAnimation";
+import { SeriesAnimation, IBaseAnimationOptions } from "./SeriesAnimation";
 export interface ISweepAnimationOptions extends IBaseAnimationOptions {
 }
-export declare class SweepAnimation extends BaseAnimation {
+export declare class SweepAnimation extends SeriesAnimation {
     /** @inheritDoc */
     readonly type = EAnimationType.Sweep;
     constructor(options?: ISweepAnimationOptions);

package/Charting/Visuals/RenderableSeries/Animations/SweepAnimation.js

@@ -15,7 +15,7 @@ var __extends = (this && this.__extends) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SweepAnimation = void 0;
 var AnimationType_1 = require("../../../../types/AnimationType");
-var BaseAnimation_1 = require("./BaseAnimation");
+var SeriesAnimation_1 = require("./SeriesAnimation");
 var SweepAnimation = /** @class */ (function (_super) {
     __extends(SweepAnimation, _super);
     function SweepAnimation(options) {
@@ -31,5 +31,5 @@ var SweepAnimation = /** @class */ (function (_super) {
         wasmContext.SCRTAnimationHelperSweep(originalValues, progress, animationValues);
     };
     return SweepAnimation;
-}(BaseAnimation_1.BaseAnimation));
+}(SeriesAnimation_1.SeriesAnimation));
 exports.SweepAnimation = SweepAnimation;

package/Charting/Visuals/RenderableSeries/Animations/WaveAnimation.d.ts

@@ -1,11 +1,11 @@
 import { EAnimationType } from "../../../../types/AnimationType";
 import { DoubleVector, TSciChart } from "../../../../types/TSciChart";
-import { BaseAnimation, IBaseAnimationOptions } from "./BaseAnimation";
+import { SeriesAnimation, IBaseAnimationOptions } from "./SeriesAnimation";
 export interface IWaveAnimationOptions extends IBaseAnimationOptions {
     pointDurationFraction?: number;
     zeroLine?: number;
 }
-export declare class WaveAnimation extends BaseAnimation {
+export declare class WaveAnimation extends SeriesAnimation {
     /** @inheritDoc */
     readonly type = EAnimationType.Wave;
     /**

package/Charting/Visuals/RenderableSeries/Animations/WaveAnimation.js

@@ -15,7 +15,7 @@ var __extends = (this && this.__extends) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WaveAnimation = void 0;
 var AnimationType_1 = require("../../../../types/AnimationType");
-var BaseAnimation_1 = require("./BaseAnimation");
+var SeriesAnimation_1 = require("./SeriesAnimation");
 var WaveAnimation = /** @class */ (function (_super) {
     __extends(WaveAnimation, _super);
     function WaveAnimation(options) {
@@ -53,5 +53,5 @@ var WaveAnimation = /** @class */ (function (_super) {
         return json;
     };
     return WaveAnimation;
-}(BaseAnimation_1.BaseAnimation));
+}(SeriesAnimation_1.SeriesAnimation));
 exports.WaveAnimation = WaveAnimation;

package/Charting/Visuals/RenderableSeries/Animations/animationHelpers.d.ts

@@ -1,4 +1,4 @@
-import { AnimationFiniteStateMachine } from "../../../../Core/Animations/AnimationFiniteStateMachine";
+import { AnimationFiniteStateMachine, IAnimation, SeriesAnimationFiniteStateMachine } from "../../../../Core/Animations/AnimationFiniteStateMachine";
 import { DoubleVector, TSciChart } from "../../../../types/TSciChart";
 import { BaseDataSeries } from "../../../Model/BaseDataSeries";
 import { XyyDataSeries } from "../../../Model/XyyDataSeries";
@@ -8,18 +8,18 @@ import { SpritePointMarker } from "../../PointMarkers/SpritePointMarker";
 import { SquarePointMarker } from "../../PointMarkers/SquarePointMarker";
 import { TrianglePointMarker } from "../../PointMarkers/TrianglePointMarker";
 import { XPointMarker } from "../../PointMarkers/XPointMarker";
-import { BaseAnimation } from "./BaseAnimation";
 import { BasePointMarkerStyle } from "./BasePointMarkerStyle";
+import { SeriesAnimation } from "./SeriesAnimation";
 export declare const animationHelpers: {
     checkCanDraw: (animationFSM: AnimationFiniteStateMachine) => boolean;
-    checkIsAnimationRunning: (animationQueue: BaseAnimation[], animationFSM: AnimationFiniteStateMachine) => boolean;
-    animationUpdate: (animationFSM: AnimationFiniteStateMachine, timeElapsed: number, beforeAnimationStart: () => void, afterAnimationComplete: () => void, updateAnimationProperties: (progress: number, animationFSM: AnimationFiniteStateMachine) => void) => void;
+    checkIsAnimationRunning: (animationQueue: IAnimation[], animationFSM: AnimationFiniteStateMachine) => boolean;
+    animationUpdate: (animationFSM: SeriesAnimationFiniteStateMachine, timeElapsed: number, beforeAnimationStart: () => void, afterAnimationComplete: () => void, updateAnimationProperties: (progress: number, animationFSM: SeriesAnimationFiniteStateMachine) => void) => void;
     createPointMarker: (wasmContext: TSciChart, pointMarkerStyle: BasePointMarkerStyle) => SpritePointMarker | CrossPointMarker | EllipsePointMarker | XPointMarker | SquarePointMarker | TrianglePointMarker;
     interpolateNumber: (from: number, to: number, progress: number) => number;
     interpolateColor: (from: number, to: number, progress: number) => number;
     copyVector: (sourceVector: DoubleVector, targetVector: DoubleVector) => void;
-    setSplineAnimationVectors: (wasmContext: TSciChart, animation: BaseAnimation, ds: BaseDataSeries, animationDS: BaseDataSeries, xSplineValues: DoubleVector, ySplineValues: DoubleVector, isCategoryAxis: boolean, interpolationPoints: number) => void;
-    setSplineBandAnimationVectors: (wasmContext: TSciChart, animation: BaseAnimation, ds: XyyDataSeries, animationDS: XyyDataSeries, xSplineValues: DoubleVector, ySplineValues: DoubleVector, y1SplineValues: DoubleVector, isCategoryAxis: boolean, interpolationPoints: number) => void;
-    updateSplineAnimationProperties: (wasmContext: TSciChart, animation: BaseAnimation, progress: number, dataSeries: BaseDataSeries, xSplineValues: DoubleVector, ySplineValues: DoubleVector) => void;
-    updateSplineBandAnimationProperties: (wasmContext: TSciChart, animation: BaseAnimation, progress: number, dataSeries: XyyDataSeries, xSplineValues: DoubleVector, ySplineValues: DoubleVector, y1SplineValues: DoubleVector) => void;
+    setSplineAnimationVectors: (wasmContext: TSciChart, animation: SeriesAnimation, ds: BaseDataSeries, animationDS: BaseDataSeries, xSplineValues: DoubleVector, ySplineValues: DoubleVector, isCategoryAxis: boolean, interpolationPoints: number) => void;
+    setSplineBandAnimationVectors: (wasmContext: TSciChart, animation: SeriesAnimation, ds: XyyDataSeries, animationDS: XyyDataSeries, xSplineValues: DoubleVector, ySplineValues: DoubleVector, y1SplineValues: DoubleVector, isCategoryAxis: boolean, interpolationPoints: number) => void;
+    updateSplineAnimationProperties: (wasmContext: TSciChart, animation: SeriesAnimation, progress: number, dataSeries: BaseDataSeries, xSplineValues: DoubleVector, ySplineValues: DoubleVector) => void;
+    updateSplineBandAnimationProperties: (wasmContext: TSciChart, animation: SeriesAnimation, progress: number, dataSeries: XyyDataSeries, xSplineValues: DoubleVector, ySplineValues: DoubleVector, y1SplineValues: DoubleVector) => void;
 };

package/Charting/Visuals/RenderableSeries/BaseRenderableSeries.d.ts

@@ -1,5 +1,5 @@
 import { TSeriesDefinition } from "../../../Builder/buildSeries";
-import { AnimationFiniteStateMachine } from "../../../Core/Animations/AnimationFiniteStateMachine";
+import { SeriesAnimationFiniteStateMachine } from "../../../Core/Animations/AnimationFiniteStateMachine";
 import { EventHandler } from "../../../Core/EventHandler";
 import { NumberRange } from "../../../Core/NumberRange";
 import { ESeriesType } from "../../../types/SeriesType";
@@ -15,7 +15,7 @@ import { AxisCore } from "../Axis/AxisCore";
 import { IPointMarker } from "../PointMarkers/IPointMarker";
 import { SciChartSurface } from "../SciChartSurface";
 import { TDpiChangedEventArgs } from "../TextureManager/DpiHelper";
-import { BaseAnimation } from "./Animations/BaseAnimation";
+import { SeriesAnimation } from "./Animations/SeriesAnimation";
 import { TPalettingState } from "./DrawingProviders/BaseSeriesDrawingProvider";
 import { ISeriesDrawingProvider } from "./DrawingProviders/ISeriesDrawingProvider";
 import { HitTestInfo } from "./HitTest/HitTestInfo";
@@ -61,8 +61,8 @@ export declare abstract class BaseRenderableSeries implements IRenderableSeries
     hovered: EventHandler<SeriesHoveredArgs>;
     protected webAssemblyContext: TSciChart;
     protected dataSeriesProperty: IDataSeries;
-    protected animationFSM: AnimationFiniteStateMachine;
-    protected animationQueue: BaseAnimation[];
+    protected animationFSM: SeriesAnimationFiniteStateMachine;
+    protected animationQueue: SeriesAnimation[];
     protected typeMap: Map<string, string>;
     private xAxisIdProperty;
     private yAxisIdProperty;
@@ -207,13 +207,13 @@ export declare abstract class BaseRenderableSeries implements IRenderableSeries
     /** @inheritDoc */
     toJSON(excludeData?: boolean): TSeriesDefinition;
     /** @inheritDoc */
-    enqueueAnimation(animation: BaseAnimation): void;
+    enqueueAnimation(animation: SeriesAnimation): void;
     /** @inheritDoc */
-    runAnimation(animation: BaseAnimation): void;
+    runAnimation(animation: SeriesAnimation): void;
     /**
      * Sets a start up animation class, a child class for {@link BaseAnimation}
      */
-    set animation(value: BaseAnimation);
+    set animation(value: SeriesAnimation);
     /** @inheritDoc */
     get isRunningAnimation(): boolean;
     /**
@@ -227,7 +227,7 @@ export declare abstract class BaseRenderableSeries implements IRenderableSeries
      * @param animation
      * @protected
      */
-    protected setAnimationVectors(animation: BaseAnimation): void;
+    protected setAnimationVectors(animation: SeriesAnimation): void;
     /**
      * Runs before the animation starts
      * @protected
@@ -244,7 +244,7 @@ export declare abstract class BaseRenderableSeries implements IRenderableSeries
      * @param animationFSM The animation finite state machine
      * @protected
      */
-    protected updateAnimationProperties(progress: number, animationFSM: AnimationFiniteStateMachine): void;
+    protected updateAnimationProperties(progress: number, animationFSM: SeriesAnimationFiniteStateMachine): void;
     /**
      * Factory function to create a {@link IHitTestProvider | Hit Test Provider}; a class which performs hit-test
      * and checks mouse-over and nearest point.

package/Charting/Visuals/RenderableSeries/BaseRenderableSeries.js

@@ -47,9 +47,9 @@ var BaseRenderableSeries = /** @class */ (function () {
         /** @inheritDoc */
         this.isStacked = false;
         /** @inheritDoc */
-        this.rolloverModifierProps = new RolloverModifierRenderableSeriesProps_1.RolloverModifierRenderableSeriesProps();
+        this.rolloverModifierProps = new RolloverModifierRenderableSeriesProps_1.RolloverModifierRenderableSeriesProps(this);
         /** @inheritDoc */
-        this.rolloverModifierProps1 = new RolloverModifierRenderableSeriesProps_1.RolloverModifierRenderableSeriesProps();
+        this.rolloverModifierProps1 = new RolloverModifierRenderableSeriesProps_1.RolloverModifierRenderableSeriesProps(this, true);
         /** @inheritDoc */
         this.drawingProviders = [];
         /** @inheritDoc */
@@ -667,7 +667,7 @@ var BaseRenderableSeries = /** @class */ (function () {
         if (!this.animationFSM || ((_a = this.animationFSM) === null || _a === void 0 ? void 0 : _a.is([AnimationFiniteStateMachine_1.EAnimationState.Completed]))) {
             if (this.animationQueue.length >= 1) {
                 var animation = this.animationQueue.shift();
-                this.animationFSM = new AnimationFiniteStateMachine_1.AnimationFiniteStateMachine(animation, this);
+                this.animationFSM = new AnimationFiniteStateMachine_1.SeriesAnimationFiniteStateMachine(animation, this);
             }
             else {
                 this.animationFSM = undefined;

package/Charting/Visuals/RenderableSeries/BaseStackedCollection.d.ts

@@ -1,5 +1,5 @@
 import { TSeriesDefinition } from "../../../Builder/buildSeries";
-import { AnimationFiniteStateMachine } from "../../../Core/Animations/AnimationFiniteStateMachine";
+import { SeriesAnimationFiniteStateMachine } from "../../../Core/Animations/AnimationFiniteStateMachine";
 import { EventHandler } from "../../../Core/EventHandler";
 import { NumberRange } from "../../../Core/NumberRange";
 import { ObservableArray } from "../../../Core/ObservableArray";
@@ -15,7 +15,7 @@ import { AxisCore } from "../Axis/AxisCore";
 import { IPointMarker } from "../PointMarkers/IPointMarker";
 import { SciChartSurface } from "../SciChartSurface";
 import { TDpiChangedEventArgs } from "../TextureManager/DpiHelper";
-import { BaseAnimation } from "./Animations/BaseAnimation";
+import { SeriesAnimation } from "./Animations/SeriesAnimation";
 import { BaseStackedRenderableSeries } from "./BaseStackedRenderableSeries";
 import { TPalettingState } from "./DrawingProviders/BaseSeriesDrawingProvider";
 import { ISeriesDrawingProvider } from "./DrawingProviders/ISeriesDrawingProvider";
@@ -72,7 +72,7 @@ export declare abstract class BaseStackedCollection<T extends BaseStackedRendera
     protected accumulatedFinalAnimationValues0: DoubleVector;
     protected isAccumulatedVectorDirty: boolean;
     protected firstAnimationRender: boolean;
-    protected animationFSM: AnimationFiniteStateMachine;
+    protected animationFSM: SeriesAnimationFiniteStateMachine;
     private isVisibleProperty;
     private xAxisIdProperty;
     private yAxisIdProperty;
@@ -272,13 +272,13 @@ export declare abstract class BaseStackedCollection<T extends BaseStackedRendera
      */
     getVisibleSeries(): T[];
     /** @inheritDoc */
-    enqueueAnimation(animation: BaseAnimation): void;
+    enqueueAnimation(animation: SeriesAnimation): void;
     /** @inheritDoc */
-    runAnimation(animation: BaseAnimation): void;
+    runAnimation(animation: SeriesAnimation): void;
     /**
      * Sets a start up animation class, a child class for {@link BaseAnimation}
      */
-    set animation(value: BaseAnimation);
+    set animation(value: SeriesAnimation);
     /** @inheritDoc */
     get isRunningAnimation(): boolean;
     /** @inheritDoc */
@@ -320,7 +320,7 @@ export declare abstract class BaseStackedCollection<T extends BaseStackedRendera
      * @param animationFSM The animation finite state machine
      * @protected
      */
-    protected updateAnimationProperties(progress: number, animationFSM: AnimationFiniteStateMachine): void;
+    protected updateAnimationProperties(progress: number, animationFSM: SeriesAnimationFiniteStateMachine): void;
     protected updateHitTestProviders(renderPassData: RenderPassData): void;
     protected isEnoughDataToDraw(): boolean;
 }

package/Charting/Visuals/RenderableSeries/BaseStackedCollection.js

@@ -540,7 +540,7 @@ var BaseStackedCollection = /** @class */ (function (_super) {
         if (!this.animationFSM || ((_a = this.animationFSM) === null || _a === void 0 ? void 0 : _a.is([AnimationFiniteStateMachine_1.EAnimationState.Completed]))) {
             if (this.animationQueue.length >= 1) {
                 var animation = this.animationQueue.shift();
-                this.animationFSM = new AnimationFiniteStateMachine_1.AnimationFiniteStateMachine(animation, undefined);
+                this.animationFSM = new AnimationFiniteStateMachine_1.SeriesAnimationFiniteStateMachine(animation, undefined);
             }
             else {
                 this.animationFSM = undefined;

package/Charting/Visuals/RenderableSeries/BaseStackedRenderableSeries.d.ts

@@ -1,5 +1,5 @@
 import { TSeriesDefinition } from "../../../Builder/buildSeries";
-import { AnimationFiniteStateMachine } from "../../../Core/Animations/AnimationFiniteStateMachine";
+import { SeriesAnimationFiniteStateMachine } from "../../../Core/Animations/AnimationFiniteStateMachine";
 import { EventHandler } from "../../../Core/EventHandler";
 import { NumberRange } from "../../../Core/NumberRange";
 import { ESeriesType } from "../../../types/SeriesType";
@@ -14,7 +14,7 @@ import { AxisCore } from "../Axis/AxisCore";
 import { IPointMarker } from "../PointMarkers/IPointMarker";
 import { SciChartSurface } from "../SciChartSurface";
 import { TDpiChangedEventArgs } from "../TextureManager/DpiHelper";
-import { BaseAnimation } from "./Animations/BaseAnimation";
+import { SeriesAnimation } from "./Animations/SeriesAnimation";
 import { BaseStackedCollection } from "./BaseStackedCollection";
 import { ISeriesDrawingProvider } from "./DrawingProviders/ISeriesDrawingProvider";
 import { HitTestInfo } from "./HitTest/HitTestInfo";
@@ -188,11 +188,11 @@ export declare abstract class BaseStackedRenderableSeries implements IRenderable
     /**
      * animation() is not supported for BaseStackedRenderableSeries
      */
-    set animation(value: BaseAnimation);
+    set animation(value: SeriesAnimation);
     /**
      * animation() is not supported for BaseStackedRenderableSeries
      */
-    get animation(): BaseAnimation;
+    get animation(): SeriesAnimation;
     /**
      * @inheritDoc
      */
@@ -281,7 +281,7 @@ export declare abstract class BaseStackedRenderableSeries implements IRenderable
      * @param animationFSM The animation finite state machine
      * @protected
      */
-    updateAnimationProperties(progress: number, animationFSM: AnimationFiniteStateMachine): void;
+    updateAnimationProperties(progress: number, animationFSM: SeriesAnimationFiniteStateMachine): void;
     /** @inheritDoc */
     getSeriesInfo(hitTestInfo: HitTestInfo): SeriesInfo;
     /** @inheritDoc */
@@ -328,8 +328,8 @@ export declare abstract class BaseStackedRenderableSeries implements IRenderable
     set effect(effect: ShaderEffect);
     onAnimate(): void;
     get isRunningAnimation(): boolean;
-    enqueueAnimation(animation: BaseAnimation): void;
-    runAnimation(animation: BaseAnimation): void;
+    enqueueAnimation(animation: SeriesAnimation): void;
+    runAnimation(animation: SeriesAnimation): void;
     /**
      * Factory function to create a {@link IHitTestProvider | Hit Test Provider}; a class which performs hit-test
      * and checks mouse-over and nearest point.

package/Charting/Visuals/RenderableSeries/BaseStackedRenderableSeries.js

@@ -29,7 +29,7 @@ var BaseStackedRenderableSeries = /** @class */ (function () {
         this.id = guid_1.generateGuid();
         this.isStacked = true;
         this.isSpline = false;
-        this.rolloverModifierProps = new RolloverModifierRenderableSeriesProps_1.RolloverModifierRenderableSeriesProps();
+        this.rolloverModifierProps = new RolloverModifierRenderableSeriesProps_1.RolloverModifierRenderableSeriesProps(this);
         /** @inheritDoc */
         this.selected = new EventHandler_1.EventHandler();
         /** @inheritDoc */

package/Charting/Visuals/RenderableSeries/IBaseRenderableSeriesOptions.d.ts

@@ -3,7 +3,7 @@ import { ELineDrawMode } from "../../Drawing/WebGlRenderContext2D";
 import { IDataSeries } from "../../Model/IDataSeries";
 import { IPaletteProvider } from "../../Model/IPaletteProvider";
 import { IPointMarker } from "../PointMarkers/IPointMarker";
-import { BaseAnimation } from "./Animations/BaseAnimation";
+import { SeriesAnimation } from "./Animations/SeriesAnimation";
 import { IRenderableSeries } from "./IRenderableSeries";
 import { ShaderEffect } from "./ShaderEffect";
 /**
@@ -139,7 +139,7 @@ export interface IBaseRenderableSeriesOptions {
     /**
      * An animation that runs on the start, child class to {@link BaseAnimation}
      */
-    animation?: BaseAnimation | TAnimationDefinition;
+    animation?: SeriesAnimation | TAnimationDefinition;
     /**
      * Initial selected state for the series. Default to false
      */

package/Charting/Visuals/RenderableSeries/IRenderableSeries.d.ts

@@ -15,7 +15,7 @@ import { AxisCore } from "../Axis/AxisCore";
 import { IPointMarker } from "../PointMarkers/IPointMarker";
 import { SciChartSurface } from "../SciChartSurface";
 import { INotifyOnDpiChanged } from "../TextureManager/DpiHelper";
-import { BaseAnimation } from "./Animations/BaseAnimation";
+import { SeriesAnimation } from "./Animations/SeriesAnimation";
 import { TPalettingState } from "./DrawingProviders/BaseSeriesDrawingProvider";
 import { ISeriesDrawingProvider } from "./DrawingProviders/ISeriesDrawingProvider";
 import { HitTestInfo } from "./HitTest/HitTestInfo";
@@ -304,11 +304,11 @@ export interface IRenderableSeries extends IDeletable, IThemeable, INotifyOnDpiC
     /**
      * Add the animation into the queue
      */
-    enqueueAnimation(animation: BaseAnimation): void;
+    enqueueAnimation(animation: SeriesAnimation): void;
     /**
      * Cancel all previous animations and run the current one
      */
-    runAnimation(animation: BaseAnimation): void;
+    runAnimation(animation: SeriesAnimation): void;
     /**
      * Convert the object to a definition that can be serialized to JSON, or used directly with the builder api
      * @param excludeData if set true, data values will not be included in the json.

package/Charting/Visuals/RenderableSeries/RolloverModifier/RolloverModifierRenderableSeriesProps.d.ts

@@ -2,6 +2,7 @@ import { RolloverModifier, TRolloverTooltipDataTemplate } from "../../../ChartMo
 import { SeriesInfo } from "../../../Model/ChartData/SeriesInfo";
 import { RolloverMarkerSvgAnnotation } from "../../Annotations/RolloverMarkerSvgAnnotation";
 import { RolloverTooltipSvgAnnotation } from "../../Annotations/RolloverTooltipSvgAnnotation";
+import { IRenderableSeries } from "../IRenderableSeries";
 export declare type TRolloverTooltipSvgTemplate = (id: string, seriesInfo: SeriesInfo, rolloverTooltip: RolloverTooltipSvgAnnotation) => string;
 export declare class RolloverModifierRenderableSeriesProps {
     tooltip: RolloverTooltipSvgAnnotation;
@@ -22,6 +23,9 @@ export declare class RolloverModifierRenderableSeriesProps {
     private tooltipTitleProperty;
     private markerColorProperty;
     private tooltipDataTemplateProperty?;
+    private renderableSeries;
+    private isY1;
+    constructor(renderableSeries: IRenderableSeries, isY1?: boolean);
     setInvalidateParentCallback(callback: () => void): void;
     get showRollover(): boolean;
     set showRollover(value: boolean);
@@ -39,4 +43,5 @@ export declare class RolloverModifierRenderableSeriesProps {
     set tooltipLegendTemplate(value: (tooltipProps: RolloverModifierRenderableSeriesProps, seriesInfo: SeriesInfo) => string);
     delete(): void;
     protected notifyPropertyChanged<T>(propertyName: string): void;
+    private getRenderableSeriesStroke;
 }

package/Charting/Visuals/RenderableSeries/RolloverModifier/RolloverModifierRenderableSeriesProps.js

@@ -5,13 +5,14 @@ var Deleter_1 = require("../../../../Core/Deleter");
 var SciChartSurfaceBase_1 = require("../../SciChartSurfaceBase");
 var constants_1 = require("./constants");
 var RolloverModifierRenderableSeriesProps = /** @class */ (function () {
-    function RolloverModifierRenderableSeriesProps() {
+    function RolloverModifierRenderableSeriesProps(renderableSeries, isY1) {
+        if (isY1 === void 0) { isY1 = false; }
         this.tooltipLegendOffsetX = 20;
         this.tooltipLegendOffsetY = 20;
         this.showsRolloverProperty = true;
-        this.tooltipColorProperty = SciChartSurfaceBase_1.SciChartSurfaceBase.DEFAULT_THEME.textAnnotationBackground;
         this.tooltipTextColorProperty = SciChartSurfaceBase_1.SciChartSurfaceBase.DEFAULT_THEME.textAnnotationForeground;
-        this.markerColorProperty = SciChartSurfaceBase_1.SciChartSurfaceBase.DEFAULT_THEME.textAnnotationBackground;
+        this.renderableSeries = renderableSeries;
+        this.isY1 = isY1;
     }
     RolloverModifierRenderableSeriesProps.prototype.setInvalidateParentCallback = function (callback) {
         this.invalidateParentCallback = callback;
@@ -29,7 +30,15 @@ var RolloverModifierRenderableSeriesProps = /** @class */ (function () {
     });
     Object.defineProperty(RolloverModifierRenderableSeriesProps.prototype, "tooltipColor", {
         get: function () {
-            return this.tooltipColorProperty;
+            if (this.tooltipColorProperty) {
+                return this.tooltipColorProperty;
+            }
+            else if (this.getRenderableSeriesStroke()) {
+                return this.getRenderableSeriesStroke();
+            }
+            else {
+                return SciChartSurfaceBase_1.SciChartSurfaceBase.DEFAULT_THEME.textAnnotationBackground;
+            }
         },
         set: function (value) {
             this.tooltipColorProperty = value;
@@ -62,7 +71,15 @@ var RolloverModifierRenderableSeriesProps = /** @class */ (function () {
     });
     Object.defineProperty(RolloverModifierRenderableSeriesProps.prototype, "markerColor", {
         get: function () {
-            return this.markerColorProperty;
+            if (this.markerColorProperty) {
+                return this.markerColorProperty;
+            }
+            else if (this.getRenderableSeriesStroke()) {
+                return this.getRenderableSeriesStroke();
+            }
+            else {
+                return SciChartSurfaceBase_1.SciChartSurfaceBase.DEFAULT_THEME.textAnnotationBackground;
+            }
         },
         set: function (value) {
             this.markerColorProperty = value;
@@ -104,6 +121,13 @@ var RolloverModifierRenderableSeriesProps = /** @class */ (function () {
             this.invalidateParentCallback();
         }
     };
+    RolloverModifierRenderableSeriesProps.prototype.getRenderableSeriesStroke = function () {
+        if (this.isY1) {
+            var bandRS = this.renderableSeries;
+            return bandRS.strokeY1;
+        }
+        return this.renderableSeries.stroke;
+    };
     return RolloverModifierRenderableSeriesProps;
 }());
 exports.RolloverModifierRenderableSeriesProps = RolloverModifierRenderableSeriesProps;

package/Charting/Visuals/RenderableSeries/SplineBandRenderableSeries.d.ts

@@ -1,8 +1,8 @@
-import { AnimationFiniteStateMachine } from "../../../Core/Animations/AnimationFiniteStateMachine";
+import { SeriesAnimationFiniteStateMachine } from "../../../Core/Animations/AnimationFiniteStateMachine";
 import { NumberRange } from "../../../Core/NumberRange";
 import { ESeriesType } from "../../../types/SeriesType";
 import { DoubleVector, TSciChart } from "../../../types/TSciChart";
-import { BaseAnimation } from "./Animations/BaseAnimation";
+import { SeriesAnimation } from "./Animations/SeriesAnimation";
 import { BaseBandRenderableSeries, IBaseBandRenderableSeriesOptions } from "./BaseBandRenderableSeries";
 import { ISpline } from "./ISpline";
 /**
@@ -71,9 +71,9 @@ export declare class SplineBandRenderableSeries extends BaseBandRenderableSeries
     /** @inheritDoc */
     toJSON(excludeData?: boolean): import("../../../Builder/buildSeries").TSeriesDefinition;
     /** @inheritDoc */
-    protected setAnimationVectors(animation: BaseAnimation): void;
+    protected setAnimationVectors(animation: SeriesAnimation): void;
     /** @inheritDoc */
-    protected updateAnimationProperties(progress: number, animationFSM: AnimationFiniteStateMachine): void;
+    protected updateAnimationProperties(progress: number, animationFSM: SeriesAnimationFiniteStateMachine): void;
     /** @inheritDoc */
     protected dataSeriesDataChanged(): void;
 }

package/Charting/Visuals/RenderableSeries/SplineLineRenderableSeries.d.ts

@@ -1,8 +1,8 @@
-import { AnimationFiniteStateMachine } from "../../../Core/Animations/AnimationFiniteStateMachine";
+import { SeriesAnimationFiniteStateMachine } from "../../../Core/Animations/AnimationFiniteStateMachine";
 import { NumberRange } from "../../../Core/NumberRange";
 import { ESeriesType } from "../../../types/SeriesType";
 import { DoubleVector, TSciChart } from "../../../types/TSciChart";
-import { BaseAnimation } from "./Animations/BaseAnimation";
+import { SeriesAnimation } from "./Animations/SeriesAnimation";
 import { BaseLineRenderableSeries } from "./BaseLineRenderableSeries";
 import { TPalettingState } from "./DrawingProviders/BaseSeriesDrawingProvider";
 import { IBaseRenderableSeriesOptions } from "./IBaseRenderableSeriesOptions";
@@ -72,9 +72,9 @@ export declare class SplineLineRenderableSeries extends BaseLineRenderableSeries
      */
     pushPalettedColors(color: number, palettingState: TPalettingState): void;
     /** @inheritDoc */
-    protected setAnimationVectors(animation: BaseAnimation): void;
+    protected setAnimationVectors(animation: SeriesAnimation): void;
     /** @inheritDoc */
-    protected updateAnimationProperties(progress: number, animationFSM: AnimationFiniteStateMachine): void;
+    protected updateAnimationProperties(progress: number, animationFSM: SeriesAnimationFiniteStateMachine): void;
     /** @inheritDoc */
     protected dataSeriesDataChanged(): void;
 }