@devexperts/dxcharts-lite 2.4.5 → 2.4.6

package/dist/chart/inputlisteners/canvas-input-listener.component.js

@@ -8,7 +8,6 @@ import { merge, Subject } from 'rxjs';
 import { ChartBaseElement } from '../model/chart-base-element';
 import { distinctUntilChanged, filter, map, tap } from 'rxjs/operators';
 import { EVENT_RESIZED } from '../events/events';
-import { touchpadDetector } from '../utils/device/touchpad.utils';
 import { deviceDetector } from '../utils/device/device-detector.utils';
 /**
  * Gathers user input on canvas element:
@@ -53,8 +52,6 @@ class CanvasInputListenerComponent extends ChartBaseElement {
         this.longTouchStartSubject = new Subject();
         this.longTouchEndSubject = new Subject();
         this.contextMenuSubject = new Subject();
-        this.pinchSubject = new Subject();
-        this.scrollGestureSubject = new Subject();
         this.fastTouchScroll = new Subject();
         this.mouseLeavesCanvasSubject = new Subject();
         // point at which start dragging
@@ -269,20 +266,7 @@ class CanvasInputListenerComponent extends ChartBaseElement {
         this.addSubscription(subscribeListener(this.element, (e) => this.touchEndSubject.next(e), 'touchend'));
         this.addSubscription(subscribeListener(this.element, (e) => this.touchCancelSubject.next(e), 'touchcancel'));
         this.addSubscription(subscribeListener(this.element, (e) => {
-            // pinch gesture, we needs the same behaviour as mouse wheel
-            if (e.ctrlKey) {
-                this.pinchSubject.next(e);
-            }
-            else {
-                // mouse wheel or scroll gesture
-                const isTouchpad = touchpadDetector(e);
-                if (isTouchpad) {
-                    this.scrollGestureSubject.next(e);
-                }
-                else {
-                    this.wheelSubject.next(e);
-                }
-            }
+            this.wheelSubject.next(e);
             e.preventDefault(); // to disable the scroll over the document, if for example chart is used as widget
         }, 'wheel'));
         this.addSubscription(subscribeListener(this.element, (e) => this.contextMenuSubject.next(e), 'contextmenu'));
@@ -557,24 +541,6 @@ class CanvasInputListenerComponent extends ChartBaseElement {
             .asObservable()
             .pipe(filter(() => hitBoundsTest(this.currentPoint.x, this.currentPoint.y)));
     }
-    /**
-     * Returns an Observable that emits WheelEvent when a pinch event occurs and the hitBoundsTest function returns true for the current point.
-     * @param {HitBoundsTest} hitBoundsTest - A function that takes the current point's x and y coordinates as arguments and returns a boolean indicating whether the point is within the desired bounds.
-     * @returns {Observable<WheelEvent>} - An Observable that emits WheelEvent when a pinch event occurs and the hitBoundsTest function returns true for the current point.
-     */
-    observePinch(hitBoundsTest = () => true) {
-        return this.pinchSubject
-            .asObservable()
-            .pipe(filter(() => hitBoundsTest(this.currentPoint.x, this.currentPoint.y)));
-    }
-    /**
-     * Returns an Observable that emits a WheelEvent whenever a scroll gesture is detected.
-     * The Observable is created from a Subject that is subscribed to by the component's template.
-     * @returns {Observable<WheelEvent>} An Observable that emits a WheelEvent whenever a scroll gesture is detected.
-     */
-    observeScrollGesture() {
-        return this.scrollGestureSubject.asObservable();
-    }
     /**
      * Returns an Observable that emits TouchEvent when a touchstart event occurs within the bounds of the current point.
      * @param {HitBoundsTest} [hitBoundsTest=() => true] - A function that tests if the touch event occurred within the bounds of the current point.

package/dist/chart/model/candle-series.model.d.ts

@@ -12,7 +12,7 @@ import EventBus from '../events/event-bus';
 import { DeepPartial } from '../utils/object.utils';
 import { Candle } from './candle.model';
 import { DataSeriesType } from './data-series.config';
-import { DataSeriesModel } from './data-series.model';
+import { DataSeriesModel, DataSeriesViewportIndexes } from './data-series.model';
 import { HighLowWithIndex, ScaleModel } from './scale.model';
 import { Unit } from './scaling/viewport.model';
 import VisualCandle from './visual-candle';
@@ -44,6 +44,15 @@ export declare class CandleSeriesModel extends DataSeriesModel<Candle, VisualCan
      * @returns {void}
      */
     recalculateDataViewportIndexes(xStart?: number, xEnd?: number): void;
