@devexperts/dxcharts-lite 2.1.0 → 2.3.0

package/dist/chart/model/scale.model.js

@@ -8,7 +8,7 @@ import { startViewportModelAnimation } from '../animation/viewport-model-animati
 import { cloneUnsafe } from '../utils/object.utils';
 import { AutoScaleViewportSubModel } from './scaling/auto-scale.model';
 import { zoomConstraint } from './scaling/constrait.functions';
-import { lockedYEndViewportCalculator, ratioFromZoomXY } from './scaling/lock-ratio.model';
+import { changeXToKeepRatio, changeYToKeepRatio, ratioFromZoomXY } from './scaling/lock-ratio.model';
 import { moveXStart, moveYStart } from './scaling/move-chart.functions';
 import { ViewportModel, compareStates } from './scaling/viewport.model';
 import { zoomXToEndViewportCalculator, zoomXToPercentViewportCalculator } from './scaling/x-zooming.functions';
@@ -81,7 +81,7 @@ export class ScaleModel extends ViewportModel {
      * @param forceNoAnimation Whether to skip animation.
      * @param zoomSensitivity The sensitivity of the zoom.
      */
-    zoomXToPercent(viewportPercent, zoomIn, forceNoAnimation = false, zoomSensitivity = this.config.scale.zoomSensitivity) {
+    zoomXToPercent(viewportPercent, zoomIn, forceNoAnimation = false, zoomSensitivity) {
         const disabledAnimations = this.config.scale.disableAnimations || forceNoAnimation;
         if (disabledAnimations) {
             this.haltAnimation();
@@ -96,7 +96,7 @@ export class ScaleModel extends ViewportModel {
      * @param zoomIn - If true, the chart will be zoomed in. If false, the chart will be zoomed out.
      * @param zoomSensitivity - The sensitivity of the zoom. Default value is taken from the configuration object.
      */
-    zoomXToEnd(zoomIn, zoomSensitivity = this.config.scale.zoomSensitivity) {
+    zoomXToEnd(zoomIn, zoomSensitivity) {
         if (this.config.scale.disableAnimations) {
             this.haltAnimation();
         }
@@ -116,7 +116,7 @@ export class ScaleModel extends ViewportModel {
         const initialStateCopy = Object.assign({}, state);
         const constrainedState = this.scalePostProcessor(initialStateCopy, state);
         if (this.state.lockPriceToBarRatio) {
-            lockedYEndViewportCalculator(constrainedState, this.zoomXYRatio);
+            changeYToKeepRatio(constrainedState, this.zoomXYRatio);
         }
         if (this.state.auto) {
             this.autoScaleModel.doAutoYScale(constrainedState);
@@ -142,13 +142,31 @@ export class ScaleModel extends ViewportModel {
         const state = this.export();
         const constrainedState = this.scalePostProcessor(initialState, state);
         if (this.state.lockPriceToBarRatio) {
-            lockedYEndViewportCalculator(constrainedState, this.zoomXYRatio);
+            changeYToKeepRatio(constrainedState, this.zoomXYRatio);
         }
         if (this.state.auto) {
             this.autoScaleModel.doAutoYScale(constrainedState);
         }
         this.apply(constrainedState);
     }
+    setYScale(yStart, yEnd, fire = false) {
+        const initialState = this.export();
+        super.setYScale(yStart, yEnd, fire);
+        const state = this.export();
+        const constrainedState = this.scalePostProcessor(initialState, state);
+        if (this.state.lockPriceToBarRatio) {
+            changeXToKeepRatio(constrainedState, this.zoomXYRatio);
+            this.setXScale(constrainedState.xStart, constrainedState.xEnd);
+            // TODO: rewrite logic for applying constraints to consider both axes, now constraints on Y may not work correctly
+            return;
+        }
+        else {
+            if (this.state.auto) {
+                this.autoScaleModel.doAutoYScale(constrainedState);
+            }
+            this.apply(constrainedState);
+        }
+    }
     /**
      * Moves both xStart and xEnd without changing the viewport width (zoom).
      * Works without animation.

package/dist/chart/model/scaling/constrait.functions.d.ts

@@ -32,7 +32,7 @@ export declare const candleEdgesConstrait: (state: ViewportModelState, visualCan
  * @returns
  * @doc-tags viewport,zoom,scaling
  */
-export declare const zoomConstraint: (initialState: ViewportModelState, state: ViewportModelState, chartConfig: ChartConfigComponentsChart, boundsProvider: BoundsProvider) => {
+export declare const zoomConstraint: (_: ViewportModelState, state: ViewportModelState, chartConfig: ChartConfigComponentsChart, boundsProvider: BoundsProvider) => {
     xStart: number;
     xEnd: number;
     yStart: number;

package/dist/chart/model/scaling/constrait.functions.js

@@ -40,7 +40,7 @@ export const candleEdgesConstrait = (state, visualCandlesCoordinates, candleLimi
  * @returns
  * @doc-tags viewport,zoom,scaling
  */
-export const zoomConstraint = (initialState, state, chartConfig, boundsProvider) => {
+export const zoomConstraint = (_, state, chartConfig, boundsProvider) => {
     const newState = Object.assign({}, state);
     const bounds = boundsProvider();
     // 1 - is an average candle width: newXEnd - newXStart = avg candles amount in the viewport
@@ -56,7 +56,6 @@ export const zoomConstraint = (initialState, state, chartConfig, boundsProvider)
             return newState;
         }
         if (minViewportReached) {
-            newState.xEnd = initialState.xEnd;
             newState.xStart = newState.xEnd - chartConfig.minCandles;
             newState.zoomX = calculateZoom(newState.xEnd - newState.xStart, bounds.width);
             return newState;

package/dist/chart/model/scaling/lock-ratio.model.d.ts

@@ -9,8 +9,14 @@ export declare const ratioFromZoomXY: (zoomX: Zoom, zoomY: Zoom) => ZoomXToZoomY
 export declare const zoomXToZoomY: (zoomX: Zoom, ratio: ZoomXToZoomYRatio) => Zoom;
 export declare const zoomYToZoomX: (zoomY: Zoom, ratio: ZoomXToZoomYRatio) => Zoom;
 /**
- * Locks the zoomY with zoomX and moves yEnd according to ratio changes.
+ * Locks the zoomY with zoomX and zooms y-scale depending on x-scale.
  * @param state
  * @param zoomXYRatio
  */
-export declare const lockedYEndViewportCalculator: (state: ViewportModelState, zoomXYRatio: ZoomXToZoomYRatio) => void;
+export declare const changeYToKeepRatio: (state: ViewportModelState, zoomXYRatio: ZoomXToZoomYRatio) => void;
+/**
+ *  Locks the zoomY with zoomX and zooms x-scale depending on y-scale.
+ * @param state
+ * @param zoomXYRatio
+ */
+export declare const changeXToKeepRatio: (state: ViewportModelState, zoomXYRatio: ZoomXToZoomYRatio) => void;

package/dist/chart/model/scaling/lock-ratio.model.js

@@ -7,16 +7,31 @@ export const ratioFromZoomXY = (zoomX, zoomY) => zoomX / zoomY;
 export const zoomXToZoomY = (zoomX, ratio) => zoomX / ratio;
 export const zoomYToZoomX = (zoomY, ratio) => zoomY * ratio;
 /**
- * Locks the zoomY with zoomX and moves yEnd according to ratio changes.
+ * Locks the zoomY with zoomX and zooms y-scale depending on x-scale.
  * @param state
  * @param zoomXYRatio
  */
-export const lockedYEndViewportCalculator = (state, zoomXYRatio) => {
+export const changeYToKeepRatio = (state, zoomXYRatio) => {
     const prevZoomY = state.zoomY;
     state.zoomY = zoomXToZoomY(state.zoomX, zoomXYRatio);
     const zoomYMult = state.zoomY / prevZoomY;
     const lastYHeight = state.yEnd - state.yStart;
     const newYHeight = lastYHeight * zoomYMult;
     const delta = newYHeight - lastYHeight;
-    state.yEnd = state.yEnd + delta;
+    state.yEnd = state.yEnd + delta / 2;
+    state.yStart = state.yStart - delta / 2;
+};
+/**
+ *  Locks the zoomY with zoomX and zooms x-scale depending on y-scale.
+ * @param state
+ * @param zoomXYRatio
+ */
+export const changeXToKeepRatio = (state, zoomXYRatio) => {
+    const prevZoomX = state.zoomX;
+    state.zoomX = zoomYToZoomX(state.zoomY, zoomXYRatio);
+    const zoomXMult = state.zoomX / prevZoomX;
+    const lastXWidth = state.xEnd - state.xStart;
+    const newXWidth = lastXWidth * zoomXMult;
+    const delta = newXWidth - lastXWidth;
+    state.xStart = state.xStart - delta;
 };

package/dist/chart/utils/device/touchpad.utils.d.ts

@@ -3,7 +3,7 @@
  * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
  * If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
-import { FullChartConfig } from '../../chart.config';
+import { PriceAxisType } from '../../components/labels_generator/numeric-axis-labels.generator';
 export declare const isFirefox: boolean;
 /**
  * this function determines whether the event was triggered with the mouse or the touchpad
@@ -20,11 +20,11 @@ export declare const isFirefox: boolean;
  */
 export declare const touchpadDetector: (e: WheelEvent) => boolean;
 /**
- * this function returns different ящщь sensitivity for the percent axis and the others
+ * this function returns different zoom sensitivity for the percent axis and the others
  * @param config
  * @param isTouchpad
  * @returns {number}
  *
  * @doc-tags chart-core, zoom
  */
-export declare const getTouchpadSensitivity: (config: FullChartConfig) => number;
+export declare const getTouchpadSensitivity: (type: PriceAxisType, zoomSensitivity: number) => number;

package/dist/chart/utils/device/touchpad.utils.js

@@ -82,15 +82,13 @@ export const touchpadDetector = (e) => {
     return isTouchpad;
 };
 /**
- * this function returns different ящщь sensitivity for the percent axis and the others
+ * this function returns different zoom sensitivity for the percent axis and the others
  * @param config
  * @param isTouchpad
  * @returns {number}
  *
  * @doc-tags chart-core, zoom
  */
-export const getTouchpadSensitivity = (config) => {
-    const isPercentAxisType = config.components.yAxis.type === 'percent';
-    const zoomSensitivity = isPercentAxisType ? config.scale.zoomSensitivity / 4 : config.scale.zoomSensitivity;
-    return zoomSensitivity;
+export const getTouchpadSensitivity = (type, zoomSensitivity) => {
+    return type === 'percent' ? zoomSensitivity / 4 : zoomSensitivity;
 };

package/dist/chart/utils/math.utils.d.ts

@@ -3,7 +3,6 @@
  * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
  * If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
-export declare const MAX_DECIMAL_DIGITS = 14;
 export type NumberFormatLabels = 'K' | 'M' | 'B';
 export declare class MathUtils {
     static roundToNearest(value: number, precision: number): number;

package/dist/chart/utils/math.utils.js

@@ -3,7 +3,7 @@
  * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
  * If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
-export const MAX_DECIMAL_DIGITS = 14;
+const MAX_DECIMAL_DIGITS = 14;
 // Array of powers of 10. Used in roundDecimal to walk through mantissa.
 const POW10 = [];
 for (let i = 0; i < MAX_DECIMAL_DIGITS + 1; i++) {