scichart 3.0.0-beta.230 → 3.0.0-beta.263

package/Builder/buildAnnotations.d.ts

@@ -3,6 +3,7 @@ import { IBoxAnnotationOptions } from "../Charting/Visuals/Annotations/BoxAnnota
 import { ICustomAnnotationOptions } from "../Charting/Visuals/Annotations/CustomAnnotation";
 import { EAnnotationType } from "../Charting/Visuals/Annotations/IAnnotation";
 import { ILineAnnotationOptions } from "../Charting/Visuals/Annotations/LineAnnotation";
+import { INativeTextAnnotationOptions } from "../Charting/Visuals/Annotations/NativeTextAnnotation";
 import { ITextAnnotationOptions } from "../Charting/Visuals/Annotations/TextAnnotation";
 /** Definition of an annotation, comprising a {@link EAnnotationType} and the relevant options  */
 export declare type TAnnotationDefinition = {
@@ -26,6 +27,9 @@ export declare type TAnnotationDefinition = {
 } | {
     type: EAnnotationType.SVGCustomAnnotation;
     options?: ICustomAnnotationOptions;
+} | {
+    type: EAnnotationType.RenderContextNativeTextAnnotation;
+    options?: INativeTextAnnotationOptions;
 };
 /**
  * Build one or more annotations from a definition that can be pure data.

package/Builder/buildAnnotations.js

@@ -7,6 +7,7 @@ var CustomAnnotation_1 = require("../Charting/Visuals/Annotations/CustomAnnotati
 var HorizontalLineAnnotation_1 = require("../Charting/Visuals/Annotations/HorizontalLineAnnotation");
 var IAnnotation_1 = require("../Charting/Visuals/Annotations/IAnnotation");
 var LineAnnotation_1 = require("../Charting/Visuals/Annotations/LineAnnotation");
+var NativeTextAnnotation_1 = require("../Charting/Visuals/Annotations/NativeTextAnnotation");
 var TextAnnotation_1 = require("../Charting/Visuals/Annotations/TextAnnotation");
 var VerticalLineAnnotation_1 = require("../Charting/Visuals/Annotations/VerticalLineAnnotation");
 var BaseType_1 = require("../types/BaseType");
@@ -20,6 +21,7 @@ var classFactory_1 = require("./classFactory");
 (0, classFactory_1.registerType)(BaseType_1.EBaseType.Annotation, IAnnotation_1.EAnnotationType.RenderContextVerticalLineAnnotation, function (options) { return new VerticalLineAnnotation_1.VerticalLineAnnotation(options); }, true);
 (0, classFactory_1.registerType)(BaseType_1.EBaseType.Annotation, IAnnotation_1.EAnnotationType.SVGTextAnnotation, function (options) { return new TextAnnotation_1.TextAnnotation(options); }, true);
 (0, classFactory_1.registerType)(BaseType_1.EBaseType.Annotation, IAnnotation_1.EAnnotationType.SVGCustomAnnotation, function (options) { return new CustomAnnotation_1.CustomAnnotation(options); }, true);
+(0, classFactory_1.registerType)(BaseType_1.EBaseType.Annotation, IAnnotation_1.EAnnotationType.RenderContextNativeTextAnnotation, function (options) { return new NativeTextAnnotation_1.NativeTextAnnotation(options); }, true);
 /**
  * Build one or more annotations from a definition that can be pure data.
  * @param definition One or an array of {@link TAnnotationDefinition}

package/Charting/ChartModifiers/OverviewRangeSelectionModifier.d.ts

@@ -47,10 +47,6 @@ export declare class OverviewRangeSelectionModifier extends ChartModifierBase2D
      * @inheritDoc
      */
     onAttach(): void;
-    /**
-     * @inheritDoc
-     */
-    onDetach(): void;
     /**
      * @inheritDoc
      */
@@ -81,5 +77,4 @@ export declare class OverviewRangeSelectionModifier extends ChartModifierBase2D
     set selectedArea(value: NumberRange);
     createAnnotation(options: ICustomResizableAnnotationOptions): OverviewCustomResizableAnnotation;
     protected updateSelectionAnnotation(): void;
-    private xVisibleRangeChangeHandler;
 }

package/Charting/ChartModifiers/OverviewRangeSelectionModifier.js

