scichart 2.2.2417 → 3.0.0-beta.224

package/Builder/buildDataSeries.d.ts

@@ -8,9 +8,11 @@ import { IXyyScaleOffsetFilterOptions } from "../Charting/Model/Filters/XyyScale
 import { IXyzScaleOffsetFilterOptions } from "../Charting/Model/Filters/XyzScaleOffsetFilter";
 import { IHlcDataSeriesOptions } from "../Charting/Model/HlcDataSeries";
 import { IDataSeries } from "../Charting/Model/IDataSeries";
+import { INonUniformHeatmapSeriesOptions } from "../Charting/Model/NonUniformHeatmapDataSeries";
 import { IOhlcDataSeriesOptions } from "../Charting/Model/OhlcDataSeries";
 import { IUniformHeatmapSeriesOptions } from "../Charting/Model/UniformHeatmapDataSeries";
 import { IXyDataSeriesOptions } from "../Charting/Model/XyDataSeries";
+import { IXyTextDataSeriesOptions } from "../Charting/Model/XyTextDataSeries";
 import { IXyyDataSeriesOptions } from "../Charting/Model/XyyDataSeries";
 import { IXyzDataSeriesOptions } from "../Charting/Model/XyzDataSeries";
 import { EDataFilterType } from "../types/DataFilterType";
@@ -118,8 +120,21 @@ export declare type THlcSeriesData = {
 } & IHlcDataSeriesOptions & {
     filter?: TFilterDefinition;
 };
+/** Definition of XYText data */
+export declare type TXyTextSeriesData = {
+    /** The id of sharedData to use for X data.
+     * You must either specify all of xDataId, yDataId and textValues, or all of xValues, yValues and textValues
+     */
+    xDataId?: number | string;
+    /** The id of sharedData to use for Y data.
+     * You must either specify all of xDataId, yDataId and textValues, or all of xValues, yValues and textValues
+     */
+    yDataId?: number | string;
+} & IXyTextDataSeriesOptions & {
+    filter?: TFilterDefinition;
+};
 /** Definition of series data, which can take various shapes */
