scichart 2.0.2139 → 2.0.2144

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;
 }

package/Charting/Visuals/RenderableSeries/SplineMountainRenderableSeries.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 { BaseMountainRenderableSeries, IBaseMountainRenderableSeriesOptions } from "./BaseMountainRenderableSeries";
 import { ISpline } from "./ISpline";
 /**
@@ -68,9 +68,9 @@ export declare class SplineMountainRenderableSeries extends BaseMountainRenderab
     /** @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/SciChartSurface.d.ts

@@ -1,5 +1,6 @@
 import { ISciChart2DDefinition } from "../../Builder/buildSurface";
 import { TEasingFn } from "../../Core/Animations/EasingFunctions";
+import { IGenericAnimation } from "../../Core/Animations/GenericAnimation";
 import { EventHandler } from "../../Core/EventHandler";
 import { ObservableArray } from "../../Core/ObservableArray";
 import { Rect } from "../../Core/Rect";
@@ -174,6 +175,7 @@ export declare class SciChartSurface extends SciChartSurfaceBase {
      * access to our WebGL2 Engine and WebAssembly numerical methods
      */
     readonly webAssemblyContext2D: TSciChart;
+    protected animationList: IGenericAnimation[];
     private readonly sciChartRenderer;
     private layoutManagerProperty;
     private zoomStateProperty;