@@ -67,7 +67,6 @@ var OverviewRangeSelectionModifier = /** @class */ (function (_super) {
         _this.onSelectedAreaChanged = options === null || options === void 0 ? void 0 : options.onSelectedAreaChanged;
         _this.xAxisId = (_a = options === null || options === void 0 ? void 0 : options.xAxisId) !== null && _a !== void 0 ? _a : _this.xAxisId;
         _this.yAxisId = (_b = options === null || options === void 0 ? void 0 : options.yAxisId) !== null && _b !== void 0 ? _b : _this.yAxisId;
-        _this.xVisibleRangeChangeHandler = _this.xVisibleRangeChangeHandler.bind(_this);
         return _this;
     }
     /**
@@ -77,13 +76,6 @@ var OverviewRangeSelectionModifier = /** @class */ (function (_super) {
         _super.prototype.onAttach.call(this);
         this.updateSelectionAnnotation();
     };
-    /**
-     * @inheritDoc
-     */
-    OverviewRangeSelectionModifier.prototype.onDetach = function () {
-        var xAxis = this.parentSurface.getXAxisById(this.xAxisId);
-        xAxis.visibleRangeChanged.unsubscribe(this.xVisibleRangeChangeHandler);
-    };
     /**
      * @inheritDoc
      */
@@ -251,25 +243,32 @@ var OverviewRangeSelectionModifier = /** @class */ (function (_super) {
             this.rangeSelectionAnnotationProperty = dragBox;
             this.annotationBeforeSelectedAreaProperty = annotationBeforeSelectedArea;
             this.annotationAfterSelectedAreaProperty = annotationAfterSelectedArea;
-            xAxis.visibleRangeChanged.subscribe(this.xVisibleRangeChangeHandler);
         }
     };
-    OverviewRangeSelectionModifier.prototype.xVisibleRangeChangeHandler = function (args) {
-        this.annotationBeforeSelectedAreaProperty.x1 = args.visibleRange.min;
-        this.annotationAfterSelectedAreaProperty.x2 = args.visibleRange.max;
-    };
     return OverviewRangeSelectionModifier;
 }(ChartModifierBase2D_1.ChartModifierBase2D));
 exports.OverviewRangeSelectionModifier = OverviewRangeSelectionModifier;
 /** @ignore */
 var horizontalAdornerSvgTemplate = function (x1, y1, x2, y2) {
     var colorLine = "black";
-    return "<svg xmlns=\"http://www.w3.org/2000/svg\">\n        <line x1=\"".concat(x1, "\" y1=\"").concat(y1, "\" x2=\"").concat(x2, "\" y2=\"").concat(y1, "\" stroke=\"").concat(colorLine, "\" stroke-width=\"1\" />\n        <line x1=\"").concat(x2, "\" y1=\"").concat(y1, "\" x2=\"").concat(x2, "\" y2=\"").concat(y2, "\" stroke=\"").concat(colorLine, "\" stroke-width=\"1\" />\n        <line x1=\"").concat(x1, "\" y1=\"").concat(y2, "\" x2=\"").concat(x2, "\" y2=\"").concat(y2, "\" stroke=\"").concat(colorLine, "\" stroke-width=\"1\" />\n        <line x1=\"").concat(x1, "\" y1=\"").concat(y1, "\" x2=\"").concat(x1, "\" y2=\"").concat(y2, "\" stroke=\"").concat(colorLine, "\" stroke-width=\"1\" />\n        <rect x=\"").concat(x1 - 3, "\" y=\"30%\" width=\"7\" height=\"40%\" fill=\"#2e2e2e\" rx=\"5\" stroke=\"").concat(colorLine, "\" />\n        <rect x=\"").concat(x2 - 3, "\" y=\"30%\" width=\"7\" height=\"40%\" fill=\"#2e2e2e\" rx=\"5\" stroke=\"").concat(colorLine, "\" />\n        </svg>");
+    var gridpHandleFill = "#2e2e2e";
+    var gripHandleHalfWidth = 3;
+    var gripHandleHeight = "40%";
+    var gripHandleYCoord = "30%";
+    var width = x2 - x1;
+    var height = y2 - y1;
+    return "<svg x=\"".concat(x1, "\" y=\"").concat(y1, "\" width=\"").concat(width, "px\" height=\"").concat(height, "px\" viewBox=\"0 0 ").concat(width, " ").concat(height, "\" overflow=\"visible\" xmlns=\"http://www.w3.org/2000/svg\">\n        <line x1=\"0\" y1=\"0\" x2=\"").concat(width, "\" y2=\"0\" stroke=\"").concat(colorLine, "\" stroke-width=\"1\" />\n        <line x1=\"0\" y1=\"").concat(height, "\" x2=\"").concat(width, "\" y2=\"").concat(height, "\" stroke=\"").concat(colorLine, "\" stroke-width=\"1\" />\n        <line x1=\"0\" y1=\"0\" x2=\"0\" y2=\"").concat(height, "\" stroke=\"").concat(colorLine, "\" stroke-width=\"1\" />\n        <line x1=\"").concat(width, "\" y1=\"0\" x2=\"").concat(width, "\" y2=\"").concat(height, "\" stroke=\"").concat(colorLine, "\" stroke-width=\"1\" />\n        <rect x=\"").concat(0 - gripHandleHalfWidth, "\" y=\"").concat(gripHandleYCoord, "\" width=\"7\" height=\"").concat(gripHandleHeight, "\" fill=\"").concat(gridpHandleFill, "\" rx=\"5\" stroke=\"").concat(colorLine, "\" />\n        <rect x=\"").concat(width - gripHandleHalfWidth, "\" y=\"").concat(gripHandleYCoord, "\" width=\"7\" height=\"").concat(gripHandleHeight, "\" fill=\"").concat(gridpHandleFill, "\" rx=\"5\" stroke=\"").concat(colorLine, "\" />\n        </svg>");
 };
 /** @ignore */
 var verticalAdornerSvgTemplate = function (x1, y1, x2, y2) {
     var colorLine = "black";
-    return "<svg xmlns=\"http://www.w3.org/2000/svg\">\n        <line x1=\"".concat(x1, "\" y1=\"").concat(y1, "\" x2=\"").concat(x2, "\" y2=\"").concat(y1, "\" stroke=\"").concat(colorLine, "\" stroke-width=\"1\" />\n        <line x1=\"").concat(x2, "\" y1=\"").concat(y1, "\" x2=\"").concat(x2, "\" y2=\"").concat(y2, "\" stroke=\"").concat(colorLine, "\" stroke-width=\"1\" />\n        <line x1=\"").concat(x1, "\" y1=\"").concat(y2, "\" x2=\"").concat(x2, "\" y2=\"").concat(y2, "\" stroke=\"").concat(colorLine, "\" stroke-width=\"1\" />\n        <line x1=\"").concat(x1, "\" y1=\"").concat(y1, "\" x2=\"").concat(x1, "\" y2=\"").concat(y2, "\" stroke=\"").concat(colorLine, "\" stroke-width=\"1\" />\n        <rect x=\"30%\" y=\"").concat(y1 - 3, "\" width=\"40%\" height=\"7\" fill=\"#2e2e2e\" rx=\"5\" stroke=\"").concat(colorLine, "\" />\n        <rect x=\"30%\" y=\"").concat(y2 - 3, "\" width=\"40%\" height=\"7\" fill=\"#2e2e2e\" rx=\"5\" stroke=\"").concat(colorLine, "\" />\n        </svg>");
+    var gridpHandleFill = "#2e2e2e";
+    var gripHandleWidth = "40%";
+    var gripHandleHalfHeight = 3;
+    var gripHandleXCoord = "30%";
+    var width = x2 - x1;
+    var height = y2 - y1;
+    return "<svg x=\"".concat(x1, "\" y=\"").concat(y1, "\" width=\"").concat(width, "px\" height=\"").concat(height, "px\" viewBox=\"0 0 ").concat(width, " ").concat(height, "\" overflow=\"visible\" xmlns=\"http://www.w3.org/2000/svg\">\n        <line x1=\"0\" y1=\"0\" x2=\"").concat(width, "\" y2=\"0\" stroke=\"").concat(colorLine, "\" stroke-width=\"1\" />\n        <line x1=\"0\" y1=\"").concat(height, "\" x2=\"").concat(width, "\" y2=\"").concat(height, "\" stroke=\"").concat(colorLine, "\" stroke-width=\"1\" />\n        <line x1=\"0\" y1=\"0\" x2=\"0\" y2=\"").concat(height, "\" stroke=\"").concat(colorLine, "\" stroke-width=\"1\" />\n        <line x1=\"").concat(width, "\" y1=\"0\" x2=\"").concat(width, "\" y2=\"").concat(height, "\" stroke=\"").concat(colorLine, "\" stroke-width=\"1\" />\n        <rect x=\"").concat(gripHandleXCoord, "\" y=\"").concat(0 - gripHandleHalfHeight, "\" width=\"").concat(gripHandleWidth, "\" height=\"7\" fill=\"").concat(gridpHandleFill, "\" rx=\"5\" stroke=\"").concat(colorLine, "\" />\n        <rect x=\"").concat(gripHandleXCoord, "\" y=\"").concat(height - gripHandleHalfHeight, "\" width=\"").concat(gripHandleWidth, "\" height=\"7\" fill=\"").concat(gridpHandleFill, "\" rx=\"5\" stroke=\"").concat(colorLine, "\" />\n        </svg>");
 };
 var defaultSelectionAnnotationSvgString = "<svg width=\"50\" height=\"50\" preserveAspectRatio=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n    <rect width=\"100%\" height=\"100%\" style=\"fill:transparent\">\n    </rect>\n</svg>";
 var defaultUnSelectedAnnotationSvgString = "<svg width=\"50\" height=\"50\" preserveAspectRatio=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n        <rect width=\"100%\" height=\"100%\" style=\"fill:black\">\n        </rect>\n    </svg>";