-export declare type TSeriesDataDefinition = TXySeriesData | TXyySeriesData | TXyzSeriesData | THlcSeriesData | TOhlcSeriesData | IUniformHeatmapSeriesOptions;
+export declare type TSeriesDataDefinition = TXySeriesData | TXyySeriesData | TXyzSeriesData | THlcSeriesData | TOhlcSeriesData | TXyTextSeriesData | IUniformHeatmapSeriesOptions | INonUniformHeatmapSeriesOptions;
 /**
  * Build a data series from a definition that can be pure data.
  * @param wasmContext A {@link TSciChart | SciChart 2D WebAssembly Context} or {@link TSciChart | SciChart 3D WebAssembly Context}

package/Builder/buildDataSeries.js

@@ -21,12 +21,15 @@ var XyScaleOffsetFilter_1 = require("../Charting/Model/Filters/XyScaleOffsetFilt
 var XyyScaleOffsetFilter_1 = require("../Charting/Model/Filters/XyyScaleOffsetFilter");
 var XyzScaleOffsetFilter_1 = require("../Charting/Model/Filters/XyzScaleOffsetFilter");
 var HlcDataSeries_1 = require("../Charting/Model/HlcDataSeries");
+var NonUniformHeatmapDataSeries_1 = require("../Charting/Model/NonUniformHeatmapDataSeries");
 var OhlcDataSeries_1 = require("../Charting/Model/OhlcDataSeries");
 var UniformHeatmapDataSeries_1 = require("../Charting/Model/UniformHeatmapDataSeries");
 var XyDataSeries_1 = require("../Charting/Model/XyDataSeries");
+var XyTextDataSeries_1 = require("../Charting/Model/XyTextDataSeries");
 var XyyDataSeries_1 = require("../Charting/Model/XyyDataSeries");
 var XyzDataSeries_1 = require("../Charting/Model/XyzDataSeries");
 var DataFilterType_1 = require("../types/DataFilterType");
+var SeriesType_1 = require("../types/SeriesType");
 var chartBuilder_1 = require("./chartBuilder");
 function hasOwnProperty(obj, prop) {
     return obj.hasOwnProperty(prop);
@@ -91,6 +94,20 @@ var buildDataSeries = function (wasmContext, seriesDefinition, sharedData) {
             filterDef = data.filter;
         }
     }
+    else if (hasOwnProperty(seriesDefinition, "xyTextData")) {
+        var data = seriesDefinition.xyTextData;
+        if (sharedData && data.xDataId) {
+            var xValues = sharedData[data.xDataId];
+            var yValues = sharedData[data.yDataId];
+            dataSeries = new XyTextDataSeries_1.XyTextDataSeries(wasmContext, __assign({ xValues: xValues, yValues: yValues }, data));
+        }
+        else {
+            dataSeries = new XyTextDataSeries_1.XyTextDataSeries(wasmContext, data);
+        }
+        if (hasOwnProperty(data, "filter")) {
+            filterDef = data.filter;
+        }
+    }
     else if (hasOwnProperty(seriesDefinition, "hlcData")) {
         var data = seriesDefinition.hlcData;
         if (sharedData && data.xDataId) {
@@ -124,9 +141,15 @@ var buildDataSeries = function (wasmContext, seriesDefinition, sharedData) {
             filterDef = data.filter;
         }
     }
-    else if (hasOwnProperty(seriesDefinition, "heatmapData")) {
+    else if (hasOwnProperty(seriesDefinition, "heatmapData") &&
+        (seriesDefinition.type === SeriesType_1.ESeriesType.UniformHeatmapSeries ||
+            seriesDefinition.type === SeriesType_1.ESeriesType.UniformContoursSeries)) {
         dataSeries = new UniformHeatmapDataSeries_1.UniformHeatmapDataSeries(wasmContext, seriesDefinition.heatmapData);
     }
+    else if (hasOwnProperty(seriesDefinition, "heatmapData") &&
+        seriesDefinition.type === SeriesType_1.ESeriesType.NonUniformHeatmapSeries) {
+        dataSeries = new NonUniformHeatmapDataSeries_1.NonUniformHeatmapDataSeries(wasmContext, seriesDefinition.heatmapData);
+    }
     if (filterDef) {
         if ("dataSeries" in seriesDefinition.options) {
             dataSeries = seriesDefinition.options.dataSeries;

package/Builder/buildSeries.d.ts

@@ -1,5 +1,7 @@
 import { ISelectedPointOptions } from "../Charting/Model/DataPointSelectionPaletteProvider";
+import { INonUniformHeatmapSeriesOptions } from "../Charting/Model/NonUniformHeatmapDataSeries";
 import { IUniformHeatmapSeriesOptions } from "../Charting/Model/UniformHeatmapDataSeries";
+import { IXyTextDataSeriesOptions } from "../Charting/Model/XyTextDataSeries";
 import { IPointMarkerOptions } from "../Charting/Visuals/PointMarkers/BasePointMarker";
 import { ISpritePointMarkerOptions } from "../Charting/Visuals/PointMarkers/SpritePointMarker";
 import { IFadeAnimationOptions } from "../Charting/Visuals/RenderableSeries/Animations/FadeAnimation";
@@ -7,17 +9,29 @@ import { IScaleAnimationOptions } from "../Charting/Visuals/RenderableSeries/Ani
 import { IBaseAnimationOptions } from "../Charting/Visuals/RenderableSeries/Animations/SeriesAnimation";
 import { ISweepAnimationOptions } from "../Charting/Visuals/RenderableSeries/Animations/SweepAnimation";
 import { IWaveAnimationOptions } from "../Charting/Visuals/RenderableSeries/Animations/WaveAnimation";
+import { IHeatmapRenderableSeriesOptions } from "../Charting/Visuals/RenderableSeries/BaseHeatmapRenderableSeries";
 import { IBaseStackedCollectionOptions } from "../Charting/Visuals/RenderableSeries/BaseStackedCollection";
+import { IBandSeriesDataLabelProviderOptions } from "../Charting/Visuals/RenderableSeries/DataLabels/BandSeriesDataLabelProvider";
+import { IBaseDataLabelProviderOptions } from "../Charting/Visuals/RenderableSeries/DataLabels/BaseDataLabelProvider";
+import { IBubbleSeriesDataLabelProviderOptions } from "../Charting/Visuals/RenderableSeries/DataLabels/BubbleSeriesDataLabelProvider";
+import { IColumnSeriesDataLabelProviderOptions } from "../Charting/Visuals/RenderableSeries/DataLabels/ColumnSeriesDataLabelProvider";
+import { IContoursDataLabelProviderOptions } from "../Charting/Visuals/RenderableSeries/DataLabels/ContoursDataLabelProvider";
+import { IDataLabelProviderOptions } from "../Charting/Visuals/RenderableSeries/DataLabels/DataLabelProvider";
+import { IHeatmapDataLabelProviderOptions } from "../Charting/Visuals/RenderableSeries/DataLabels/HeatMapDataLabelProvider";
+import { ILineSeriesDataLabelProviderOptions } from "../Charting/Visuals/RenderableSeries/DataLabels/LineSeriesDataLabelProvider";
 import { IBandRenderableSeriesOptions } from "../Charting/Visuals/RenderableSeries/FastBandRenderableSeries";
 import { IBubbleRenderableSeriesOptions } from "../Charting/Visuals/RenderableSeries/FastBubbleRenderableSeries";
 import { ICandlestickRenderableSeriesOptions } from "../Charting/Visuals/RenderableSeries/FastCandlestickRenderableSeries";
 import { IColumnRenderableSeriesOptions } from "../Charting/Visuals/RenderableSeries/FastColumnRenderableSeries";
 import { IFastErrorBarsRenderableSeriesOptions } from "../Charting/Visuals/RenderableSeries/FastErrorBarsRenderableSeries";
+import { IImpulseRenderableSeries } from "../Charting/Visuals/RenderableSeries/FastImpulseRenderableSeries";
 import { IFastLineRenderableSeriesOptions } from "../Charting/Visuals/RenderableSeries/FastLineRenderableSeries";
 import { IMountainRenderableSeriesOptions } from "../Charting/Visuals/RenderableSeries/FastMountainRenderableSeries";
 import { IOhlcRenderableSeriesOptions } from "../Charting/Visuals/RenderableSeries/FastOhlcRenderableSeries";
 import { IGlowEffectOptions } from "../Charting/Visuals/RenderableSeries/GlowEffect";
+import { IBaseRenderableSeriesOptions } from "../Charting/Visuals/RenderableSeries/IBaseRenderableSeriesOptions";
 import { IRenderableSeries } from "../Charting/Visuals/RenderableSeries/IRenderableSeries";
+import { INonUniformHeatmapRenderableSeriesOptions } from "../Charting/Visuals/RenderableSeries/NonUniformHeatmapRenderableSeries";
 import { IShadowEffectOptions } from "../Charting/Visuals/RenderableSeries/ShadowEffect";
 import { ISplineBandRenderableSeriesOptions } from "../Charting/Visuals/RenderableSeries/SplineBandRenderableSeries";
 import { ISplineLineRenderableSeriesOptions } from "../Charting/Visuals/RenderableSeries/SplineLineRenderableSeries";
@@ -26,17 +40,16 @@ import { IStackedColumnCollectionOptions } from "../Charting/Visuals/RenderableS
 import { IStackedColumnRenderableSeriesOptions } from "../Charting/Visuals/RenderableSeries/StackedColumnRenderableSeries";
 import { IStackedMountainRenderableSeriesOptions } from "../Charting/Visuals/RenderableSeries/StackedMountainRenderableSeries";
 import { IContoursRenderableSeriesOptions } from "../Charting/Visuals/RenderableSeries/UniformContoursRenderableSeries";
-import { IHeatmapRenderableSeriesOptions } from "../Charting/Visuals/RenderableSeries/UniformHeatmapRenderableSeries";
 import { IXyScatterRenderableSeriesOptions } from "../Charting/Visuals/RenderableSeries/XyScatterRenderableSeries";
 import { GradientParams } from "../Core/GradientParams";
 import { EAnimationType } from "../types/AnimationType";
+import { EDataLabelProviderType } from "../types/DataLabelProviderType";
 import { EPaletteProviderType } from "../types/PaletteProviderType";
 import { EPointMarkerType } from "../types/PointMarkerType";
 import { ESeriesType } from "../types/SeriesType";
 import { EShaderEffectType } from "../types/ShaderEffectType";
 import { TSciChart } from "../types/TSciChart";
-import { THlcSeriesData, TOhlcSeriesData, TSharedDataDefinition, TXySeriesData, TXyySeriesData, TXyzSeriesData } from "./buildDataSeries";
-import { IImpulseRenderableSeries } from "../Charting/Visuals/RenderableSeries/FastImpulseRenderableSeries";
+import { THlcSeriesData, TOhlcSeriesData, TSharedDataDefinition, TXySeriesData, TXyTextSeriesData, TXyySeriesData, TXyzSeriesData } from "./buildDataSeries";
 /** Definition of a pointmarker, comprising a {@link EPointMarkerType} and the relevant options */
 export declare type TPointMarkerDefinition = {
     type: EPointMarkerType.Cross;
@@ -99,6 +112,38 @@ export declare type TAnimationDefinition = {
     customType?: string;
     options?: IBaseAnimationOptions;
 };
+export declare type TDataLabelProviderDefinition = {
+    type: EDataLabelProviderType.Default;
+    options?: IDataLabelProviderOptions;
+} | {
+    type: EDataLabelProviderType.Line;
+    options?: ILineSeriesDataLabelProviderOptions;
+} | {
+    type: EDataLabelProviderType.Column;
+    options?: IColumnSeriesDataLabelProviderOptions;
+} | {
+    type: EDataLabelProviderType.Text;
+    options?: IBaseDataLabelProviderOptions;
+} | {
+    type: EDataLabelProviderType.Heatmap;
+    options?: IHeatmapDataLabelProviderOptions;
+} | {
+    type: EDataLabelProviderType.Contours;
+    options?: IContoursDataLabelProviderOptions;
+} | {
+    type: EDataLabelProviderType.Band;
+    options?: IBandSeriesDataLabelProviderOptions;
+} | {
+    type: EDataLabelProviderType.Bubble;
+    options?: IBubbleSeriesDataLabelProviderOptions;
+} | {
+    type: EDataLabelProviderType.NonUniformHeatmap;
+    options?: IHeatmapDataLabelProviderOptions;
+} | {
+    type: EDataLabelProviderType.Custom;
+    customType: string;
+    options?: IBaseDataLabelProviderOptions;
+};
 /**
  * Definition of a renderable series, comprising a {@link ESeriesType}, the relevant options,
  * and an optional data object whose type depends on the series type
@@ -143,6 +188,10 @@ export declare type TSeriesDefinition = {
     type: ESeriesType.ScatterSeries;
     options?: IXyScatterRenderableSeriesOptions;
     xyData?: TXySeriesData;
+} | {
+    type: ESeriesType.TextSeries;
+    options?: IXyTextDataSeriesOptions;
+    xyTextData?: TXyTextSeriesData;
 } | {
     type: ESeriesType.SplineBandSeries;
     options?: ISplineBandRenderableSeriesOptions;
@@ -159,6 +208,10 @@ export declare type TSeriesDefinition = {
     type: ESeriesType.UniformHeatmapSeries;
     options?: IHeatmapRenderableSeriesOptions;
     heatmapData?: IUniformHeatmapSeriesOptions;
+} | {
+    type: ESeriesType.NonUniformHeatmapSeries;
+    options?: INonUniformHeatmapRenderableSeriesOptions;
+    heatmapData?: INonUniformHeatmapSeriesOptions;
 } | {
     type: ESeriesType.UniformContoursSeries;
     options?: IContoursRenderableSeriesOptions;
@@ -179,6 +232,10 @@ export declare type TSeriesDefinition = {
     type: ESeriesType.StackedMountainCollection;
     options?: IBaseStackedCollectionOptions;
     series?: TSeriesDefinition[];
+} | {
+    type: ESeriesType.Custom;
+    customType?: string;
+    options?: IBaseRenderableSeriesOptions;
 };
 /**
  * Build one or more renderable series from a definition that can be pure data.

package/Builder/buildSeries.js

@@ -14,15 +14,27 @@ var FadeAnimation_1 = require("../Charting/Visuals/RenderableSeries/Animations/F
 var ScaleAnimation_1 = require("../Charting/Visuals/RenderableSeries/Animations/ScaleAnimation");
 var SweepAnimation_1 = require("../Charting/Visuals/RenderableSeries/Animations/SweepAnimation");
 var WaveAnimation_1 = require("../Charting/Visuals/RenderableSeries/Animations/WaveAnimation");
+var BandSeriesDataLabelProvider_1 = require("../Charting/Visuals/RenderableSeries/DataLabels/BandSeriesDataLabelProvider");
+var BubbleSeriesDataLabelProvider_1 = require("../Charting/Visuals/RenderableSeries/DataLabels/BubbleSeriesDataLabelProvider");
+var ColumnSeriesDataLabelProvider_1 = require("../Charting/Visuals/RenderableSeries/DataLabels/ColumnSeriesDataLabelProvider");
+var ContoursDataLabelProvider_1 = require("../Charting/Visuals/RenderableSeries/DataLabels/ContoursDataLabelProvider");
+var DataLabelProvider_1 = require("../Charting/Visuals/RenderableSeries/DataLabels/DataLabelProvider");
+var HeatMapDataLabelProvider_1 = require("../Charting/Visuals/RenderableSeries/DataLabels/HeatMapDataLabelProvider");
+var LineSeriesDataLabelProvider_1 = require("../Charting/Visuals/RenderableSeries/DataLabels/LineSeriesDataLabelProvider");
+var NonUniformHeatmapDataLabelProvider_1 = require("../Charting/Visuals/RenderableSeries/DataLabels/NonUniformHeatmapDataLabelProvider");
+var TextDataLabelProvider_1 = require("../Charting/Visuals/RenderableSeries/DataLabels/TextDataLabelProvider");
 var FastBandRenderableSeries_1 = require("../Charting/Visuals/RenderableSeries/FastBandRenderableSeries");
 var FastBubbleRenderableSeries_1 = require("../Charting/Visuals/RenderableSeries/FastBubbleRenderableSeries");
 var FastCandlestickRenderableSeries_1 = require("../Charting/Visuals/RenderableSeries/FastCandlestickRenderableSeries");
 var FastColumnRenderableSeries_1 = require("../Charting/Visuals/RenderableSeries/FastColumnRenderableSeries");
 var FastErrorBarsRenderableSeries_1 = require("../Charting/Visuals/RenderableSeries/FastErrorBarsRenderableSeries");
+var FastImpulseRenderableSeries_1 = require("../Charting/Visuals/RenderableSeries/FastImpulseRenderableSeries");
 var FastLineRenderableSeries_1 = require("../Charting/Visuals/RenderableSeries/FastLineRenderableSeries");
 var FastMountainRenderableSeries_1 = require("../Charting/Visuals/RenderableSeries/FastMountainRenderableSeries");
 var FastOhlcRenderableSeries_1 = require("../Charting/Visuals/RenderableSeries/FastOhlcRenderableSeries");
+var FastTextRenderableSeries_1 = require("../Charting/Visuals/RenderableSeries/FastTextRenderableSeries");
 var GlowEffect_1 = require("../Charting/Visuals/RenderableSeries/GlowEffect");
+var NonUniformHeatmapRenderableSeries_1 = require("../Charting/Visuals/RenderableSeries/NonUniformHeatmapRenderableSeries");
 var ShadowEffect_1 = require("../Charting/Visuals/RenderableSeries/ShadowEffect");
 var SplineBandRenderableSeries_1 = require("../Charting/Visuals/RenderableSeries/SplineBandRenderableSeries");
 var SplineLineRenderableSeries_1 = require("../Charting/Visuals/RenderableSeries/SplineLineRenderableSeries");
@@ -36,6 +48,7 @@ var UniformHeatmapRenderableSeries_1 = require("../Charting/Visuals/RenderableSe
 var XyScatterRenderableSeries_1 = require("../Charting/Visuals/RenderableSeries/XyScatterRenderableSeries");
 var AnimationType_1 = require("../types/AnimationType");
 var BaseType_1 = require("../types/BaseType");
+var DataLabelProviderType_1 = require("../types/DataLabelProviderType");
 var PaletteProviderType_1 = require("../types/PaletteProviderType");
 var PointMarkerType_1 = require("../types/PointMarkerType");
 var SeriesType_1 = require("../types/SeriesType");
@@ -43,7 +56,6 @@ var ShaderEffectType_1 = require("../types/ShaderEffectType");
 var buildDataSeries_1 = require("./buildDataSeries");
 var chartBuilder_1 = require("./chartBuilder");
 var classFactory_1 = require("./classFactory");
-var FastImpulseRenderableSeries_1 = require("../Charting/Visuals/RenderableSeries/FastImpulseRenderableSeries");
 (0, classFactory_1.registerWasmType)(BaseType_1.EBaseType.PointMarker, PointMarkerType_1.EPointMarkerType.Cross, function (wasm, options) { return new CrossPointMarker_1.CrossPointMarker(wasm, options); }, true);
 (0, classFactory_1.registerWasmType)(BaseType_1.EBaseType.PointMarker, PointMarkerType_1.EPointMarkerType.Ellipse, function (wasm, options) { return new EllipsePointMarker_1.EllipsePointMarker(wasm, options); }, true);
 (0, classFactory_1.registerWasmType)(BaseType_1.EBaseType.PointMarker, PointMarkerType_1.EPointMarkerType.Sprite, function (wasm, options) { return new SpritePointMarker_1.SpritePointMarker(wasm, options); }, true);
@@ -56,6 +68,15 @@ var FastImpulseRenderableSeries_1 = require("../Charting/Visuals/RenderableSerie
 (0, classFactory_1.registerType)(BaseType_1.EBaseType.Animation, AnimationType_1.EAnimationType.Scale, function (options) { return new ScaleAnimation_1.ScaleAnimation(options); }, true);
 (0, classFactory_1.registerType)(BaseType_1.EBaseType.Animation, AnimationType_1.EAnimationType.Sweep, function (options) { return new SweepAnimation_1.SweepAnimation(options); }, true);
 (0, classFactory_1.registerType)(BaseType_1.EBaseType.Animation, AnimationType_1.EAnimationType.Wave, function (options) { return new WaveAnimation_1.WaveAnimation(options); }, true);
+(0, classFactory_1.registerType)(BaseType_1.EBaseType.DataLabelProvider, DataLabelProviderType_1.EDataLabelProviderType.Default, function (options) { return new DataLabelProvider_1.DataLabelProvider(options); }, true);
+(0, classFactory_1.registerType)(BaseType_1.EBaseType.DataLabelProvider, DataLabelProviderType_1.EDataLabelProviderType.Line, function (options) { return new LineSeriesDataLabelProvider_1.LineSeriesDataLabelProvider(options); }, true);
+(0, classFactory_1.registerType)(BaseType_1.EBaseType.DataLabelProvider, DataLabelProviderType_1.EDataLabelProviderType.Column, function (options) { return new ColumnSeriesDataLabelProvider_1.ColumnSeriesDataLabelProvider(options); }, true);
+(0, classFactory_1.registerType)(BaseType_1.EBaseType.DataLabelProvider, DataLabelProviderType_1.EDataLabelProviderType.Text, function (options) { return new TextDataLabelProvider_1.TextDataLabelProvider(options); }, true);
+(0, classFactory_1.registerType)(BaseType_1.EBaseType.DataLabelProvider, DataLabelProviderType_1.EDataLabelProviderType.Heatmap, function (options) { return new HeatMapDataLabelProvider_1.HeatMapDataLabelProvider(options); }, true);
+(0, classFactory_1.registerType)(BaseType_1.EBaseType.DataLabelProvider, DataLabelProviderType_1.EDataLabelProviderType.NonUniformHeatmap, function (options) { return new NonUniformHeatmapDataLabelProvider_1.NonUniformHeatMapDataLabelProvider(options); }, true);
+(0, classFactory_1.registerType)(BaseType_1.EBaseType.DataLabelProvider, DataLabelProviderType_1.EDataLabelProviderType.Bubble, function (options) { return new BubbleSeriesDataLabelProvider_1.BubbleSeriesDataLabelProvider(options); }, true);
+(0, classFactory_1.registerType)(BaseType_1.EBaseType.DataLabelProvider, DataLabelProviderType_1.EDataLabelProviderType.Band, function (options) { return new BandSeriesDataLabelProvider_1.BandSeriesDataLabelProvider(options); }, true);
+(0, classFactory_1.registerType)(BaseType_1.EBaseType.DataLabelProvider, DataLabelProviderType_1.EDataLabelProviderType.Contours, function (options) { return new ContoursDataLabelProvider_1.ContoursDataLabelProvider(options); }, true);
 // Metadata
 (0, classFactory_1.registerType)(BaseType_1.EBaseType.MetadataGenerator, "Template", function (template) { return new IPointMetadata_1.TemplateMetadataGenerator(template); }, true);
 // PaletteProviders
@@ -125,9 +146,15 @@ var buildSeries = function (wasmContext, definition, sharedData) {
         else if (seriesDef.type === SeriesType_1.ESeriesType.UniformHeatmapSeries) {
             series = new UniformHeatmapRenderableSeries_1.UniformHeatmapRenderableSeries(wasmContext, seriesDef.options);
         }
+        else if (seriesDef.type === SeriesType_1.ESeriesType.NonUniformHeatmapSeries) {
+            series = new NonUniformHeatmapRenderableSeries_1.NonUniformHeatmapRenderableSeries(wasmContext, seriesDef.options);
+        }
         else if (seriesDef.type === SeriesType_1.ESeriesType.UniformContoursSeries) {
             series = new UniformContoursRenderableSeries_1.UniformContoursRenderableSeries(wasmContext, seriesDef.options);
         }
+        else if (seriesDef.type === SeriesType_1.ESeriesType.TextSeries) {
+            series = new FastTextRenderableSeries_1.FastTextRenderableSeries(wasmContext, seriesDef.options);
+        }
         else if (seriesDef.type === SeriesType_1.ESeriesType.StackedColumnSeries) {
             series = new StackedColumnRenderableSeries_1.StackedColumnRenderableSeries(wasmContext, seriesDef.options);
         }

package/Builder/buildSurface.d.ts

@@ -1,11 +1,12 @@
 import { ICentralAxesLayoutManagerOptions } from "../Charting/LayoutManager/CentralAxesLayoutManager";
 import { ILayoutManagerOptions } from "../Charting/LayoutManager/LayoutManager";
-import { I2DSurfaceOptions } from "../Charting/Visuals/I2DSurfaceOptions";
+import { I2DSubSurfaceOptions, I2DSurfaceOptions } from "../Charting/Visuals/I2DSurfaceOptions";
 import { IPieSurfaceOptions } from "../Charting/Visuals/SciChartPieSurface/IPieSurfaceOptions";
 import { IPieSegmentOptions } from "../Charting/Visuals/SciChartPieSurface/PieSegment/PieSegment";
 import { SciChartPieSurface } from "../Charting/Visuals/SciChartPieSurface/SciChartPieSurface";
 import { SciChartSurface } from "../Charting/Visuals/SciChartSurface";
 import { ELayoutManagerType } from "../types/LayoutMangerType";
+import { TSciChart } from "../types/TSciChart";
 import { TAnnotationDefinition } from "./buildAnnotations";
 import { TAxisDefinition } from "./buildAxis";
 import { TSharedDataDefinition } from "./buildDataSeries";
@@ -34,6 +35,30 @@ export interface ISciChart2DDefinition {
      * receiving the sciChartSurface as a parameter
      */
     onCreated?: ((surface: SciChartSurface) => void) | string;
+    /**
+     * Subcharts to be added to this surface
+     */
+    subCharts?: ISubChartDefinition[];
+    /**
+     * Whether to create this chart using a dedicated webassembly context.  See {@link SciChartSurface.createSingle}
+     */
+    createSingle?: boolean;
+}
+export interface ISubChartDefinition {
+    /** Optional {@link I2DSubSurfaceOptions} to pass to the subSurface */
+    surface?: I2DSubSurfaceOptions;
+    /** One or an array of {@link TAxisDefinition} to describe the X Axes.  Defaults to a single numeric axis */
+    xAxes?: TAxisDefinition[] | TAxisDefinition;
+    /** One or an array of {@link TAxisDefinition} to describe the Y Axes.  Defaults to a single numeric axis */
+    yAxes?: TAxisDefinition[] | TAxisDefinition;
+    /** One or an array of {@link TSeriesDefinition} to describe the renderable series */
+    series?: TSeriesDefinition[] | TSeriesDefinition;
+    /** A {@link TSharedDataDefinition} object that defines data that can be referenced by the series */
+    sharedData?: TSharedDataDefinition;
+    /** One or an array of {@link TModifierDefinition} to describe modifiers to apply to the chart */
+    modifiers?: TModifierDefinition[] | TModifierDefinition;
+    /** One or an array of {@link TAnnotationDefinition} to describe annotations to apply to the chart */
+    annotations?: TAnnotationDefinition[] | TAnnotationDefinition;
 }
 /**
  * A definition that can be used to build a Pie Chart using {@link chartBuilder.buildChart} or {@link chartBuilder.buildPieChart}
@@ -68,7 +93,7 @@ export declare type TLayoutManagerDefinition = {
  * @param definition the {@link ISciChart2DDefinition}
  */
 export declare const build2DChart: (divElementId: string, definition: ISciChart2DDefinition | string) => Promise<{
-    wasmContext: import("../types/TSciChart").TSciChart;
+    wasmContext: TSciChart;
     sciChartSurface: SciChartSurface;
 }>;
 /**
@@ -78,3 +103,4 @@ export declare const build2DChart: (divElementId: string, definition: ISciChart2
  * @param definition the {@link ISciChartPieDefinition}
  */
 export declare const buildPieChart: (divElementId: string, definition: ISciChartPieDefinition | string) => Promise<SciChartPieSurface>;