@@ -360,6 +362,17 @@ export declare class SciChartSurface extends SciChartSurfaceBase {
      * @param timeElapsed
      */
     onAnimate(timeElapsed: number): void;
+    /**
+     * Gets the generic animations currently on the surface. Do not manipulate this array directly.
+     * To add, use addAnimation.  To remove, find an animation and call .cancel() on it.
+     */
+    getAnimations(): ReadonlyArray<IGenericAnimation>;
+    /**
+     * Add a {@link GenericAnimation} to the surface.
+     * Multiple animations will be run in parallel, so if you want to run one after another, use the onCompleted callback
+     * to add another animation after the first completes
+     */
+    addAnimation(animation: IGenericAnimation): void;
     /**
      * Returns true if an animation is running
      */

package/Charting/Visuals/SciChartSurface.js

@@ -89,6 +89,7 @@ var SciChartSurface = /** @class */ (function (_super) {
          * to time render performance, or to update elements of the chart or your UI on redraw.
          */
         _this.rendered = new EventHandler_1.EventHandler();
+        _this.animationList = [];
         _this.zoomStateProperty = ZoomState_1.EZoomState.AtExtents;
         _this.paddingProperty = Thickness_1.Thickness.fromNumber(10);
         _this.viewportBorderProperty = {
@@ -649,8 +650,40 @@ var SciChartSurface = /** @class */ (function (_super) {
     SciChartSurface.prototype.onAnimate = function (timeElapsed) {
         if (timeElapsed) {
             this.renderableSeries.asArray().forEach(function (rs) { return rs.onAnimate(timeElapsed); });
+            // advance all animations in queue
+            var remainingAnimations = [];
+            for (var i = 0; i < this.animationList.length; i++) {
+                var animation = this.animationList[i];
+                if (!animation.isComplete) {
+                    animation.update(timeElapsed);
+                    if (!animation.isComplete) {
+                        // Request another draw to advance animation
+                        this.invalidateElement();
+                        remainingAnimations.push(animation);
+                    }
+                }
+            }
+            this.animationList = remainingAnimations;
         }
     };
+    /**
+     * Gets the generic animations currently on the surface. Do not manipulate this array directly.
+     * To add, use addAnimation.  To remove, find an animation and call .cancel() on it.
+     */
+    SciChartSurface.prototype.getAnimations = function () {
+        return this.animationList;
+    };
+    /**
+     * Add a {@link GenericAnimation} to the surface.
+     * Multiple animations will be run in parallel, so if you want to run one after another, use the onCompleted callback
+     * to add another animation after the first completes
+     */
+    SciChartSurface.prototype.addAnimation = function (animation) {
+        if (!animation)
+            return;
+        this.animationList.push(animation);
+        this.invalidateElement();
+    };
     Object.defineProperty(SciChartSurface.prototype, "isRunningAnimation", {
         /**
          * Returns true if an animation is running
@@ -661,7 +694,7 @@ var SciChartSurface = /** @class */ (function (_super) {
                     return true;
                 }
             }
-            return false;
+            return this.animationList.some(function (a) { return !a.isComplete; });
         },
         enumerable: false,
         configurable: true
@@ -779,22 +812,24 @@ var SciChartSurface = /** @class */ (function (_super) {
         this.webAssemblyContext2D.SCRTSetClearAlphaParams(enabled, alpha);
     };
     SciChartSurface.prototype.zoomExtentsYInternal = function (xRanges, animationDurationMs, easingFunction, onCompleted) {
+        var _this = this;
         if (animationDurationMs === void 0) { animationDurationMs = 0; }
         if (easingFunction === void 0) { easingFunction = EasingFunctions_1.easing.outExpo; }
         if (onCompleted === void 0) { onCompleted = function () { }; }
         this.yAxes.asArray().forEach(function (yAxis) {
             var yRange = yAxis.getWindowedYRange(xRanges);
-            yAxis.animateVisibleRange(yRange, animationDurationMs, easingFunction, onCompleted);
+            _this.addAnimation(yAxis.animateVisibleRange(yRange, animationDurationMs, easingFunction, onCompleted));
         });
     };
     SciChartSurface.prototype.zoomExtentsXInternal = function (animationDurationMs, easingFunction, onCompleted) {
+        var _this = this;
         if (animationDurationMs === void 0) { animationDurationMs = 0; }
         if (easingFunction === void 0) { easingFunction = EasingFunctions_1.easing.outExpo; }
         if (onCompleted === void 0) { onCompleted = function () { }; }
         var xRanges = new Dictionary_1.Dictionary();
         this.xAxes.asArray().forEach(function (xAxis) {
             var maxXRange = xAxis.getMaximumRange();
-            xAxis.animateVisibleRange(maxXRange, animationDurationMs, easingFunction, onCompleted);
+            _this.addAnimation(xAxis.animateVisibleRange(maxXRange, animationDurationMs, easingFunction, onCompleted));
             xRanges.add(xAxis.id, maxXRange);
         });
         return xRanges;

package/Charting3D/Visuals/SciChart3DRenderer.js

@@ -117,6 +117,7 @@ var SciChart3DRenderer = /** @class */ (function () {
         axis.forEach(function (el) {
             el.validateAxis();
             SciChart3DRenderer.tryPerformAutoRangeOn(el, _this.scs);
+            el.isMeasured = true;
         });
     };
     SciChart3DRenderer.prototype.updateWorldDimensions = function (sceneWorld, worldDimensions) {

package/Core/Animations/AnimationFiniteStateMachine.d.ts

@@ -1,6 +1,7 @@
-import { BaseAnimation } from "../../Charting/Visuals/RenderableSeries/Animations/BaseAnimation";
 import { BaseAnimationStyle } from "../../Charting/Visuals/RenderableSeries/Animations/BaseAnimationStyle";
+import { SeriesAnimation } from "../../Charting/Visuals/RenderableSeries/Animations/SeriesAnimation";
 import { IRenderableSeries } from "../../Charting/Visuals/RenderableSeries/IRenderableSeries";
+import { TEasingFn } from "./EasingFunctions";
 export declare enum EAnimationState {
     InitialState = "InitialState",
     Delayed = "Delayed",
@@ -15,15 +16,19 @@ export declare enum EAnimationStateTransition {
     Delayed_Running = "Delayed_Running",
     Running_Completed = "Running_Completed"
 }
+export interface IAnimation {
+    delay: number;
+    duration: number;
+    ease: TEasingFn;
+}
 export declare class AnimationFiniteStateMachine {
-    private readonly animationProperty;
-    private readonly initialStylesProperty;
-    private stateProperty;
-    private animationDelayStartTimestamp;
-    private animationDelayElapsed;
-    private animationStartTimestamp;
-    private animationElapsed;
-    constructor(animation: BaseAnimation, renderableSeries: IRenderableSeries);
+    protected readonly animationProperty: IAnimation;
+    protected stateProperty: EAnimationState;
+    protected animationDelayStartTimestamp: number;
+    protected animationDelayElapsed: number;
+    protected animationStartTimestamp: number;
+    protected animationElapsed: number;
+    constructor(animation: IAnimation);
     /**
      * Gets the current state
      */
@@ -31,11 +36,7 @@ export declare class AnimationFiniteStateMachine {
     /**
      * Gets the animation property
      */
-    get animation(): BaseAnimation;
-    /**
-     * Gets the initial styles for the animation
-     */
-    get initialStyles(): BaseAnimationStyle;
+    get animation(): IAnimation;
     /**
      * Checks the current state
      * @param states
@@ -60,3 +61,15 @@ export declare class AnimationFiniteStateMachine {
     private updateDelayedState;
     private updateRunningState;
 }
+export declare class SeriesAnimationFiniteStateMachine extends AnimationFiniteStateMachine {
+    private readonly initialStylesProperty;
+    constructor(animation: SeriesAnimation, renderableSeries: IRenderableSeries);
+    /**
+     * Gets the animation property
+     */
+    get animation(): SeriesAnimation;
+    /**
+     * Gets the initial styles for the animation
+     */
+    get initialStyles(): BaseAnimationStyle;
+}

package/Core/Animations/AnimationFiniteStateMachine.js

@@ -1,6 +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 (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        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.AnimationFiniteStateMachine = exports.EAnimationStateTransition = exports.EAnimationState = void 0;
+exports.SeriesAnimationFiniteStateMachine = exports.AnimationFiniteStateMachine = exports.EAnimationStateTransition = exports.EAnimationState = void 0;
 var NumberUtil_1 = require("../NumberUtil");
 var EAnimationState;
 (function (EAnimationState) {
@@ -19,12 +32,9 @@ var EAnimationStateTransition;
     EAnimationStateTransition["Running_Completed"] = "Running_Completed";
 })(EAnimationStateTransition = exports.EAnimationStateTransition || (exports.EAnimationStateTransition = {}));
 var AnimationFiniteStateMachine = /** @class */ (function () {
-    function AnimationFiniteStateMachine(animation, renderableSeries) {
+    function AnimationFiniteStateMachine(animation) {
         this.stateProperty = EAnimationState.InitialState;
         this.animationProperty = animation;
-        if (renderableSeries) {
-            this.initialStylesProperty = animation.getSeriesStyle(renderableSeries);
-        }
     }
     Object.defineProperty(AnimationFiniteStateMachine.prototype, "state", {
         /**
@@ -46,16 +56,6 @@ var AnimationFiniteStateMachine = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(AnimationFiniteStateMachine.prototype, "initialStyles", {
-        /**
-         * Gets the initial styles for the animation
-         */
-        get: function () {
-            return this.initialStylesProperty;
-        },
-        enumerable: false,
-        configurable: true
-    });
     /**
      * Checks the current state
      * @param states
@@ -147,3 +147,36 @@ var AnimationFiniteStateMachine = /** @class */ (function () {
     return AnimationFiniteStateMachine;
 }());
 exports.AnimationFiniteStateMachine = AnimationFiniteStateMachine;
+// tslint:disable-next-line: max-classes-per-file
+var SeriesAnimationFiniteStateMachine = /** @class */ (function (_super) {
+    __extends(SeriesAnimationFiniteStateMachine, _super);
+    function SeriesAnimationFiniteStateMachine(animation, renderableSeries) {
+        var _this = _super.call(this, animation) || this;
+        if (renderableSeries) {
+            _this.initialStylesProperty = animation.getSeriesStyle(renderableSeries);
+        }
+        return _this;
+    }
+    Object.defineProperty(SeriesAnimationFiniteStateMachine.prototype, "animation", {
+        /**
+         * Gets the animation property
+         */
+        get: function () {
+            return this.animationProperty;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(SeriesAnimationFiniteStateMachine.prototype, "initialStyles", {
+        /**
+         * Gets the initial styles for the animation
+         */
+        get: function () {
+            return this.initialStylesProperty;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    return SeriesAnimationFiniteStateMachine;
+}(AnimationFiniteStateMachine));
+exports.SeriesAnimationFiniteStateMachine = SeriesAnimationFiniteStateMachine;

package/Core/Animations/Animator.d.ts

@@ -1,14 +1,6 @@
 import { AnimationToken } from "../AnimationToken";
 import { TEasingFn } from "./EasingFunctions";
 /**
- * @description A generic function for animating any value
- * @remarks See functions {@link DoubleAnimator.animate} and {@link NumberRangeAnimator.animate} for examples on how to use this
- * @param durationMs The duration of the animation in milliseconds
- * @param from The start value
- * @param to The end value
- * @param onAnimate A function which is called on animation step, with the current intermediate value passed in
- * @param interpolate An interpolation function
- * @param onCompleted A function which is called when animation is completed
- * @param easingFn An easing function. See {@link IEasingMap} for a list of values
+ * @deprecated Instead create an {@link GenericAnimation} and pass it to sciChartSurface.addAnimation
  */
 export declare function animateAny<T>(durationMs: number, from: T, to: T, onAnimate: (intermediateValue: T) => void, interpolate: (start: T, end: T, interpolationFactor: number) => T, onCompleted: () => void, easingFn: TEasingFn): AnimationToken;