package/Charting/Drawing/WebGlRenderContext2D.js

@@ -312,7 +312,7 @@ var WebGlRenderContext2D = /** @class */ (function () {
             this.webAssemblyContext.TSRRequestCanvasDraw((_a = this.canvasId) !== null && _a !== void 0 ? _a : "undefinedCanvasId");
         }
         else if (currentFontName !== fontKey.m_strName) {
-            console.warn("Font ".concat(fontKey.m_strName, ".ttf could not be found on the server. Falling back to Arial"));
+            console.warn("Font ".concat(fontKey.m_strName, " could not be found on the server. Falling back to Arial"));
         }
         return nativeFont;
     };

package/Charting/Services/SciChartRenderer.js

@@ -239,6 +239,18 @@ var SciChartRenderer = /** @class */ (function () {
         // Is XAxes and YAxes collection null or empty
         // is XAxis a CategoryAxis and renderableseries is null or empty
         // Do all renderableseries have dataseries
+        var errors = [];
+        if (this.sciChartSurface.renderableSeries.size() > 0) {
+            if (this.sciChartSurface.xAxes.size() === 0) {
+                errors.push("Chart must have at least one X axis");
+            }
+            if (this.sciChartSurface.yAxes.size() === 0) {
+                errors.push("Chart must have at least one Y axis");
+            }
+        }
+        if (errors.length > 0) {
+            throw new Error(errors.join("\n"));
+        }
     };
     SciChartRenderer.prototype.updateSvgCanvasSize = function (seriesViewRect) {
         // Convert seriesViewRect back to device pixels

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

@@ -56,6 +56,13 @@ export interface INativeTextAnnotationOptions extends IAnnotationBaseOptions {
      * If a whole number then treated as pixels.  If between 0 and 1 then treated as a fraction of line height
      */
     lineSpacing?: number;
+    /**
+     * The scale factor for the font.  Default 1
+     * This changes the size of the text without needing to create a new font with a different size
+     */
+    scale?: number;
+    /** Set true to make the font scale when the annotation is resized.  Must set x2 as well.  Cannot be used with wrapTo  */
+    scaleOnResize?: boolean;
 }
 /**
  * @summary The {@link NativeTextAnnotation} provides an {@link AnnotationBase | Annotation} which draws a text at
@@ -72,6 +79,8 @@ export interface INativeTextAnnotationOptions extends IAnnotationBaseOptions {
 export declare class NativeTextAnnotation extends RenderContextAnnotationBase {
     /** @inheritDoc */
     readonly type: EAnnotationType;
+    /** Set true to make the font scale when the annotation is resized.  Must set x2 as well.  Cannot be used with wrapTo */
+    scaleOnResize: boolean;
     protected fontSizeProperty?: number;
     protected fontFamilyProperty?: string;
     protected textColorProperty: string;
@@ -82,6 +91,8 @@ export declare class NativeTextAnnotation extends RenderContextAnnotationBase {
     protected multiLineAlignmentProperty?: EMultiLineAlignment;
     protected wrapToProperty?: number | EWrapTo;
     protected lineSpacingProperty?: number;
+    protected scaleProperty?: number;
+    private initialWidth;
     /**
      * Create an instance of a NativeTextAnnotation
      * @param options Optional parameters of type {@link INativeTextAnnotationOptions} which configure the annotation upon construction
@@ -169,6 +180,16 @@ export declare class NativeTextAnnotation extends RenderContextAnnotationBase {
      * If a whole number then treated as pixels.  If between 0 and 1 then treated as a fraction of line height
      */
     set lineSpacing(value: number);
+    /**
+     * The scale factor for the font.  Default 1
+     * This changes the size of the text without needing to create a new font with a different size
+     */
+    get scale(): number;
+    /**
+     * The scale factor for the font.  Default 1
+     * This changes the size of the text without needing to create a new font with a different size
+     */
+    set scale(value: number);
     /** @inheritDoc */
     delete(): void;
     /** @inheritDoc */

package/Charting/Visuals/Annotations/NativeTextAnnotation.js

@@ -58,10 +58,12 @@ var NativeTextAnnotation = /** @class */ (function (_super) {
      */
     function NativeTextAnnotation(options) {
         var _this = this;
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         _this = _super.call(this, options) || this;
         /** @inheritDoc */
         _this.type = IAnnotation_1.EAnnotationType.RenderContextNativeTextAnnotation;
+        /** Set true to make the font scale when the annotation is resized.  Must set x2 as well.  Cannot be used with wrapTo */
+        _this.scaleOnResize = false;
         _this.fontSizeProperty = 14;
         _this.fontFamilyProperty = "Arial";
         _this.textColorProperty = "#ffffff";
@@ -71,6 +73,7 @@ var NativeTextAnnotation = /** @class */ (function (_super) {
         _this.horizontalAnchorPointProperty = AnchorPoint_1.EHorizontalAnchorPoint.Left;
         _this.multiLineAlignmentProperty = TextPosition_1.EMultiLineAlignment.Center;
         _this.lineSpacingProperty = 3;
+        _this.scaleProperty = 1;
         _this.svgStringAdornerTemplate = function (x1, y1, x2, y2) {
             var colorLine = _this.selectionBoxStroke;
             var width = x2 - x1;
@@ -102,6 +105,9 @@ var NativeTextAnnotation = /** @class */ (function (_super) {
         _this.multiLineAlignmentProperty = (_h = options === null || options === void 0 ? void 0 : options.multiLineAlignment) !== null && _h !== void 0 ? _h : _this.multiLineAlignmentProperty;
         _this.wrapToProperty = (_j = options === null || options === void 0 ? void 0 : options.wrapTo) !== null && _j !== void 0 ? _j : _this.wrapToProperty;
         _this.lineSpacingProperty = (_k = options === null || options === void 0 ? void 0 : options.lineSpacing) !== null && _k !== void 0 ? _k : _this.lineSpacingProperty;
+        _this.scaleProperty = (_l = options === null || options === void 0 ? void 0 : options.scale) !== null && _l !== void 0 ? _l : _this.scaleProperty;
+        _this.initialWidth = Math.abs(_this.x2 - _this.x1);
+        _this.scaleOnResize = (_m = options === null || options === void 0 ? void 0 : options.scaleOnResize) !== null && _m !== void 0 ? _m : _this.scaleOnResize;
         return _this;
     }
     Object.defineProperty(NativeTextAnnotation.prototype, "textColor", {
@@ -284,6 +290,27 @@ var NativeTextAnnotation = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(NativeTextAnnotation.prototype, "scale", {
+        /**
+         * The scale factor for the font.  Default 1
+         * This changes the size of the text without needing to create a new font with a different size
+         */
+        get: function () {
+            return this.scaleProperty;
+        },
+        /**
+         * The scale factor for the font.  Default 1
+         * This changes the size of the text without needing to create a new font with a different size
+         */
+        set: function (value) {
+            if (value !== this.scaleProperty) {
+                this.scaleProperty = value;
+                this.notifyPropertyChanged(constants_1.PROPERTY.SCALE);
+            }
+        },
+        enumerable: false,
+        configurable: true
+    });
     /** @inheritDoc */
     NativeTextAnnotation.prototype.delete = function () { };
     /** @inheritDoc */
@@ -303,14 +330,15 @@ var NativeTextAnnotation = /** @class */ (function (_super) {
         var y1 = this.getY1Coordinate(xCalc, yCalc);
         var style = {
             fontFamily: this.fontFamily,
-            fontSize: this.fontSize
+            fontSize: Math.round(this.fontSize * DpiHelper_1.DpiHelper.PIXEL_RATIO)
         };
         var colorNum = (0, parseColor_1.parseColorToUIntArgb)(this.textColor);
         colorNum = (0, colorUtil_1.uintArgbColorOverrideOpacity)(colorNum, this.opacity);
         var font;
         var rotationVector;
         var rotationRads = -(this.rotation * Math.PI) / 180;
-        font = renderContext.getFont(style, this.rotation !== 0, false);
+        var isAdvanced = this.rotation !== 0 || this.scale !== 1;
+        font = renderContext.getFont(style, isAdvanced, false);
         var textBounds = (0, NativeObject_1.getTextBounds)(this.parentSurface.webAssemblyContext2D);
         var text = this.text;
         if (this.wrapTo) {
@@ -392,16 +420,25 @@ var NativeTextAnnotation = /** @class */ (function (_super) {
             borderY1 = Math.min(x1y1.y, x2y1.y, x1y2.y, x2y2.y) + rc_1.y;
             borderY2 = Math.max(x1y1.y, x2y1.y, x1y2.y, x2y2.y) + rc_1.y;
         }
-        this.setAnnotationBorders(borderX1, borderX2, borderY1, borderY2);
         var alignMode = (0, TextPosition_1.convertMultiLineAlignment)(this.multiLineAlignment, this.parentSurface.webAssemblyContext2D);
+        var oldScale = font.GetScale();
+        var scaleChanged = false;
+        if (oldScale !== this.scale) {
+            font.SetScale(this.scale);
+            scaleChanged = true;
+        }
+        this.setAnnotationBorders(borderX1, borderX1 + (borderX2 - borderX1) * this.scale, borderY1, borderY1 + (borderY2 - borderY1) * this.scale);
         font.DrawStringAdvanced(text, colorNum, Math.round(x), Math.round(y), rotationVector, alignMode, spacing);
+        if (scaleChanged) {
+            font.SetScale(oldScale);
+        }
         this.updateAdornerInner();
     };
     NativeTextAnnotation.prototype.onDragStarted = function (args) {
         _super.prototype.onDragStarted.call(this, args);
         var _a = this.getAnnotationBorders(false, true), x1 = _a.x1, x2 = _a.x2, y1 = _a.y1, y2 = _a.y2;
         var _b = annotationHelpers_1.annotationHelpers.calcNewApex(x1, y1, x2, y2, this.isVerticalChart), x1y1 = _b.x1y1, x2y1 = _b.x2y1, x1y2 = _b.x1y2, x2y2 = _b.x2y2;
-        var xyMousePoint = (0, translate_1.translateFromCanvasToSeriesViewRect)(new Point_1.Point(args.mousePoint.x, args.mousePoint.y), this.parentSurface.seriesViewRect);
+        var xyMousePoint = (0, translate_1.translateFromCanvasToSeriesViewRect)(new Point_1.Point(args.mousePoint.x, args.mousePoint.y), this.parentSurface.seriesViewRect, true);
         if (x1y1 && this.canDragPoint(AnnotationBase_1.EDraggingGripPoint.x1y1)) {
             var dist = (0, pointUtil_1.calcDistance)(x1y1.x, x1y1.y, xyMousePoint.x, xyMousePoint.y);
             if (dist < this.annotationsGripsRadius * DpiHelper_1.DpiHelper.PIXEL_RATIO) {
@@ -497,6 +534,10 @@ var NativeTextAnnotation = /** @class */ (function (_super) {
                 this.y2 -= this.prevValue.y - xyValues.y;
             }
         }
+        var newScale = Math.abs(this.x2 - this.x1) / this.initialWidth;
+        if (this.scaleOnResize && newScale) {
+            this.scale = newScale;
+        }
         this.prevValue = xyValues;
     };
     /**

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

@@ -64,7 +64,9 @@ export declare enum PROPERTY {
     DRAGPOINTS = "DRAGPOINTS",
     MULTILINE_ALIGNMENT = "MULTILINE_ALIGNMENT",
     WRAP_TO = "WRAP_TO",
-    LINE_SPACING = "LINE_SPACING"
+    LINE_SPACING = "LINE_SPACING",
+    SCALE = "SCALE",
+    OUTLINE = "OUTLINE"
 }
 export declare const ADORNER_GRIP_RADIUS = 10;
 export declare const DISTANCE_TO_LINE = 10;

package/Charting/Visuals/Annotations/constants.js

@@ -69,6 +69,8 @@ var PROPERTY;
     PROPERTY["MULTILINE_ALIGNMENT"] = "MULTILINE_ALIGNMENT";
     PROPERTY["WRAP_TO"] = "WRAP_TO";
     PROPERTY["LINE_SPACING"] = "LINE_SPACING";
+    PROPERTY["SCALE"] = "SCALE";
+    PROPERTY["OUTLINE"] = "OUTLINE";
 })(PROPERTY = exports.PROPERTY || (exports.PROPERTY = {}));
 exports.ADORNER_GRIP_RADIUS = 10;
 exports.DISTANCE_TO_LINE = 10;

package/Charting/Visuals/Axis/AxisBase2D.js

@@ -1147,6 +1147,7 @@ var AxisBase2D = /** @class */ (function (_super) {
         return Math.round(index);
     };
     AxisBase2D.prototype.getTicks = function (regenerate) {
+        var _a, _b;
         if (regenerate || !this.tickCache) {
             var maxAutoTicks = this.getMaxAutoTicks();
             if (this.autoTicks) {
@@ -1155,12 +1156,12 @@ var AxisBase2D = /** @class */ (function (_super) {
                 this.majorDeltaProperty = delta.max;
             }
             var majorTicks = this.drawLabels || this.drawMajorGridLines || this.drawMajorTickLines
-                ? this.tickProvider.getMajorTicks(this.minorDeltaProperty, this.majorDeltaProperty, this.visibleRange)
+                ? this.tickProvider.getMajorTicks((_a = this.minorDeltaProperty) !== null && _a !== void 0 ? _a : this.majorDeltaProperty / this.minorsPerMajor, this.majorDeltaProperty, this.visibleRange)
                 : [];
             var minorTicks = this.drawMinorGridLines || this.drawMinorTickLines
-                ? this.tickProvider.getMinorTicks(this.minorDeltaProperty, this.majorDeltaProperty, this.visibleRange)
+                ? this.tickProvider.getMinorTicks((_b = this.minorDeltaProperty) !== null && _b !== void 0 ? _b : this.majorDeltaProperty / this.minorsPerMajor, this.majorDeltaProperty, this.visibleRange)
                 : [];
-            var _a = this.visibleRange, min_1 = _a.min, max_1 = _a.max;
+            var _c = this.visibleRange, min_1 = _c.min, max_1 = _c.max;
             majorTicks = majorTicks.filter(function (t) { return t >= min_1 && t <= max_1; });
             minorTicks = minorTicks.filter(function (t) { return t >= min_1 && t <= max_1; });
             var majorTickLabels = [];

package/Charting/Visuals/Axis/AxisRenderer.js

@@ -222,6 +222,7 @@ var AxisRenderer = /** @class */ (function () {
         var rotationRad = -(adjRotation * Math.PI) / 180;
         tickCoords = tickCoords.map(function (t) { return t - axisOffset; });
         var multiLineAlignment = convertMultiLineAlignment(alignment, this.webAssemblyContext);
+        var nativeLineSpacing = labelProvider.lineSpacing;
         var lineHeight = 0;
         if (nativeFont) {
             nativeFont.CalculateStringBounds("Ag", textBounds, 0);
@@ -277,8 +278,7 @@ var AxisRenderer = /** @class */ (function () {
                                 tx -= textWidth;
                             }
                         }
-                        nativeFont.DrawStringAdvanced(labelText !== null && labelText !== void 0 ? labelText : "", textColor, Math.round(tx), Math.round(ty), (0, NativeObject_1.getVector4)(this.webAssemblyContext, rx, ry, rotationRad, 0), multiLineAlignment, 2 // TODO from labelProvider
-                        );
+                        nativeFont.DrawStringAdvanced(labelText !== null && labelText !== void 0 ? labelText : "", textColor, Math.round(tx), Math.round(ty), (0, NativeObject_1.getVector4)(this.webAssemblyContext, rx, ry, rotationRad, 0), multiLineAlignment, nativeLineSpacing);
                     }
                     else {
                         var _d = labelProvider.getCachedLabelTexture(labelText, textureManager, labelStyle), bitmapTexture = _d.bitmapTexture, textureHeight = _d.textureHeight, textureWidth = _d.textureWidth;
@@ -325,7 +325,7 @@ var AxisRenderer = /** @class */ (function () {
                     if (nativeFont) {
                         var tx = xCoord + viewRect.left + padding.left;
                         var ty = yCoord + viewRect.top + lineHeight - padding.bottom;
-                        nativeFont.DrawStringAdvanced(labelText !== null && labelText !== void 0 ? labelText : "", textColor, Math.round(tx), Math.round(ty), (0, NativeObject_1.getVector4)(this.webAssemblyContext, tx, ty, rotationRad, 0), multiLineAlignment, 2);
+                        nativeFont.DrawStringAdvanced(labelText !== null && labelText !== void 0 ? labelText : "", textColor, Math.round(tx), Math.round(ty), (0, NativeObject_1.getVector4)(this.webAssemblyContext, tx, ty, rotationRad, 0), multiLineAlignment, nativeLineSpacing);
                     }
                     else {
                         var _g = labelProvider.getCachedLabelTexture(labelText, textureManager, labelStyle), bitmapTexture = _g.bitmapTexture, textureHeight = _g.textureHeight, textureWidth = _g.textureWidth;

package/Charting/Visuals/Axis/LabelProvider/LabelProviderBase2D.d.ts

@@ -35,6 +35,12 @@ export interface ILabel2DOptions extends ILabelOptions {
      * Experimental - set true to use native text for axes.  Not all text features currently supported
      */
     useNativeText?: boolean;
+    /**
+     * Line spacing to use if text is wrapped.
+     * For normal labels this is a multiple of the text height and defaults to 1.1
+     * For native text it is a number of pixels and defaults to 2
+     */
+    lineSpacing?: number;
 }
 /**
  * The {@link LabelProviderBase2D} provides base functionality for 2D label providers, including caching of label textures
@@ -66,9 +72,18 @@ export declare abstract class LabelProviderBase2D extends LabelProvider implemen
      */
     protected styleId: string;
     private rotationProperty;
+    private lineSpacingProperty;
     constructor(options?: ILabel2DOptions);
     get rotation(): number;
     set rotation(value: number);
+    /**
+     * Line spacing to use if text is wrapped, as a multiple of the text height.  Defaults to 1.1
+     */
+    get lineSpacing(): number;
+    /**
+     * Line spacing to use if text is wrapped, as a multiple of the text height.  Defaults to 1.1
+     */
+    set lineSpacing(value: number);
     /**
      * Returns an array of label strings for an array of major tick numeric values
      * @param majorTicks The major tick numeric values

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

@@ -99,7 +99,7 @@ var LabelProviderBase2D = /** @class */ (function (_super) {
     __extends(LabelProviderBase2D, _super);
     function LabelProviderBase2D(options) {
         var _this = this;
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         _this = _super.call(this, options) || this;
         _this.useCache = !app_1.IS_TEST_ENV;
         /**
@@ -110,11 +110,13 @@ var LabelProviderBase2D = /** @class */ (function (_super) {
         /** Set this true if the format function could return different results for the same input (eg SmartDateLabelprovider) */
         _this.textVariesForSameTick = false;
         _this.rotationProperty = 0;
+        _this.lineSpacingProperty = 1.1;
         _this.providerId = (0, guid_1.generateGuid)();
         _this.rotationProperty = (_a = options === null || options === void 0 ? void 0 : options.rotation) !== null && _a !== void 0 ? _a : _this.rotationProperty;
-        _this.asyncLabels = (_b = options === null || options === void 0 ? void 0 : options.asyncLabels) !== null && _b !== void 0 ? _b : SciChartDefaults_1.SciChartDefaults.asyncLabels;
-        _this.useSharedCache = (_c = options === null || options === void 0 ? void 0 : options.useSharedCache) !== null && _c !== void 0 ? _c : SciChartDefaults_1.SciChartDefaults.useSharedCache;
-        _this.useNativeText = (_d = options === null || options === void 0 ? void 0 : options.useNativeText) !== null && _d !== void 0 ? _d : SciChartDefaults_1.SciChartDefaults.useNativeText;
+        _this.lineSpacing = (_b = options === null || options === void 0 ? void 0 : options.lineSpacing) !== null && _b !== void 0 ? _b : _this.lineSpacing;
+        _this.asyncLabels = (_c = options === null || options === void 0 ? void 0 : options.asyncLabels) !== null && _c !== void 0 ? _c : SciChartDefaults_1.SciChartDefaults.asyncLabels;
+        _this.useSharedCache = (_d = options === null || options === void 0 ? void 0 : options.useSharedCache) !== null && _d !== void 0 ? _d : SciChartDefaults_1.SciChartDefaults.useSharedCache;
+        _this.useNativeText = (_e = options === null || options === void 0 ? void 0 : options.useNativeText) !== null && _e !== void 0 ? _e : SciChartDefaults_1.SciChartDefaults.useNativeText;
         return _this;
     }
     Object.defineProperty(LabelProviderBase2D.prototype, "rotation", {
@@ -130,6 +132,28 @@ var LabelProviderBase2D = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(LabelProviderBase2D.prototype, "lineSpacing", {
+        /**
+         * Line spacing to use if text is wrapped, as a multiple of the text height.  Defaults to 1.1
+         */
+        get: function () {
+            if (this.useNativeText) {
+                return this.lineSpacingProperty === 1.1 ? 2 : this.lineSpacingProperty;
+            }
+            else {
+                return this.lineSpacingProperty;
+            }
+        },
+        /**
+         * Line spacing to use if text is wrapped, as a multiple of the text height.  Defaults to 1.1
+         */
+        set: function (value) {
+            this.lineSpacingProperty = value;
+            this.invalidateParent();
+        },
+        enumerable: false,
+        configurable: true
+    });
     /**
      * Returns an array of label strings for an array of major tick numeric values
      * @param majorTicks The major tick numeric values
@@ -395,6 +419,7 @@ var LabelProviderBase2D = /** @class */ (function (_super) {
         var json = _super.prototype.toJSON.call(this);
         var options = {
             rotation: this.rotation,
+            lineSpacing: this.lineSpacing,
             asyncLabels: this.asyncLabels,
             useSharedCache: this.useSharedCache,
             useNativeText: this.useNativeText

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

@@ -123,11 +123,13 @@ var SmartDateLabelProvider = /** @class */ (function (_super) {
     Object.defineProperty(SmartDateLabelProvider.prototype, "numericFormat", {
         /** @inheritDoc */
         get: function () {
-            throw new Error("Setting or getting numericFormat is not supported for SmartDateLabelProvider");
+            return undefined;
+            // SCJS-1206 throwing erros here breaks serialization
+            // throw new Error("Setting or getting numericFormat is not supported for SmartDateLabelProvider");
         },
         /** @inheritDoc */
         set: function (value) {
-            throw new Error("Setting or getting numericFormat is not supported for SmartDateLabelProvider");
+            // throw new Error("Setting or getting numericFormat is not supported for SmartDateLabelProvider");
         },
         enumerable: false,
         configurable: true

package/Charting/Visuals/Axis/LabelProvider/TextLabelProvider.d.ts

@@ -16,16 +16,11 @@ export interface ITextLabelOptions extends ILabel2DOptions {
      * Wrap text longer than this number of characters.  Will only wrap whole words.
      */
     maxLength?: number;
-    /**
-     * Line spacing to use if text is wrapped, as a multiple of the text height.  Defaults to 1.1
-     */
-    lineSpacing?: number;
 }
 export declare class TextLabelProvider extends LabelProviderBase2D {
     readonly type = ELabelProviderType.Text;
     private labelsProperty;
     private maxLengthProperty;
-    private lineSpacingProperty;
     constructor(options?: ITextLabelOptions);
     /**
      * The label text to use.  If not set by options this will be an empty array.
@@ -52,14 +47,6 @@ export declare class TextLabelProvider extends LabelProviderBase2D {
      */
     get maxLength(): number;
     set maxLength(value: number);
-    /**
-     * Line spacing to use if text is wrapped, as a multiple of the text height.  Defaults to 1.1
-     */
-    get lineSpacing(): number;
-    /**
-     * Line spacing to use if text is wrapped, as a multiple of the text height.  Defaults to 1.1
-     */
-    set lineSpacing(value: number);
     onBeginAxisDraw(): void;
     getLabelWidth(ctx: CanvasRenderingContext2D, labelText: string, labelStyle?: TTextStyle): number;
     getLabelTextureAsync(labelText: string, textureManager: TextureManager, labelStyle: TTextStyle): Promise<import("../../TextureManager/TextureManager").TTextureObject>;

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

@@ -72,14 +72,12 @@ var TextLabelProvider = /** @class */ (function (_super) {
     __extends(TextLabelProvider, _super);
     function TextLabelProvider(options) {
         var _this = this;
-        var _a, _b, _c;
+        var _a, _b;
         _this = _super.call(this, options) || this;
         _this.type = LabelProviderType_1.ELabelProviderType.Text;
         _this.maxLengthProperty = 0;
-        _this.lineSpacingProperty = 1.1;
         _this.labelsProperty = (_a = options === null || options === void 0 ? void 0 : options.labels) !== null && _a !== void 0 ? _a : [];
         _this.maxLength = (_b = options === null || options === void 0 ? void 0 : options.maxLength) !== null && _b !== void 0 ? _b : _this.maxLength;
-        _this.lineSpacing = (_c = options === null || options === void 0 ? void 0 : options.lineSpacing) !== null && _c !== void 0 ? _c : _this.lineSpacing;
         _this.formatLabelProperty = function (dataValue) {
             var _a, _b;
             if (_this.parentAxis.isCategoryAxis && Array.isArray(_this.labels)) {
@@ -135,23 +133,6 @@ var TextLabelProvider = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(TextLabelProvider.prototype, "lineSpacing", {
-        /**
-         * Line spacing to use if text is wrapped, as a multiple of the text height.  Defaults to 1.1
-         */
-        get: function () {
-            return this.lineSpacingProperty;
-        },
-        /**
-         * Line spacing to use if text is wrapped, as a multiple of the text height.  Defaults to 1.1
-         */
-        set: function (value) {
-            this.lineSpacingProperty = value;
-            this.invalidateParent();
-        },
-        enumerable: false,
-        configurable: true
-    });
     TextLabelProvider.prototype.onBeginAxisDraw = function () { };
     TextLabelProvider.prototype.getLabelWidth = function (ctx, labelText, labelStyle) {
         if (this.useNativeText || this.rotation % 90 === 0 || !this.parentAxis.isHorizontalAxis) {
@@ -208,7 +189,6 @@ var TextLabelProvider = /** @class */ (function (_super) {
         var json = _super.prototype.toJSON.call(this);
         var options = {
             labels: this.labels,
-            lineSpacing: this.lineSpacing,
             maxLength: this.maxLength
         };
         Object.assign(json.options, options);

package/Charting/Visuals/RenderableSeries/DataLabels/BubbleSeriesDataLabelProvider.js

@@ -49,7 +49,7 @@ var BubbleSeriesDataLabelProvider = /** @class */ (function (_super) {
         if (this.verticalTextPosition === TextPosition_1.EVerticalTextPosition.Center) {
             y += textBounds.m_fHeight / 2;
         }
-        else if (this.verticalTextPosition === TextPosition_1.EVerticalTextPosition.Bottom) {
+        else if (this.verticalTextPosition === TextPosition_1.EVerticalTextPosition.Below) {
             y += textBounds.m_fHeight + ((_f = (_e = this.style.padding) === null || _e === void 0 ? void 0 : _e.top) !== null && _f !== void 0 ? _f : 0) + radius;
         }
         else {

package/Charting/Visuals/RenderableSeries/DataLabels/ColumnSeriesDataLabelProvider.d.ts

@@ -8,12 +8,12 @@ import { DataLabelState } from "./DataLabelState";
 export declare enum EColumnDataLabelPosition {
     Outside = "Outside",
     Inside = "Inside",
-    VerticalPosition = "VerticalPosition"
+    Position = "Position"
 }
 export interface IColumnSeriesDataLabelProviderOptions extends IDataLabelProviderOptions {
     /**
      * Sets whether text should be positioned outside or inside the end of the column using {@link EColumnDataLabelPosition}.
-     * If VerticalPosition then the {@link verticalPosition} property is used.
+     * If Position then the {@link verticalTextPosition} property is used, or {@link horizontalTextPosition} if it is a vertical chart.
      * Default Outside
      */
     positionMode?: EColumnDataLabelPosition;
@@ -25,13 +25,13 @@ export declare class ColumnSeriesDataLabelProvider extends DataLabelProvider {
     constructor(options?: IColumnSeriesDataLabelProviderOptions);
     /**
      * Sets whether text should be positioned outside or inside the end of the column using {@link EColumnDataLabelPosition}.
-     * If VerticalPosition then the {@link verticalPosition} property is used.
+     * If Position then the {@link verticalTextPosition} property is used, or {@link horizontalTextPosition} if it is a vertical chart.
      * Default Outside
      */
     get positionMode(): EColumnDataLabelPosition;
     /**
      * Sets whether text should be positioned outside or inside the end of the column using {@link EColumnDataLabelPosition}.
-     * If VerticalPosition then the {@link verticalPosition} property is used.
+     * If Position then the {@link verticalTextPosition} property is used, or {@link horizontalTextPosition} if it is a vertical chart.
      * Default Outside
      */
     set positionMode(value: EColumnDataLabelPosition);