+export declare function configure2DSurface(definition: ISciChart2DDefinition, sciChartSurface: SciChartSurface, wasmContext: TSciChart): void;

package/Builder/buildSurface.js

@@ -36,7 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildPieChart = exports.build2DChart = void 0;
+exports.configure2DSurface = exports.buildPieChart = exports.build2DChart = void 0;
 var BottomAlignedInnerAxisLayoutStrategy_1 = require("../Charting/LayoutManager/BottomAlignedInnerAxisLayoutStrategy");
 var BottomAlignedOuterAxisLayoutStrategy_1 = require("../Charting/LayoutManager/BottomAlignedOuterAxisLayoutStrategy");
 var BottomAlignedOuterHorizontallyStackedAxisLayoutStrategy_1 = require("../Charting/LayoutManager/BottomAlignedOuterHorizontallyStackedAxisLayoutStrategy");
@@ -51,6 +51,7 @@ var RightAlignedOuterVerticallyStackedAxisLayoutStrategy_1 = require("../Chartin
 var TopAlignedInnerAxisLayoutStrategy_1 = require("../Charting/LayoutManager/TopAlignedInnerAxisLayoutStrategy");
 var TopAlignedOuterAxisLayoutStrategy_1 = require("../Charting/LayoutManager/TopAlignedOuterAxisLayoutStrategy");
 var TopAlignedOuterHorizontallyStackedAxisLayoutStrategy_1 = require("../Charting/LayoutManager/TopAlignedOuterHorizontallyStackedAxisLayoutStrategy");
+var SciChartJsNavyTheme_1 = require("../Charting/Themes/SciChartJsNavyTheme");
 var SciChartJSDarkTheme_1 = require("../Charting/Themes/SciChartJSDarkTheme");
 var SciChartJSDarkv2Theme_1 = require("../Charting/Themes/SciChartJSDarkv2Theme");
 var SciChartJSLightTheme_1 = require("../Charting/Themes/SciChartJSLightTheme");
@@ -68,10 +69,12 @@ var buildModifiers_1 = require("./buildModifiers");
 var buildSeries_1 = require("./buildSeries");
 var chartBuilder_1 = require("./chartBuilder");
 var classFactory_1 = require("./classFactory");
+var ThemeProviderType_1 = require("../types/ThemeProviderType");
 // register themes
-(0, classFactory_1.registerType)(BaseType_1.EBaseType.ThemeProvider, "Light", function () { return new SciChartJSLightTheme_1.SciChartJSLightTheme(); }, true);
-(0, classFactory_1.registerType)(BaseType_1.EBaseType.ThemeProvider, "DarkV2", function () { return new SciChartJSDarkv2Theme_1.SciChartJSDarkv2Theme(); }, true);
-(0, classFactory_1.registerType)(BaseType_1.EBaseType.ThemeProvider, "Dark", function () { return new SciChartJSDarkTheme_1.SciChartJSDarkTheme(); }, true);
+(0, classFactory_1.registerType)(BaseType_1.EBaseType.ThemeProvider, ThemeProviderType_1.EThemeProviderType.Light, function () { return new SciChartJSLightTheme_1.SciChartJSLightTheme(); }, true);
+(0, classFactory_1.registerType)(BaseType_1.EBaseType.ThemeProvider, ThemeProviderType_1.EThemeProviderType.DarkV2, function () { return new SciChartJSDarkv2Theme_1.SciChartJSDarkv2Theme(); }, true);
+(0, classFactory_1.registerType)(BaseType_1.EBaseType.ThemeProvider, ThemeProviderType_1.EThemeProviderType.Dark, function () { return new SciChartJSDarkTheme_1.SciChartJSDarkTheme(); }, true);
+(0, classFactory_1.registerType)(BaseType_1.EBaseType.ThemeProvider, ThemeProviderType_1.EThemeProviderType.Navy, function () { return new SciChartJsNavyTheme_1.SciChartJsNavyTheme(); }, true);
 // register Layout managers
 (0, classFactory_1.registerType)(BaseType_1.EBaseType.LayoutManager, LayoutMangerType_1.ELayoutManagerType.Default, function (options) { return new LayoutManager_1.LayoutManager(options); }, true);
 // TODO builder api support for VerticalGroup and synced layoutmanagers
@@ -99,38 +102,25 @@ var classFactory_1 = require("./classFactory");
  * @param definition the {@link ISciChart2DDefinition}
  */
 var build2DChart = function (divElementId, definition) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, wasmContext, sciChartSurface;
-    var _b, _c, _d, _e, _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var wasmChart, wasmContext, sciChartSurface;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
             case 0:
                 if (typeof definition === "string") {
                     definition = JSON.parse(definition, chartBuilder_1.chartReviver);
                 }
-                return [4 /*yield*/, SciChartSurface_1.SciChartSurface.create(divElementId, definition === null || definition === void 0 ? void 0 : definition.surface)];
+                if (!(definition === null || definition === void 0 ? void 0 : definition.createSingle)) return [3 /*break*/, 2];
+                return [4 /*yield*/, SciChartSurface_1.SciChartSurface.createSingle(divElementId, definition === null || definition === void 0 ? void 0 : definition.surface)];
             case 1:
-                _a = _g.sent(), wasmContext = _a.wasmContext, sciChartSurface = _a.sciChartSurface;
-                if (definition.xAxes) {
-                    (_b = sciChartSurface.xAxes).add.apply(_b, (0, buildAxis_1.buildAxes)(wasmContext, definition.xAxes));
-                }
-                if (sciChartSurface.xAxes.size() === 0) {
-                    sciChartSurface.xAxes.add(new NumericAxis_1.NumericAxis(wasmContext));
-                }
-                if (definition.yAxes) {
-                    (_c = sciChartSurface.yAxes).add.apply(_c, (0, buildAxis_1.buildAxes)(wasmContext, definition.yAxes));
-                }
-                if (sciChartSurface.yAxes.size() === 0) {
-                    sciChartSurface.yAxes.add(new NumericAxis_1.NumericAxis(wasmContext));
-                }
-                if (definition.series) {
-                    (_d = sciChartSurface.renderableSeries).add.apply(_d, (0, buildSeries_1.buildSeries)(wasmContext, definition.series, definition.sharedData));
-                }
-                if (definition.modifiers) {
-                    (_e = sciChartSurface.chartModifiers).add.apply(_e, (0, buildModifiers_1.buildModifiers)(definition.modifiers));
-                }
-                if (definition.annotations) {
-                    (_f = sciChartSurface.annotations).add.apply(_f, (0, buildAnnotations_1.buildAnnotations)(definition.annotations));
-                }
+                wasmChart = _a.sent();
+                return [3 /*break*/, 4];
+            case 2: return [4 /*yield*/, SciChartSurface_1.SciChartSurface.create(divElementId, definition === null || definition === void 0 ? void 0 : definition.surface)];
+            case 3:
+                wasmChart = _a.sent();
+                _a.label = 4;
+            case 4:
+                wasmContext = wasmChart.wasmContext, sciChartSurface = wasmChart.sciChartSurface;
+                configure2DSurface(definition, sciChartSurface, wasmContext);
                 if (definition.onCreated) {
                     if (typeof definition.onCreated === "string") {
                         sciChartSurface.onCreatedName = definition.onCreated;
@@ -183,3 +173,35 @@ var buildPieChart = function (divElementId, definition) { return __awaiter(void
     });
 }); };
 exports.buildPieChart = buildPieChart;