+    /**
+     * Calculates and returns the indexes of the start and end points of the data viewport,
+     * based on the given start and end units on the x-axis.
+     *
+     * @param {Unit} xStart - The start value of the viewport on the x-axis.
+     * @param {Unit} xEnd - The end value of the viewport on the x-axis.
+     * @returns {DataSeriesViewportIndexes} An object containing the calculated start and end indexes of the data viewport.
+     */
+    calculateDataViewportIndexes(xStart: Unit, xEnd: Unit): DataSeriesViewportIndexes;
     /**
      * Calculates the price movement of the last candle by comparing the open and close prices.
      * Sets the lastPriceMovement property of the instance with the name of the direction of the price movement.

package/dist/chart/model/candle-series.model.js

@@ -7,7 +7,7 @@ import { Subject } from 'rxjs';
 import { getDefaultConfig } from '../chart.config';
 import { defaultCandleTransformer } from '../components/chart/candle-transformer.functions';
 import { calculateCandleWidth } from '../components/chart/candle-width-calculator.functions';
-import { lastOf } from '../utils/array.utils';
+import { binarySearch, lastOf } from '../utils/array.utils';
 import { merge } from '../utils/merge.utils';
 import { PriceIncrementsUtils } from '../utils/price-increments.utils';
 import { calculateCandlesHighLow, createCandleSeriesHighLowProvider } from './candle-series-high-low.provider';
@@ -58,10 +58,28 @@ export class CandleSeriesModel extends DataSeriesModel {
      * @returns {void}
      */
     recalculateDataViewportIndexes(xStart = this.scale.xStart, xEnd = this.scale.xEnd) {
-        super.recalculateDataViewportIndexes(xStart, xEnd);
+        const { dataIdxStart, dataIdxEnd } = this.calculateDataViewportIndexes(xStart, xEnd);
+        this.dataIdxStart = dataIdxStart;
+        this.dataIdxEnd = dataIdxEnd;
         this.recalculateZippedHighLow();
         this.eventBus.fireDraw();
     }
+    /**
+     * Calculates and returns the indexes of the start and end points of the data viewport,
+     * based on the given start and end units on the x-axis.
+     *
+     * @param {Unit} xStart - The start value of the viewport on the x-axis.
+     * @param {Unit} xEnd - The end value of the viewport on the x-axis.
+     * @returns {DataSeriesViewportIndexes} An object containing the calculated start and end indexes of the data viewport.
+     */
+    calculateDataViewportIndexes(xStart, xEnd) {
+        const dataIdxStart = binarySearch(this.visualPoints, xStart, (it) => it.startUnit).index;
+        const dataIdxEnd = binarySearch(this.visualPoints, xEnd, (it) => it.startUnit).index;
+        return {
+            dataIdxStart,
+            dataIdxEnd,
+        };
+    }
     /**
      * Calculates the price movement of the last candle by comparing the open and close prices.
      * Sets the lastPriceMovement property of the instance with the name of the direction of the price movement.

package/dist/chart/model/data-series.model.js

@@ -138,7 +138,9 @@ export class DataSeriesModel extends ChartBaseElement {
     }
     doActivate() {
         this.addRxSubscription(this.scale.xChanged.subscribe(() => this.recalculateDataViewportIndexes()));
-        this.addRxSubscription(this.scale.scaleInversedSubject.subscribe(() => { this.recalculateVisualPoints(); }));
+        this.addRxSubscription(this.scale.scaleInversedSubject.subscribe(() => {
+            this.recalculateVisualPoints();
+        }));
     }
     /**
      * Sets the data points and recalculates internal state
@@ -215,8 +217,8 @@ export class DataSeriesModel extends ChartBaseElement {
      * @returns {DataSeriesViewportIndexes} An object containing the calculated start and end indexes of the data viewport.
      */
     calculateDataViewportIndexes(xStart, xEnd) {
-        const dataIdxStart = binarySearch(this.visualPoints, xStart, i => i.centerUnit).index;
-        const dataIdxEnd = binarySearch(this.visualPoints, xEnd, i => i.centerUnit).index;
+        const dataIdxStart = binarySearch(this.visualPoints, xStart, (i) => i.centerUnit).index;
+        const dataIdxEnd = binarySearch(this.visualPoints, xEnd, (i) => i.centerUnit).index;
         return {
             dataIdxStart,
             dataIdxEnd,

package/dist/chart/utils/timezone.utils.js

@@ -35,10 +35,10 @@ export function getDateTimeFormat(timeZone) {
 export const getTimezoneOffset = (timeZone, timestamp = Date.now()) => {
     const formatter = getDateTimeFormat(timeZone);
     const dateString = formatter.format(timestamp);
-    // exec() returns  [, fMonth, fDay, fYear, fHour, fMinute]
-    const tokens = /(\d+)\/(\d+)\/(\d+),? (\d+):(\d+)/.exec(dateString);
+    // exec() returns  [, fMonth, fDay, fYear, fHour, fMinute, fSeconds]
+    const tokens = /(\d+)\/(\d+)\/(\d+),? (\d+):(\d+):(\d+)/.exec(dateString);
     if (tokens) {
-        const asUTC = Date.UTC(+tokens[3], +tokens[1] - 1, +tokens[2], +tokens[4] % 24, +tokens[5], 0);
+        const asUTC = Date.UTC(+tokens[3], +tokens[1] - 1, +tokens[2], +tokens[4] % 24, +tokens[5], +tokens[6]);
         let asTimezone = timestamp;
         const over = asTimezone % 1000;
         asTimezone -= over >= 0 ? over : 1000 + over;