scichart 2.2.2410 → 2.2.2415

package/Charting/ChartModifiers/ChartModifierBase.d.ts

@@ -78,6 +78,8 @@ export interface IChartModifierBase extends IThemeable, IDeletable {
     onParentSurfaceRendered(): void;
     /**
      * Method called when mouse-down or touch-down occurs on the parent {@link SciChartSurfaceBase}
+     * Call args.nativeEvent.preventDefault() to prevent default browser actions
+     * like fast scroll for mouse wheel click and dragging of selected elements
      * @param args the {@link ModifierMouseArgs} containing data about the mouse event
      * @param scs the {@link SciChartSurfaceBase} on which method was called
      */

package/Charting/ChartModifiers/ChartModifierBase.js

@@ -112,6 +112,10 @@ var ChartModifierBase = /** @class */ (function () {
     /** @inheritDoc */
     ChartModifierBase.prototype.modifierMouseDown = function (args) {
         // Override in derived class to be notified of mouse down
+        if (this.executeOn === ExecuteOn_1.EExecuteOn.MouseMiddleButton) {
+            // Don't scroll browser if middle button is being used for the modifier
+            args.nativeEvent.preventDefault();
+        }
     };
     /** @inheritDoc */
     ChartModifierBase.prototype.modifierMouseMove = function (args) {

package/Charting/ChartModifiers/ModifierMouseArgs.d.ts

@@ -13,6 +13,7 @@ declare type TModifierMouseArgsParams = {
     shiftKey?: boolean;
     ctrlKey?: boolean;
     altKey?: boolean;
+    nativeEvent?: MouseEvent;
 };
 /**
  * Mouse arguments passed to {@link ChartModifierBase} methods
@@ -25,12 +26,12 @@ export declare class ModifierMouseArgs extends ModifierArgsBase {
     static fromMouseEvent(mouseEvent: MouseEvent): ModifierMouseArgs;
     /**
      * Creates a {@link ModifierMouseArgs} instance from Javascript {@link WheelEvent}
-     * @param mouseEvent the Javascript {@link WheelEvent}
+     * @param wheelEvent the Javascript {@link WheelEvent}
      */
     static fromWheelEvent(wheelEvent: WheelEvent): ModifierMouseArgs;
     /**
      * Creates a {@link ModifierMouseArgs} instance from Javascript {@link PointerEvent}
-     * @param mouseEvent the Javascript {@link PointerEvent}
+     * @param pointerEvent the Javascript {@link PointerEvent}
      */
     static fromPointerEvent(pointerEvent: PointerEvent): ModifierMouseArgs;
     /**
@@ -88,6 +89,10 @@ export declare class ModifierMouseArgs extends ModifierArgsBase {
      * When true, the Ctrl Key is currently pressed
      */
     readonly ctrlKey: boolean;
+    /**
+     * The native pointer event
+     */
+    nativeEvent: MouseEvent;
     /**
      * Creates an instance of {@link ModifierMouseArgs}
      * @param mousePoint the mouse point as an X,Y location

package/Charting/ChartModifiers/ModifierMouseArgs.js

@@ -55,6 +55,7 @@ var ModifierMouseArgs = /** @class */ (function (_super) {
         _this.shiftKey = options === null || options === void 0 ? void 0 : options.shiftKey;
         _this.altKey = options === null || options === void 0 ? void 0 : options.altKey;
         _this.ctrlKey = options === null || options === void 0 ? void 0 : options.ctrlKey;
+        _this.nativeEvent = options === null || options === void 0 ? void 0 : options.nativeEvent;
         return _this;
     }
     /**
@@ -69,13 +70,14 @@ var ModifierMouseArgs = /** @class */ (function (_super) {
             isMaster: true,
             shiftKey: mouseEvent.shiftKey,
             ctrlKey: mouseEvent.ctrlKey,
-            altKey: mouseEvent.altKey
+            altKey: mouseEvent.altKey,
+            nativeEvent: mouseEvent
         };
         return new ModifierMouseArgs(mousePoint, options);
     };
     /**
      * Creates a {@link ModifierMouseArgs} instance from Javascript {@link WheelEvent}
-     * @param mouseEvent the Javascript {@link WheelEvent}
+     * @param wheelEvent the Javascript {@link WheelEvent}
      */
     ModifierMouseArgs.fromWheelEvent = function (wheelEvent) {
         Guard_1.Guard.notNull(wheelEvent, "wheelEvent");
@@ -86,13 +88,14 @@ var ModifierMouseArgs = /** @class */ (function (_super) {
             isMaster: true,
             shiftKey: wheelEvent.shiftKey,
             ctrlKey: wheelEvent.ctrlKey,
-            altKey: wheelEvent.altKey
+            altKey: wheelEvent.altKey,
+            nativeEvent: wheelEvent
         };
         return new ModifierMouseArgs(mousePoint, options);
     };
     /**
      * Creates a {@link ModifierMouseArgs} instance from Javascript {@link PointerEvent}
-     * @param mouseEvent the Javascript {@link PointerEvent}
+     * @param pointerEvent the Javascript {@link PointerEvent}
      */
     ModifierMouseArgs.fromPointerEvent = function (pointerEvent) {
         Guard_1.Guard.notNull(pointerEvent, "pointerEvent");
@@ -105,7 +108,8 @@ var ModifierMouseArgs = /** @class */ (function (_super) {
             isMaster: true,
             shiftKey: pointerEvent.shiftKey,
             ctrlKey: pointerEvent.ctrlKey,
-            altKey: pointerEvent.altKey
+            altKey: pointerEvent.altKey,
+            nativeEvent: pointerEvent
         };
         return new ModifierMouseArgs(mousePoint, options);
     };

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

@@ -84,7 +84,6 @@ export declare class BoxAnnotation extends RenderContextAnnotationBase {
     delete(): void;
     /** @inheritDoc */
     drawWithContext(renderContext: IRenderContext2D, xCalc: CoordinateCalculatorBase, yCalc: CoordinateCalculatorBase, viewRect: Rect): void;
-    private drawWithProvider;
     /** @inheritDoc */
     onAttach(scs: SciChartSurface): void;
     onDragStarted(args: ModifierMouseArgs): boolean;
@@ -97,4 +96,5 @@ export declare class BoxAnnotation extends RenderContextAnnotationBase {
     protected checkIsClickedOnAnnotationInternal(x: number, y: number): boolean;
     protected notifyPropertyChanged(propertyName: string): void;
     protected updateAdornerInner(): void;
+    private drawWithProvider;
 }

package/Charting/Visuals/Annotations/BoxAnnotation.js

@@ -140,51 +140,15 @@ var BoxAnnotation = /** @class */ (function (_super) {
         // Temporary HAX! drawRect is rubbish with large strokeThickness, whereas the columnDrawingProvider does a nice
         // outlined rectangle, but the code is ugly.  In 2.3 we will improve the native drawRect to do the outline properly.
         if (!app_1.IS_TEST_ENV) {
-            this.drawWithProvider(renderContext, strokePen.scrtPen, fillBrush.scrtBrush, xCalc, yCalc, rect, viewRect);
+            if (this.strokeThickness > 3) {
+                this.drawWithProvider(renderContext, strokePen.scrtPen, fillBrush.scrtBrush, xCalc, yCalc, rect, viewRect);
+            }
+            else {
+                renderContext.drawRect(rect, viewRect, strokePen, fillBrush);
+            }
         }
-        //renderContext.drawRect(rect, viewRect, strokePen, fillBrush);
         this.updateAdornerInner();
     };
-    BoxAnnotation.prototype.drawWithProvider = function (renderContext, linesPen, fillBrush, xCalc, yCalc, rect, viewRect) {
-        var webAssemblyContext = this.parentSurface.webAssemblyContext2D;
-        var args = new webAssemblyContext.SCRTColumnDrawingParams();
-        args.forceShaderMethod = true;
-        args.verticalChart = this.isVerticalChart;
-        args.zeroLineY = this.isVerticalChart ? yCalc.getDataValue(rect.left) : yCalc.getDataValue(rect.bottom);
-        args.columnWidth = this.isVerticalChart ? rect.height : rect.width;
-        // ISSUE: If the strokeThickness property is not provided,
-        // the fill will be disappeared with large zoom (when the column width will be small or zero)
-        // if (args.columnWidth === 0 && this.strokeThickness === 0) {
-        //     strokePenCache = this.strokePenFillColoredCache;
-        // }
-        if (linesPen) {
-            args.SetLinesPen(linesPen);
-        }
-        if (fillBrush) {
-            args.SetFillBrush(fillBrush);
-        }
-        args.viewportWidth = viewRect.width;
-        args.viewportHeight = viewRect.height;
-        var xMid = this.isVerticalChart ? (rect.top + rect.bottom) / 2 : (rect.left + rect.right) / 2;
-        var xVal = xCalc.getDataValue(xMid);
-        var xValues = new webAssemblyContext.SCRTDoubleVector();
-        xValues.push_back(xVal);
-        var yVal = this.isVerticalChart ? yCalc.getDataValue(rect.right) : yCalc.getDataValue(rect.top);
-        var yValues = new webAssemblyContext.SCRTDoubleVector();
-        yValues.push_back(yVal);
-        args.count = yValues.size();
-        var nativeContext = renderContext.getNativeContext();
-        nativeContext.PushMatrix();
-        nativeContext.PushState();
-        nativeContext.Translate(viewRect.x, viewRect.y);
-        nativeContext.SetClipRect(viewRect.x, viewRect.y, viewRect.width, viewRect.height);
-        this.nativeDrawingProvider.DrawPointsVec(nativeContext, xValues, yValues, xCalc.nativeCalculator, yCalc.nativeCalculator, args);
-        nativeContext.PopMatrix();
-        nativeContext.PopState();
-        xValues.delete();
-        yValues.delete();
-        args.delete();
-    };
     /** @inheritDoc */
     BoxAnnotation.prototype.onAttach = function (scs) {
         _super.prototype.onAttach.call(this, scs);
@@ -354,6 +318,46 @@ var BoxAnnotation = /** @class */ (function (_super) {
             this.svgAdorner = annotationHelpers_1.annotationHelpers.createSvg(svgString, adornerSvgRoot);
         }
     };
+    BoxAnnotation.prototype.drawWithProvider = function (renderContext, linesPen, fillBrush, xCalc, yCalc, rect, viewRect) {
+        var webAssemblyContext = this.parentSurface.webAssemblyContext2D;
+        var args = new webAssemblyContext.SCRTColumnDrawingParams();
+        args.forceShaderMethod = true;
+        args.verticalChart = this.isVerticalChart;
+        args.zeroLineY = this.isVerticalChart ? yCalc.getDataValue(rect.left) : yCalc.getDataValue(rect.bottom);
+        args.columnWidth = this.isVerticalChart ? rect.height : rect.width;
+        // ISSUE: If the strokeThickness property is not provided,
+        // the fill will be disappeared with large zoom (when the column width will be small or zero)
+        // if (args.columnWidth === 0 && this.strokeThickness === 0) {
+        //     strokePenCache = this.strokePenFillColoredCache;
+        // }
+        if (linesPen) {
+            args.SetLinesPen(linesPen);
+        }
+        if (fillBrush) {
+            args.SetFillBrush(fillBrush);
+        }
+        args.viewportWidth = viewRect.width;
+        args.viewportHeight = viewRect.height;
+        var xMid = this.isVerticalChart ? (rect.top + rect.bottom) / 2 : (rect.left + rect.right) / 2;
+        var xVal = xCalc.getDataValue(xMid);
+        var xValues = new webAssemblyContext.SCRTDoubleVector();
+        xValues.push_back(xVal);
+        var yVal = this.isVerticalChart ? yCalc.getDataValue(rect.right) : yCalc.getDataValue(rect.top);
+        var yValues = new webAssemblyContext.SCRTDoubleVector();
+        yValues.push_back(yVal);
+        args.count = yValues.size();
+        var nativeContext = renderContext.getNativeContext();
+        nativeContext.PushMatrix();
+        nativeContext.PushState();
+        nativeContext.Translate(viewRect.x, viewRect.y);
+        nativeContext.SetClipRect(viewRect.x, viewRect.y, viewRect.width, viewRect.height);
+        this.nativeDrawingProvider.DrawPointsVec(nativeContext, xValues, yValues, xCalc.nativeCalculator, yCalc.nativeCalculator, args);
+        nativeContext.PopMatrix();
+        nativeContext.PopState();
+        xValues.delete();
+        yValues.delete();
+        args.delete();
+    };
     return BoxAnnotation;
 }(RenderContextAnnotationBase_1.RenderContextAnnotationBase));
 exports.BoxAnnotation = BoxAnnotation;

package/Charting/Visuals/SciChartPieSurface/SciChartPieSurface.js

@@ -824,6 +824,9 @@ var getSectorPath = function (x, y, outerRadius, a1, a2, delta) {
     var cy1 = Math.sin(DEG_TO_RAD * a2) * outerRadius + y + deltaY;
     var cx2 = Math.cos(DEG_TO_RAD * a1) * outerRadius + x + deltaX;
     var cy2 = Math.sin(DEG_TO_RAD * a1) * outerRadius + y + deltaY;
+    if (Math.abs(cx1 - cx2) < 0.0001) {
+        cx2 += 0.001;
+    }
     return "M".concat(x + deltaX, " ").concat(y + deltaY, " ").concat(cx1, " ").concat(cy1, " A").concat(outerRadius, " ").concat(outerRadius, " 0 ").concat(bigArc, " 0 ").concat(cx2, " ").concat(cy2, "Z");
 };
 /**

package/Core/BuildStamp.d.ts

@@ -1,4 +1,4 @@
 import { TSciChart } from "../types/TSciChart";
 import { TSciChart3D } from "../types/TSciChart3D";
-export declare const libraryVersion = "2.2.2410";
+export declare const libraryVersion = "2.2.2415";
 export declare const checkBuildStamp: (wasmContext: TSciChart | TSciChart3D) => boolean;

package/Core/BuildStamp.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkBuildStamp = exports.libraryVersion = void 0;
-var buildStamp = "2022-08-23T00:00:00";
+var buildStamp = "2022-09-15T00:00:00";
 var result;
 // tslint:disable-next-line:no-var-requires
-exports.libraryVersion = "2.2.2410";
+exports.libraryVersion = "2.2.2415";
 var checkBuildStamp = function (wasmContext) {
     if (result !== undefined)
         return result;

package/Core/Mouse/MouseManager.js

@@ -81,8 +81,8 @@ var MouseManager = /** @class */ (function () {
      * @param event The {@link PointerEvent}
      */
     MouseManager.prototype.onPointerDown = function (event) {
-        // prevent default browser actions (like fast scroll for mouse wheel click and dragging of selected elements)
-        event.preventDefault();
+        // To prevent default browser actions (like fast scroll for mouse wheel click and dragging of selected elements)
+        // call args.nativeEvent.preventDefault() in the chart modifier instead of calling event.preventDefault() here
         var modifierEvent = ModifierMouseArgs_1.ModifierMouseArgs.fromPointerEvent(event);
         this.modifierMouseDown(modifierEvent);
     };