scichart 2.0.2127 → 2.0.2146

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/RenderableSeries/StackedColumnCollection.d.ts

@@ -69,6 +69,7 @@ export declare class StackedColumnCollection extends BaseStackedCollection<Stack
      * Creates an instance of the {@link StackedColumnCollection}
      * @param webAssemblyContext The {@link TSciChart | SciChart WebAssembly Context} containing
      * native methods and access to our WebGL2 WebAssembly Drawing Engine
+     * @param options Optional parameters of type {@link IStackedColumnCollectionOptions} to configure the series
      */
     constructor(webAssemblyContext: TSciChart, options?: IStackedColumnCollectionOptions);
     /** @inheritDoc */

package/Charting/Visuals/RenderableSeries/StackedColumnCollection.js

@@ -65,6 +65,7 @@ var StackedColumnCollection = /** @class */ (function (_super) {
      * Creates an instance of the {@link StackedColumnCollection}
      * @param webAssemblyContext The {@link TSciChart | SciChart WebAssembly Context} containing
      * native methods and access to our WebGL2 WebAssembly Drawing Engine
+     * @param options Optional parameters of type {@link IStackedColumnCollectionOptions} to configure the series
      */
     function StackedColumnCollection(webAssemblyContext, options) {
         var _a, _b;

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

@@ -89,6 +89,7 @@ export declare class StackedColumnRenderableSeries extends BaseStackedRenderable
      * Creates an instance of the {@link StackedColumnRenderableSeries}
      * @param webAssemblyContext The {@link TSciChart | SciChart WebAssembly Context} containing
      * native methods and access to our WebGL2 WebAssembly Drawing Engine
+     * @param options Optional parameters of type {@link IStackedColumnRenderableSeriesOptions} to configure the series
      */
     constructor(webAssemblyContext: TSciChart, options?: IStackedColumnRenderableSeriesOptions);
     /**

package/Charting/Visuals/RenderableSeries/StackedColumnRenderableSeries.js

@@ -66,6 +66,7 @@ var StackedColumnRenderableSeries = /** @class */ (function (_super) {
      * Creates an instance of the {@link StackedColumnRenderableSeries}
      * @param webAssemblyContext The {@link TSciChart | SciChart WebAssembly Context} containing
      * native methods and access to our WebGL2 WebAssembly Drawing Engine
+     * @param options Optional parameters of type {@link IStackedColumnRenderableSeriesOptions} to configure the series
      */
     function StackedColumnRenderableSeries(webAssemblyContext, options) {
         var _a, _b, _c, _d, _e;

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

@@ -38,6 +38,7 @@ export declare class StackedMountainCollection extends BaseStackedCollection<Sta
      * Creates an instance of the {@link StackedMountainCollection}
      * @param webAssemblyContext The {@link TSciChart | SciChart WebAssembly Context} containing
      * native methods and access to our WebGL2 WebAssembly Drawing Engine
+     * @param options Optional parameters of type {@link IBaseStackedCollectionOptions} to configure the
      */
     constructor(webAssemblyContext: TSciChart, options?: IBaseStackedCollectionOptions);
     /** @inheritDoc */

package/Charting/Visuals/RenderableSeries/StackedMountainCollection.js

@@ -50,6 +50,7 @@ var StackedMountainCollection = /** @class */ (function (_super) {
      * Creates an instance of the {@link StackedMountainCollection}
      * @param webAssemblyContext The {@link TSciChart | SciChart WebAssembly Context} containing
      * native methods and access to our WebGL2 WebAssembly Drawing Engine
+     * @param options Optional parameters of type {@link IBaseStackedCollectionOptions} to configure the
      */
     function StackedMountainCollection(webAssemblyContext, options) {
         var _this = _super.call(this, webAssemblyContext, options) || this;

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

@@ -55,6 +55,7 @@ export declare class StackedMountainRenderableSeries extends BaseStackedRenderab
      * Creates an instance of the {@link StackedMountainRenderableSeries}
      * @param webAssemblyContext The {@link TSciChart | SciChart WebAssembly Context} containing
      * native methods and access to our WebGL2 WebAssembly Drawing Engine
+     * @param options Optional parameters of type {@link IStackedMountainRenderableSeriesOptions} to configure the series
      */
     constructor(webAssemblyContext: TSciChart, options?: IStackedMountainRenderableSeriesOptions);
     /**

package/Charting/Visuals/RenderableSeries/StackedMountainRenderableSeries.js

@@ -52,6 +52,7 @@ var StackedMountainRenderableSeries = /** @class */ (function (_super) {
      * Creates an instance of the {@link StackedMountainRenderableSeries}
      * @param webAssemblyContext The {@link TSciChart | SciChart WebAssembly Context} containing
      * native methods and access to our WebGL2 WebAssembly Drawing Engine
+     * @param options Optional parameters of type {@link IStackedMountainRenderableSeriesOptions} to configure the series
      */
     function StackedMountainRenderableSeries(webAssemblyContext, options) {
         var _a, _b, _c;

package/Charting/Visuals/SciChartOverview.d.ts

@@ -3,18 +3,21 @@ import { OverviewRangeSelectionModifier } from "../ChartModifiers/OverviewRangeS
 import { IThemeable } from "../Themes/IThemeable";
 import { IThemeProvider } from "../Themes/IThemeProvider";
 import { AxisBase2D } from "./Axis/AxisBase2D";
+import { INumericAxisOptions } from "./Axis/NumericAxis";
+import { I2DSurfaceOptions } from "./I2DSurfaceOptions";
 import { IRenderableSeries } from "./RenderableSeries/IRenderableSeries";
 import { SciChartSurface } from "./SciChartSurface";
 /**
  * Options for passing to the {@link SciChartOverview.create} method
  */
-export interface IOverviewOptions {
+export interface IOverviewOptions extends I2DSurfaceOptions {
     mainAxisId?: string;
     secondaryAxisId?: string;
     customRangeSelectionModifier?: OverviewRangeSelectionModifier;
     rangeSelectionAnnotationSvgString?: string;
     transformRenderableSeries?: (renderableSeries: IRenderableSeries) => IRenderableSeries;
-    theme?: IThemeProvider;
+    overviewXAxisOptions?: INumericAxisOptions;
+    overviewYAxisOptions?: INumericAxisOptions;
 }
 /**
  * @summary The {@link SciChartOverview} is the component that can control the visible range of the parent {@link SciChartSurface} using a slider

package/Charting/Visuals/SciChartOverview.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -42,6 +53,7 @@ var NumberRange_1 = require("../../Core/NumberRange");
 var AutoRange_1 = require("../../types/AutoRange");
 var OverviewRangeSelectionModifier_1 = require("../ChartModifiers/OverviewRangeSelectionModifier");
 var AxisBase2D_1 = require("./Axis/AxisBase2D");
+var CategoryAxis_1 = require("./Axis/CategoryAxis");
 var NumericAxis_1 = require("./Axis/NumericAxis");
 var SciChartSurface_1 = require("./SciChartSurface");
 /**
@@ -76,9 +88,6 @@ var SciChartOverview = /** @class */ (function () {
                     case 0: return [4 /*yield*/, createSciChartOverview(parentChart, overviewRootElementId, options)];
                     case 1:
                         _a = _b.sent(), sciChartSurface = _a.sciChartSurface, wasmContext = _a.wasmContext, rangeSelectionModifier = _a.rangeSelectionModifier, xAxis = _a.xAxis, yAxis = _a.yAxis;
-                        if (options === null || options === void 0 ? void 0 : options.theme) {
-                            sciChartSurface.applyTheme(options === null || options === void 0 ? void 0 : options.theme);
-                        }
                         return [2 /*return*/, new SciChartOverview(parentChart, sciChartSurface, wasmContext, rangeSelectionModifier, xAxis, yAxis)];
                 }
             });
@@ -148,12 +157,12 @@ var SciChartOverview = /** @class */ (function () {
 exports.SciChartOverview = SciChartOverview;
 /** @ignore */
 var createSciChartOverview = function (originalSciChartSurface, overviewRootElementId, options) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, wasmContext, sciChartSurface, mainAxisId, secondaryAxisId, originalMainAxis, originalSecondaryAxis, originalXAxis, originalYAxis, xAxis, yAxis, mainOverviewAxis, defaultTransform, renderableSeries, rangeSelectionModifier;
+    var _a, wasmContext, sciChartSurface, mainAxisId, secondaryAxisId, originalMainAxis, originalSecondaryAxis, originalXAxis, originalYAxis, xAxisOptions, yAxisOptions, xAxis, yAxis, mainOverviewAxis, defaultTransform, renderableSeries, rangeSelectionModifier;
     var _b;
     var _c, _d, _e, _f;
     return __generator(this, function (_g) {
         switch (_g.label) {
-            case 0: return [4 /*yield*/, SciChartSurface_1.SciChartSurface.create(overviewRootElementId)];
+            case 0: return [4 /*yield*/, SciChartSurface_1.SciChartSurface.create(overviewRootElementId, options)];
             case 1:
                 _a = _g.sent(), wasmContext = _a.wasmContext, sciChartSurface = _a.sciChartSurface;
                 mainAxisId = (_c = options === null || options === void 0 ? void 0 : options.mainAxisId) !== null && _c !== void 0 ? _c : AxisBase2D_1.AxisBase2D.DEFAULT_AXIS_ID;
@@ -168,16 +177,14 @@ var createSciChartOverview = function (originalSciChartSurface, overviewRootElem
                         (!(options === null || options === void 0 ? void 0 : options.secondaryAxisId) ? "Please specify secondaryAxisId in the options" : ""));
                 originalXAxis = originalMainAxis.isXAxis ? originalMainAxis : originalSecondaryAxis;
                 originalYAxis = originalMainAxis.isXAxis ? originalSecondaryAxis : originalMainAxis;
-                xAxis = new NumericAxis_1.NumericAxis(wasmContext, {
-                    axisAlignment: originalXAxis.axisAlignment,
-                    isVisible: false,
-                    autoRange: AutoRange_1.EAutoRange.Always
-                });
-                yAxis = new NumericAxis_1.NumericAxis(wasmContext, {
-                    axisAlignment: originalYAxis.axisAlignment,
-                    isVisible: false,
-                    autoRange: AutoRange_1.EAutoRange.Always
-                });
+                xAxisOptions = __assign({ axisAlignment: originalXAxis.axisAlignment, isVisible: false, autoRange: AutoRange_1.EAutoRange.Always }, options === null || options === void 0 ? void 0 : options.overviewXAxisOptions);
+                yAxisOptions = __assign({ axisAlignment: originalYAxis.axisAlignment, isVisible: false, autoRange: AutoRange_1.EAutoRange.Always }, options === null || options === void 0 ? void 0 : options.overviewYAxisOptions);
+                xAxis = originalXAxis.isCategoryAxis
+                    ? new CategoryAxis_1.CategoryAxis(wasmContext, xAxisOptions)
+                    : new NumericAxis_1.NumericAxis(wasmContext, xAxisOptions);
+                yAxis = originalYAxis.isCategoryAxis
+                    ? new CategoryAxis_1.CategoryAxis(wasmContext, yAxisOptions)
+                    : new NumericAxis_1.NumericAxis(wasmContext, yAxisOptions);
                 mainOverviewAxis = originalMainAxis.isXAxis ? xAxis : yAxis;
                 defaultTransform = function (rendSeries) {
                     // return undefined to skip
@@ -200,6 +207,8 @@ var createSciChartOverview = function (originalSciChartSurface, overviewRootElem
                 (_b = sciChartSurface.renderableSeries).add.apply(_b, renderableSeries);
                 sciChartSurface.zoomExtents();
                 rangeSelectionModifier = (_f = options === null || options === void 0 ? void 0 : options.customRangeSelectionModifier) !== null && _f !== void 0 ? _f : new OverviewRangeSelectionModifier_1.OverviewRangeSelectionModifier();
+                rangeSelectionModifier.xAxisId = xAxis.id;
+                rangeSelectionModifier.yAxisId = yAxis.id;
                 rangeSelectionModifier.onSelectedAreaChanged = function (selectedRange) {
                     if (!selectedRange.equals(originalMainAxis.visibleRange)) {
                         originalMainAxis.visibleRange = selectedRange;

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;

package/Core/Animations/Animator.js

@@ -5,15 +5,7 @@ var AnimationToken_1 = require("../AnimationToken");
 var Guard_1 = require("../Guard");
 var NumberUtil_1 = require("../NumberUtil");
 /**
- * @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
  */
 function animateAny(durationMs, from, to, onAnimate, interpolate, onCompleted, easingFn) {
     Guard_1.Guard.notNull(onAnimate, "onAnimate");