+function configure2DSurface(definition, sciChartSurface, wasmContext) {
+    var _a, _b, _c, _d, _e;
+    if (definition.xAxes) {
+        (_a = sciChartSurface.xAxes).add.apply(_a, (0, buildAxis_1.buildAxes)(wasmContext, definition.xAxes));
+    }
+    if (sciChartSurface.xAxes.size() === 0 && !definition.subCharts) {
+        sciChartSurface.xAxes.add(new NumericAxis_1.NumericAxis(wasmContext));
+    }
+    if (definition.yAxes) {
+        (_b = sciChartSurface.yAxes).add.apply(_b, (0, buildAxis_1.buildAxes)(wasmContext, definition.yAxes));
+    }
+    if (sciChartSurface.yAxes.size() === 0 && !definition.subCharts) {
+        sciChartSurface.yAxes.add(new NumericAxis_1.NumericAxis(wasmContext));
+    }
+    if (definition.series) {
+        (_c = sciChartSurface.renderableSeries).add.apply(_c, (0, buildSeries_1.buildSeries)(wasmContext, definition.series, definition.sharedData));
+    }
+    if (definition.modifiers) {
+        (_d = sciChartSurface.chartModifiers).add.apply(_d, (0, buildModifiers_1.buildModifiers)(definition.modifiers));
+    }
+    if (definition.annotations) {
+        (_e = sciChartSurface.annotations).add.apply(_e, (0, buildAnnotations_1.buildAnnotations)(definition.annotations));
+    }
+    if (definition.subCharts && !sciChartSurface.isSubSurface) {
+        for (var _i = 0, _f = definition.subCharts; _i < _f.length; _i++) {
+            var subChartDefinition = _f[_i];
+            var subSurface = sciChartSurface.addSubChart(subChartDefinition.surface);
+            configure2DSurface(subChartDefinition, subSurface, wasmContext);
+        }
+    }
+}
+exports.configure2DSurface = configure2DSurface;

