@devexperts/dxcharts-lite 2.5.6 → 2.5.7

package/dist/chart/model/scale.model.d.ts

@@ -25,8 +25,8 @@ export declare const getDefaultHighLowWithIndex: () => HighLowWithIndex;
 export type ViewportPercent = number;
 type Constraints = (initialState: ViewportModelState, state: ViewportModelState) => ViewportModelState;
 export interface ZoomReached {
-    max: boolean;
-    min: boolean;
+    zoomIn: boolean;
+    zoomOut: boolean;
 }
 /**
  * The ScaleModel class represents the state of a chart's scale, including the current viewport, zoom level, and auto-scaling settings.
@@ -86,8 +86,8 @@ export declare class ScaleModel extends ViewportModel {
     haltAnimation(): void;
     private zoomXTo;
     calculateZoomReached(zoomX: Unit, zoomIn?: boolean): {
-        max: boolean;
-        min: boolean;
+        zoomIn: boolean;
+        zoomOut: boolean;
     };
     /**
      * Moves the viewport to exactly xStart..xEnd place.

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

@@ -36,7 +36,7 @@ export class ScaleModel extends ViewportModel {
         this.scaleInversedSubject = new Subject();
         // y-axis component needs this subject in order to halt prev animation if axis type is percent
         this.beforeStartAnimationSubject = new Subject();
-        this.zoomReached = { min: false, max: false };
+        this.zoomReached = { zoomIn: false, zoomOut: false };
         // TODO rework, make a new history based on units
         this.history = [];
         this.xConstraints = [];
@@ -128,7 +128,7 @@ export class ScaleModel extends ViewportModel {
         const initialStateCopy = Object.assign({}, state);
         const constrainedState = this.scalePostProcessor(initialStateCopy, state);
         this.zoomReached = this.calculateZoomReached(constrainedState.zoomX, zoomIn);
-        if (this.zoomReached.max || this.zoomReached.min) {
+        if (this.zoomReached.zoomIn || this.zoomReached.zoomOut) {
             return;
         }
         if (this.state.lockPriceToBarRatio) {
@@ -148,15 +148,17 @@ export class ScaleModel extends ViewportModel {
         const chartWidth = this.getBounds().width;
         const delta = 0.001; // zoom values are very precise and should be compared with some precision delta
         if (chartWidth > 0) {
-            const maxZoomReached = zoomX - calculateZoom(this.config.components.chart.minCandles, chartWidth) <= delta;
-            // max zoom reached and trying to zoom in further
-            const maxZoomDisabled = maxZoomReached && zoomIn;
-            const minZoomReached = zoomX - calculateZoom(chartWidth / this.config.components.chart.minWidth, chartWidth) >= delta;
-            // min zoom reached and trying to zoom out further
-            const minZoomDisabled = minZoomReached && !zoomIn;
-            return { max: maxZoomDisabled, min: minZoomDisabled };
+            const maxZoomIn = calculateZoom(this.config.components.chart.minCandles, chartWidth);
+            const maxZoomInReached = zoomX !== maxZoomIn && zoomX - maxZoomIn <= delta;
+            // max zoom in reached and trying to zoom in further
+            const maxZoomInDisabled = maxZoomInReached && zoomIn;
+            const maxZoomOut = calculateZoom(chartWidth / this.config.components.chart.minWidth, chartWidth);
+            const maxZoomOutReached = zoomX - maxZoomOut >= delta;
+            // max zoom out reached and trying to zoom out further
+            const maxZoomOutDisabled = maxZoomOutReached && !zoomIn;
+            return { zoomIn: maxZoomInDisabled, zoomOut: maxZoomOutDisabled };
         }
-        return { max: false, min: false };
+        return { zoomIn: false, zoomOut: false };
     }
     /**
      * Moves the viewport to exactly xStart..xEnd place.
@@ -176,7 +178,7 @@ export class ScaleModel extends ViewportModel {
         const constrainedState = this.scalePostProcessor(initialState, state);
         const zoomIn = constrainedState.xEnd - constrainedState.xStart < initialState.xEnd - initialState.xStart;
         this.zoomReached = this.calculateZoomReached(zoomX, zoomIn);
-        if (this.zoomReached.max || this.zoomReached.min) {
+        if (this.zoomReached.zoomIn || this.zoomReached.zoomOut) {
             return;
         }
         if (this.state.lockPriceToBarRatio) {
@@ -212,7 +214,7 @@ export class ScaleModel extends ViewportModel {
     }
     setLockedYScale(yStart, yEnd, fire = false, initialState) {
         const zoomIn = yEnd < initialState.yEnd;
-        if ((this.zoomReached.min && zoomIn === false) || (this.zoomReached.max && zoomIn === true)) {
+        if ((this.zoomReached.zoomOut && zoomIn === false) || (this.zoomReached.zoomIn && zoomIn === true)) {
             return;
         }
         super.setYScale(yStart, yEnd, fire);

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

@@ -3,4 +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 declare const isHex: (color: string) => RegExpExecArray | null;
+export declare const isRgb: (color: string) => RegExpExecArray | null;
+export declare const isRgba: (color: string) => RegExpExecArray | null;
 export declare function toRGBA(color: string, alpha: number): string;

package/dist/chart/utils/color.utils.js

@@ -5,8 +5,12 @@
  */
 const HEX_COLOR_REGEXP = /^(#)([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})$/i;
 const RGB_COLOR_REGEXP = /^\s*(rgba?)\s*[(]\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*[\d.]+\s*)?[)]\s*$/i;
+const RGBA_COLOR_REGEXP = /^rgba[(](?:\s*0*(?:\d\d?(?:\.\d+)?(?:\s*%)?|\.\d+\s*%|100(?:\.0*)?\s*%|(?:1\d\d|2[0-4]\d|25[0-5])(?:\.\d+)?)\s*,){3}\s*0*(?:\.\d+|1(?:\.0*)?)\s*[)]$/;
+export const isHex = (color) => HEX_COLOR_REGEXP.exec(color);
+export const isRgb = (color) => RGB_COLOR_REGEXP.exec(color);
+export const isRgba = (color) => RGBA_COLOR_REGEXP.exec(color);
 function parseColor(color) {
-    const match = HEX_COLOR_REGEXP.exec(color) || RGB_COLOR_REGEXP.exec(color);
+    const match = isHex(color) || isRgb(color);
     let colors = [];
     if (match) {
         colors = match.slice(2, 5);