package/Builder/chartBuilder.d.ts

@@ -1,6 +1,9 @@
 import { SciChartPieSurface } from "../Charting/Visuals/SciChartPieSurface/SciChartPieSurface";
-import { TWebAssemblyChart } from "../Charting/Visuals/SciChartSurface";
+import { SciChartSurface, TWebAssemblyChart } from "../Charting/Visuals/SciChartSurface";
+import { SciChartSurfaceBase } from "../Charting/Visuals/SciChartSurfaceBase";
 import { ESciChartSurfaceType } from "../types/SciChartSurfaceType";
+import { TSciChart } from "../types/TSciChart";
+import { TSciChart3D } from "../types/TSciChart3D";
 import { ISciChart2DDefinition, ISciChartPieDefinition } from "./buildSurface";
 export declare type TSurfaceDefinition = ISciChart2DDefinition | {
     type?: ESciChartSurfaceType.Default2D;
@@ -20,6 +23,14 @@ export declare function chartReviver(key: string, value: any): any;
  * @returns
  */
 export declare const buildChart: (divElementId: string, definition: string | TSurfaceDefinition) => Promise<TWebAssemblyChart | SciChartPieSurface>;
+/**
+ * Configures an existing surface using a definition.
+ * This is useful if you need to use the wasmContext in methods or classes you use in your definition
+ * @param sciChartSurface
+ * @param wasmContext The webassemply context.  Pass undefined for a pie surface.
+ * @param definition
+ */
+export declare const configureChart: (sciChartSurface: SciChartSurfaceBase, wasmContext: TSciChart, definition: string | TSurfaceDefinition) => void;
 /**
  * This is just something to call to ensure that all the registrations are run before a surface is created
  */
@@ -31,25 +42,27 @@ export declare const chartBuilder: {
     chartReviver: typeof chartReviver;
     /** @inheritdoc */
     build2DChart: (divElementId: string, definition: string | ISciChart2DDefinition) => Promise<{
-        wasmContext: import("../types/TSciChart").TSciChart;
-        sciChartSurface: import("../Charting/Visuals/SciChartSurface").SciChartSurface;
+        wasmContext: TSciChart;
+        sciChartSurface: SciChartSurface;
     }>;
     /** @inheritdoc */
     buildPieChart: (divElementId: string, definition: string | ISciChartPieDefinition) => Promise<SciChartPieSurface>;
     /** @inheritdoc */
-    buildSeries: (wasmContext: import("../types/TSciChart").TSciChart, definition: import("./buildSeries").TSeriesDefinition | import("./buildSeries").TSeriesDefinition[], sharedData?: import("./buildDataSeries").TSharedDataDefinition) => import("../Charting/Visuals/RenderableSeries/IRenderableSeries").IRenderableSeries[];
+    configureChart: (sciChartSurface: SciChartSurfaceBase, wasmContext: TSciChart, definition: string | TSurfaceDefinition) => void;
+    /** @inheritdoc */
+    buildSeries: (wasmContext: TSciChart, definition: import("./buildSeries").TSeriesDefinition | import("./buildSeries").TSeriesDefinition[], sharedData?: import("./buildDataSeries").TSharedDataDefinition) => import("../Charting/Visuals/RenderableSeries/IRenderableSeries").IRenderableSeries[];
     /** @inheritdoc */
-    buildDataSeries: (wasmContext: import("../types/TSciChart").TSciChart, seriesDefinition: import("./buildSeries").TSeriesDefinition, sharedData?: import("./buildDataSeries").TSharedDataDefinition) => import("../Charting/Model/IDataSeries").IDataSeries;
+    buildDataSeries: (wasmContext: TSciChart, seriesDefinition: import("./buildSeries").TSeriesDefinition, sharedData?: import("./buildDataSeries").TSharedDataDefinition) => import("../Charting/Model/IDataSeries").IDataSeries;
     /** @inheritdoc */
     buildModifiers: (definition: import("./buildModifiers").TModifierDefinition | import("./buildModifiers").TModifierDefinition[]) => import("../Charting/ChartModifiers/ChartModifierBase2D").ChartModifierBase2D[];
     /** @inheritdoc */
-    buildAxes: (wasmContext: import("../types/TSciChart").TSciChart, definition: import("./buildAxis").TAxisDefinition | import("./buildAxis").TAxisDefinition[]) => import("../Charting/Visuals/Axis/AxisBase2D").AxisBase2D[];
+    buildAxes: (wasmContext: TSciChart, definition: import("./buildAxis").TAxisDefinition | import("./buildAxis").TAxisDefinition[]) => import("../Charting/Visuals/Axis/AxisBase2D").AxisBase2D[];
     /** @inheritdoc */
     buildAnnotations: (definition: import("./buildAnnotations").TAnnotationDefinition | import("./buildAnnotations").TAnnotationDefinition[]) => any[];
     /** @inheritdoc */
     registerType: <T extends object>(baseType: import("../types/BaseType").EBaseType, type: string, constructor: (options?: any) => T, overWrite?: boolean) => void;
     /** @inheritdoc */
-    registerWasmType: <T_1 extends object>(baseType: import("../types/BaseType").EBaseType, type: string, constructor: (wasmContext: import("../types/TSciChart").TSciChart | import("../types/TSciChart3D").TSciChart3D, options?: any) => T_1, overWrite?: boolean) => void;
+    registerWasmType: <T_1 extends object>(baseType: import("../types/BaseType").EBaseType, type: string, constructor: (wasmContext: TSciChart | TSciChart3D, options?: any) => T_1, overWrite?: boolean) => void;
     /** @inheritdoc */
     registerFunction: <T_2 extends Function>(baseType: import("../types/BaseType").EBaseType, type: string, constructor: T_2, overWrite?: boolean) => void;
 };

package/Builder/chartBuilder.js

@@ -36,7 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.chartBuilder = exports.ensureRegistrations = exports.buildChart = exports.chartReviver = void 0;
+exports.chartBuilder = exports.ensureRegistrations = exports.configureChart = exports.buildChart = exports.chartReviver = void 0;
 var NumberRange_1 = require("../Core/NumberRange");
 var Thickness_1 = require("../Core/Thickness");
 var SciChartSurfaceType_1 = require("../types/SciChartSurfaceType");
@@ -61,9 +61,9 @@ function chartReviver(key, value) {
             var t = value;
             return new Thickness_1.Thickness(t.top, t.right, t.bottom, t.left);
         default:
-            return value;
+            // handle NaN serialization/deserialization since NaN is stringified as "null"
+            return value === null ? NaN : value;
     }
-    return value;
 }
 exports.chartReviver = chartReviver;
 /**
@@ -101,6 +101,38 @@ var buildChart = function (divElementId, definition) { return __awaiter(void 0,
     });
 }); };
 exports.buildChart = buildChart;
+/**
+ * Configures an existing surface using a definition.
+ * This is useful if you need to use the wasmContext in methods or classes you use in your definition
+ * @param sciChartSurface
+ * @param wasmContext The webassemply context.  Pass undefined for a pie surface.
+ * @param definition
+ */
+var configureChart = function (sciChartSurface, wasmContext, definition) {
+    if (typeof definition === "string") {
+        definition = JSON.parse(definition, chartReviver);
+    }
+    if (!definition) {
+        definition = {};
+    }
+    if ("type" in definition) {
+        if (definition.type === SciChartSurfaceType_1.ESciChartSurfaceType.Default2D) {
+            // TODO check the definition type matches the surface
+            (0, buildSurface_1.configure2DSurface)(definition.options, sciChartSurface, wasmContext);
+        }
+        else if (definition.type === SciChartSurfaceType_1.ESciChartSurfaceType.Pie2D) {
+            //return await buildPieChart(divElementId, definition.options);
+        }
+        else {
+            // @ts-ignore
+            throw new Error("Surface type: ".concat(definition.type, " is not yet supported by the builder api"));
+        }
+    }
+    else {
+        (0, buildSurface_1.configure2DSurface)(definition, sciChartSurface, wasmContext);
+    }
+};
+exports.configureChart = configureChart;
 /**
  * This is just something to call to ensure that all the registrations are run before a surface is created
  */
@@ -116,6 +148,8 @@ exports.chartBuilder = {
     /** @inheritdoc */
     buildPieChart: buildSurface_1.buildPieChart,
     /** @inheritdoc */
+    configureChart: exports.configureChart,
+    /** @inheritdoc */
     buildSeries: buildSeries_1.buildSeries,
     /** @inheritdoc */
     buildDataSeries: buildDataSeries_1.buildDataSeries,