cx 26.7.6 → 26.8.0

package/build/charts/LineGraph.d.ts

@@ -29,9 +29,13 @@ export interface LineGraphConfig extends WidgetConfig {
     stack?: StringProp;
     /** Indicate that values should be stacked on top of the other values. Default value is `false`. */
     stacked?: BooleanProp;
-    /** Set to `true` to enable smooth (curved) line rendering. */
+    /**
+     * Set to `true` to enable smooth (curved) line rendering. Uses monotone cubic
+     * interpolation which never overshoots the actual data range, i.e. the curve
+     * stays within the vertical bounds of the data.
+     */
     smooth?: BooleanProp;
-    /** Controls the curvature of smooth lines. Value should be between 0 and 0.4. Default is 0.05. */
+    /** @deprecated Smoothing is based on monotone cubic interpolation and its curvature is not configurable. This property is ignored. */
     smoothingRatio?: NumberProp;
     /** Name of the horizontal axis. Default value is `x`. */
     xAxis?: string;
@@ -96,7 +100,6 @@ export declare class LineGraph extends Widget {
     legendShape: string;
     stack: string;
     smooth: boolean;
-    smoothingRatio: number;
     constructor(config: LineGraphConfig);
     declareData(...args: any[]): void;
     prepareData(context: RenderingContext, instance: LineGraphInstance): void;
@@ -105,19 +108,8 @@ export declare class LineGraph extends Widget {
     onLegendClick(e: MouseEvent, instance: LineGraphInstance): void;
     calculateLineSpans(context: RenderingContext, instance: LineGraphInstance): LinePoint[][] | null;
     render(context: RenderingContext, instance: LineGraphInstance, key: string): React.ReactNode;
-    getCurvedPathSegment(p: LinePoint, points: LinePoint[], i1: number, i2: number, j1: number, j2: number, r: number, yField?: "y" | "y0"): string;
-    getControlPoint({ cp, pp, np, r, reverse, yField, }: {
-        cp: LinePoint;
-        pp: LinePoint | undefined;
-        np: LinePoint | undefined;
-        r: number;
-        reverse?: boolean;
-        yField?: "y" | "y0";
-    }): [number, number];
-    getLineInfo(p1x: number, p1y: number, p2x: number, p2y: number): {
-        length: number;
-        angle: number;
-    };
+    getMonotoneTangents(span: LinePoint[], yField: "y" | "y0"): number[];
+    getMonotoneSpanPath(span: LinePoint[], yField: "y" | "y0", reverse?: boolean): string;
 }
 export {};
 //# sourceMappingURL=LineGraph.d.ts.map

package/build/charts/LineGraph.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LineGraph.d.ts","sourceRoot":"","sources":["../../src/charts/LineGraph.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"LineGraph.d.ts","sourceRoot":"","sources":["../../src/charts/LineGraph.tsx"],"names":[],"mappings":"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"}

package/build/charts/LineGraph.js

@@ -32,19 +32,12 @@ export class LineGraph extends Widget {
             stack: undefined,
             stacked: undefined,
             smooth: undefined,
-            smoothingRatio: undefined,
         });
     }
     prepareData(context, instance) {
         let { data } = instance;
         if (data.name && !data.colorName)
             data.colorName = data.name;
-        if (data.smooth && data.smoothingRatio != null) {
-            if (data.smoothingRatio < 0)
-                data.smoothingRatio = 0;
-            if (data.smoothingRatio > 0.4)
-                data.smoothingRatio = 0.4;
-        }
         super.prepareData(context, instance);
     }
     explore(context, instance) {
@@ -154,83 +147,98 @@ export class LineGraph extends Widget {
             ["color-" + data.colorIndex]: data.colorIndex != null,
         };
         let line, area;
-        const r = data.smoothingRatio;
         let linePath = "";
         if (data.line) {
             lineSpans.forEach((span) => {
-                span.forEach((p, i) => {
-                    linePath +=
-                        i == 0
-                            ? `M ${p.x} ${p.y}`
-                            : !data.smooth || span.length < 2
-                                ? `L ${p.x} ${p.y}`
-                                : this.getCurvedPathSegment(p, span, i - 1, i - 2, i - 1, i + 1, r);
-                });
+                if (span.length == 0)
+                    return;
+                linePath += `M ${span[0].x} ${span[0].y}`;
+                if (data.smooth && span.length >= 2)
+                    linePath += this.getMonotoneSpanPath(span, "y");
+                else
+                    span.forEach((p, i) => {
+                        if (i > 0)
+                            linePath += `L ${p.x} ${p.y}`;
+                    });
             });
             line = (_jsx("path", { className: this.CSS.element(this.baseClass, "line", stateMods), style: this.CSS.parseStyle(data.lineStyle), d: linePath }));
         }
         if (data.area) {
             let areaPath = "";
             lineSpans.forEach((span) => {
-                let closePath = "";
-                span.forEach((p, i) => {
-                    let segment = "";
-                    if (i == 0) {
-                        segment = `M ${p.x} ${p.y}`;
-                        // closing point
-                        closePath =
-                            !data.smooth || span.length < 2
-                                ? `L ${p.x} ${p.y0}`
-                                : this.getCurvedPathSegment(p, span, i + 1, i + 2, i + 1, i - 1, r, "y0");
-                    }
-                    else {
-                        if (!data.smooth) {
-                            segment = `L ${p.x} ${p.y}`;
-                            closePath = `L ${p.x} ${p.y0}` + closePath;
-                        }
-                        else {
-                            segment = this.getCurvedPathSegment(p, span, i - 1, i - 2, i - 1, i + 1, r, "y");
-                            // closing point
-                            if (i < span.length - 1)
-                                closePath = this.getCurvedPathSegment(p, span, i + 1, i + 2, i + 1, i - 1, r, "y0") + closePath;
-                        }
-                    }
-                    areaPath += segment;
-                });
-                areaPath += `L ${span[span.length - 1].x} ${span[span.length - 1].y0}`;
-                areaPath += closePath;
+                if (span.length == 0)
+                    return;
+                let last = span[span.length - 1];
+                areaPath += `M ${span[0].x} ${span[0].y}`;
+                if (data.smooth && span.length >= 2) {
+                    areaPath += this.getMonotoneSpanPath(span, "y");
+                    areaPath += `L ${last.x} ${last.y0}`;
+                    areaPath += this.getMonotoneSpanPath(span, "y0", true);
+                }
+                else {
+                    span.forEach((p, i) => {
+                        if (i > 0)
+                            areaPath += `L ${p.x} ${p.y}`;
+                    });
+                    areaPath += `L ${last.x} ${last.y0}`;
+                    for (let i = span.length - 2; i >= 0; i--)
+                        areaPath += `L ${span[i].x} ${span[i].y0}`;
+                }
                 areaPath += "Z";
             });
             area = (_jsx("path", { className: this.CSS.element(this.baseClass, "area", stateMods), style: this.CSS.parseStyle(data.areaStyle), d: areaPath }));
         }
         return (_jsxs("g", { className: data.classNames, children: [line, area] }, key));
     }
-    getCurvedPathSegment(p, points, i1, i2, j1, j2, r, yField = "y") {
-        const [sx, sy] = this.getControlPoint({ cp: points[i1], pp: points[i2], r, np: p, yField });
-        const [ex, ey] = this.getControlPoint({ cp: p, pp: points[j1], np: points[j2], r, reverse: true, yField });
-        return `C ${sx} ${sy}, ${ex} ${ey}, ${p.x} ${p[yField]}`;
-    }
-    getControlPoint({ cp, pp, np, r, reverse, yField = "y", }) {
-        // When 'current' is the first or last point of the array 'previous' or 'next' don't exist. Replace with 'current'.
-        const p = pp || cp;
-        const n = np || cp;
-        // Properties of the opposed-line
-        let { angle, length } = this.getLineInfo(p.x, p[yField], n.x, n[yField]);
-        // If it is end-control-point, add PI to the angle to go backward
-        angle = angle + (reverse ? Math.PI : 0);
-        length = length * r;
-        // The control point position is relative to the current point
-        const x = cp.x + Math.cos(angle) * length;
-        const y = cp[yField] + Math.sin(angle) * length;
-        return [x, y];
-    }
-    getLineInfo(p1x, p1y, p2x, p2y) {
-        const lengthX = p2x - p1x;
-        const lengthY = p2y - p1y;
-        return {
-            length: Math.sqrt(Math.pow(lengthX, 2) + Math.pow(lengthY, 2)),
-            angle: Math.atan2(lengthY, lengthX),
+    // Fritsch-Carlson monotone cubic interpolation. Tangents are limited so the
+    // curve between two points never leaves their vertical range (no overshoot).
+    getMonotoneTangents(span, yField) {
+        const n = span.length;
+        const m = new Array(n).fill(0);
+        if (n < 2)
+            return m;
+        const secant = (i) => {
+            const h = span[i + 1].x - span[i].x;
+            return h != 0 ? (span[i + 1][yField] - span[i][yField]) / h : 0;
         };
+        if (n == 2) {
+            m[0] = m[1] = secant(0);
+            return m;
+        }
+        for (let i = 1; i < n - 1; i++) {
+            const h0 = span[i].x - span[i - 1].x;
+            const h1 = span[i + 1].x - span[i].x;
+            const s0 = secant(i - 1);
+            const s1 = secant(i);
+            const p = (s0 * h1 + s1 * h0) / (h0 + h1);
+            m[i] = (Math.sign(s0) + Math.sign(s1)) * Math.min(Math.abs(s0), Math.abs(s1), 0.5 * Math.abs(p)) || 0;
+        }
+        const hFirst = span[1].x - span[0].x;
+        m[0] = hFirst != 0 ? (3 * secant(0) - m[1]) / 2 : m[1];
+        const hLast = span[n - 1].x - span[n - 2].x;
+        m[n - 1] = hLast != 0 ? (3 * secant(n - 2) - m[n - 2]) / 2 : m[n - 2];
+        return m;
+    }
+    // Emits cubic bezier segments for the whole span using monotone tangents.
+    // Assumes the path cursor is at the first (or last, when reversed) span point.
+    getMonotoneSpanPath(span, yField, reverse) {
+        const m = this.getMonotoneTangents(span, yField);
+        let path = "";
+        if (!reverse)
+            for (let i = 1; i < span.length; i++) {
+                const p0 = span[i - 1];
+                const p1 = span[i];
+                const dx = (p1.x - p0.x) / 3;
+                path += `C ${p0.x + dx} ${p0[yField] + dx * m[i - 1]}, ${p1.x - dx} ${p1[yField] - dx * m[i]}, ${p1.x} ${p1[yField]}`;
+            }
+        else
+            for (let i = span.length - 1; i > 0; i--) {
+                const p0 = span[i - 1];
+                const p1 = span[i];
+                const dx = (p1.x - p0.x) / 3;
+                path += `C ${p1.x - dx} ${p1[yField] - dx * m[i]}, ${p0.x + dx} ${p0[yField] + dx * m[i - 1]}, ${p0.x} ${p0[yField]}`;
+            }
+        return path;
     }
 }
 LineGraph.prototype.xAxis = "x";
@@ -249,6 +257,5 @@ LineGraph.prototype.legendShape = "rect";
 LineGraph.prototype.stack = "stack";
 LineGraph.prototype.hiddenBase = false;
 LineGraph.prototype.smooth = false;
-LineGraph.prototype.smoothingRatio = 0.05;
 LineGraph.prototype.styled = true;
 Widget.alias("line-graph", LineGraph);

package/build/charts/axis/NumericAxis.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NumericAxis.d.ts","sourceRoot":"","sources":["../../../src/charts/axis/NumericAxis.tsx"],"names":[],"mappings":"AAAA,6BAA6B;AAE7B,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAKxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAGpE,MAAM,WAAW,iBAAkB,SAAQ,UAAU;IAClD,qBAAqB;IACrB,GAAG,CAAC,EAAE,UAAU,CAAC;IAEjB,qBAAqB;IACrB,GAAG,CAAC,EAAE,UAAU,CAAC;IAEjB,kDAAkD;IAClD,UAAU,CAAC,EAAE,WAAW,CAAC;IAEzB,uFAAuF;IACvF,YAAY,CAAC,EAAE,UAAU,CAAC;IAE1B,8EAA8E;IAC9E,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,aAAa,CAAC,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAEhC,wNAAwN;IACxN,WAAW,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAExB,oCAAoC;IACpC,MAAM,CAAC,EAAE,UAAU,CAAC;IAEpB,mFAAmF;IACnF,QAAQ,CAAC,EAAE,UAAU,CAAC;IAEtB,mFAAmF;IACnF,aAAa,CAAC,EAAE,UAAU,CAAC;IAE3B,2EAA2E;IAC3E,aAAa,CAAC,EAAE,UAAU,CAAC;IAE3B,iKAAiK;IACjK,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,WAAW,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,qBAAa,WAAY,SAAQ,IAAI;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC;IAC1B,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;gBAEhB,MAAM,EAAE,iBAAiB;IAIrC,IAAI,IAAI,IAAI;IAQZ,WAAW,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAgBjC,YAAY,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,YAAY,GAAG,IAAI;IAIrE,OAAO,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,YAAY,GAAG,IAAI;IAmBhE,MAAM,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,GAAG,KAAK,CAAC,SAAS;IAevF,MAAM,CAAC,EAAE;;;;;;;;;CAMX"}
+{"version":3,"file":"NumericAxis.d.ts","sourceRoot":"","sources":["../../../src/charts/axis/NumericAxis.tsx"],"names":[],"mappings":"AAAA,6BAA6B;AAE7B,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAIxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEpE,MAAM,WAAW,iBAAkB,SAAQ,UAAU;IAClD,qBAAqB;IACrB,GAAG,CAAC,EAAE,UAAU,CAAC;IAEjB,qBAAqB;IACrB,GAAG,CAAC,EAAE,UAAU,CAAC;IAEjB,kDAAkD;IAClD,UAAU,CAAC,EAAE,WAAW,CAAC;IAEzB,uFAAuF;IACvF,YAAY,CAAC,EAAE,UAAU,CAAC;IAE1B,8EAA8E;IAC9E,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,aAAa,CAAC,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAEhC,wNAAwN;IACxN,WAAW,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAExB,oCAAoC;IACpC,MAAM,CAAC,EAAE,UAAU,CAAC;IAEpB,mFAAmF;IACnF,QAAQ,CAAC,EAAE,UAAU,CAAC;IAEtB,mFAAmF;IACnF,aAAa,CAAC,EAAE,UAAU,CAAC;IAE3B,2EAA2E;IAC3E,aAAa,CAAC,EAAE,UAAU,CAAC;IAE3B,iKAAiK;IACjK,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,WAAW,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,qBAAa,WAAY,SAAQ,IAAI;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC;IAC1B,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;gBAEhB,MAAM,EAAE,iBAAiB;IAIrC,IAAI,IAAI,IAAI;IAQZ,WAAW,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAgBjC,YAAY,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,YAAY,GAAG,IAAI;IAIrE,OAAO,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,YAAY,GAAG,IAAI;IAmBhE,MAAM,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,GAAG,KAAK,CAAC,SAAS;IAevF,MAAM,CAAC,EAAE;;;;;;;;;CAMX"}

package/build/charts/axis/NumericAxis.js

@@ -1,10 +1,8 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 /** @jsxImportSource react */
 import { Axis } from "./Axis";
-import { Stack } from "./Stack";
+import { NumericScale } from "./NumericScale";
 import { Format } from "../../util/Format";
-import { isNumber } from "../../util/isNumber";
-import { Console } from "../../util/Console";
 export class NumericAxis extends Axis {
     constructor(config) {
         super(config);
@@ -63,254 +61,3 @@ NumericAxis.prototype.labelDivisor = 1;
 NumericAxis.prototype.minLabelTickSize = 0;
 NumericAxis.prototype.minTickStep = 0;
 Axis.alias("numeric", NumericAxis);
-class NumericScale {
-    min;
-    max;
-    snapToTicks;
-    tickDivisions;
-    minLabelDistance;
-    minLabelTickSize;
-    minTickDistance;
-    minTickStep;
-    tickSizes;
-    normalized;
-    inverted;
-    minValue;
-    maxValue;
-    minValuePadded;
-    maxValuePadded;
-    stacks;
-    lowerDeadZone;
-    upperDeadZone;
-    origin;
-    scale;
-    a;
-    b;
-    shouldUpdate;
-    reset(min, max, snapToTicks, tickDivisions, minTickDistance, minTickStep, minLabelDistance, minLabelTickSize, normalized, inverted, lowerDeadZone, upperDeadZone) {
-        this.min = min;
-        this.max = max;
-        this.snapToTicks = snapToTicks;
-        this.tickDivisions = tickDivisions;
-        this.minLabelDistance = minLabelDistance;
-        this.minLabelTickSize = minLabelTickSize;
-        this.minTickDistance = minTickDistance;
-        this.minTickStep = minTickStep;
-        this.tickSizes = [];
-        this.normalized = normalized;
-        this.inverted = inverted;
-        delete this.minValue;
-        delete this.maxValue;
-        this.stacks = {};
-        this.lowerDeadZone = lowerDeadZone || 0;
-        this.upperDeadZone = upperDeadZone || 0;
-    }
-    map(v, offset = 0) {
-        return this.origin + (v + offset - this.scale.min + this.scale.minPadding) * this.scale.factor;
-    }
-    decodeValue(n) {
-        return n;
-    }
-    encodeValue(v) {
-        return v;
-    }
-    constrainValue(v) {
-        return Math.max(this.scale.min, Math.min(this.scale.max, v));
-    }
-    trackValue(v, offset = 0, constrain = false) {
-        let value = (v - this.origin) / this.scale.factor - offset + this.scale.min - this.scale.minPadding;
-        if (constrain)
-            value = this.constrainValue(v);
-        return value;
-    }
-    hash() {
-        let r = {
-            origin: this.origin,
-            factor: this.scale.factor,
-            min: this.scale.min,
-            max: this.scale.max,
-            minPadding: this.scale.minPadding,
-            maxPadding: this.scale.maxPadding,
-        };
-        r.stacks = Object.keys(this.stacks)
-            .map((s) => this.stacks[s].info?.join(","))
-            .join(":");
-        return r;
-    }
-    isSame(x) {
-        let hash = this.hash();
-        let same = x && !Object.keys(hash).some((k) => x[k] !== hash[k]);
-        this.shouldUpdate = !same;
-        return same;
-    }
-    measure(a, b) {
-        this.a = a;
-        this.b = b;
-        if (this.minValue != null && this.min == null)
-            this.min = this.minValue;
-        if (this.maxValue != null && this.max == null)
-            this.max = this.maxValue;
-        for (let s in this.stacks) {
-            let info = this.stacks[s].measure(this.normalized);
-            let [min, max] = info;
-            if (this.min == null || min < this.min)
-                this.min = min;
-            if (this.max == null || max > this.max)
-                this.max = max;
-            this.stacks[s].info = info;
-        }
-        if (this.min == null)
-            this.min = 0;
-        if (this.max == null)
-            this.max = this.normalized ? 1 : 100;
-        if (this.min == this.max) {
-            if (this.min == 0) {
-                this.min = -1;
-                this.max = 1;
-            }
-            else {
-                let delta = Math.abs(this.min) * 0.1;
-                this.min -= delta;
-                this.max += delta;
-            }
-        }
-        this.origin = this.inverted ? this.b : this.a;
-        this.scale = this.getScale();
-        this.calculateTicks();
-    }
-    getScale(tickSizes) {
-        let { min, max } = this;
-        let smin = min;
-        let smax = max;
-        let tickSize;
-        if (tickSizes && isNumber(this.snapToTicks) && tickSizes.length > 0) {
-            tickSize = tickSizes[Math.min(tickSizes.length - 1, this.snapToTicks)];
-            smin = Math.floor(smin / tickSize) * tickSize;
-            smax = Math.ceil(smax / tickSize) * tickSize;
-        }
-        else {
-            if (this.minValue === min)
-                smin = this.minValuePadded;
-            if (this.maxValue === max)
-                smax = this.maxValuePadded;
-        }
-        let minPadding = this.minValue === min ? Math.max(0, smin - this.minValuePadded) : 0;
-        let maxPadding = this.maxValue === max ? Math.max(0, this.maxValuePadded - smax) : 0;
-        let sign = this.b > this.a ? 1 : -1;
-        let factor = smin < smax
-            ? (Math.abs(this.b - this.a) - this.lowerDeadZone - this.upperDeadZone) /
-                (smax - smin + minPadding + maxPadding)
-            : 0;
-        if (factor < 0)
-            factor = 0;
-        if (factor > 0 && (this.lowerDeadZone > 0 || this.upperDeadZone > 0)) {
-            while (factor * (min - smin) < this.lowerDeadZone)
-                smin -= this.lowerDeadZone / factor;
-            while (factor * (smax - max) < this.upperDeadZone)
-                smax += this.upperDeadZone / factor;
-            if (tickSize > 0 && isNumber(this.snapToTicks)) {
-                smin = Math.floor(smin / tickSize) * tickSize;
-                smax = Math.ceil(smax / tickSize) * tickSize;
-                minPadding = this.minValue === min ? Math.max(0, smin - this.minValuePadded) : 0;
-                maxPadding = this.maxValue === max ? Math.max(0, this.maxValuePadded - smax) : 0;
-            }
-            factor = smin < smax ? Math.abs(this.b - this.a) / (smax - smin + minPadding + maxPadding) : 0;
-        }
-        return {
-            factor: sign * (this.inverted ? -factor : factor),
-            min: smin,
-            max: smax,
-            minPadding,
-            maxPadding,
-        };
-    }
-    acknowledge(value, width = 0, offset = 0) {
-        if (value == null)
-            return;
-        if (this.minValue == null || value < this.minValue) {
-            this.minValue = value;
-            this.minValuePadded = value + offset - width / 2;
-        }
-        if (this.maxValue == null || value > this.maxValue) {
-            this.maxValue = value;
-            this.maxValuePadded = value + offset + width / 2;
-        }
-    }
-    getStack(name) {
-        let s = this.stacks[name];
-        if (!s)
-            s = this.stacks[name] = new Stack();
-        return s;
-    }
-    stacknowledge(name, ordinal, value) {
-        return this.getStack(name).acknowledge(ordinal, value);
-    }
-    stack(name, ordinal, value) {
-        let v = this.getStack(name).stack(ordinal, value);
-        return v != null ? this.map(v) : null;
-    }
-    findTickSize(minPxDist) {
-        return this.tickSizes.find((a) => a >= this.minLabelTickSize && a * Math.abs(this.scale.factor) >= minPxDist);
-    }
-    getTickSizes() {
-        return this.tickSizes;
-    }
-    calculateTicks() {
-        let dist = this.minLabelDistance / Math.abs(this.scale.factor);
-        let unit = Math.pow(10, Math.floor(Math.log10(dist)));
-        let bestLabelDistance = Infinity;
-        let bestTicks = [];
-        let bestScale = this.scale;
-        for (let i = 0; i < this.tickDivisions.length; i++) {
-            let divs = this.tickDivisions[i];
-            let tickSizes = divs.filter((ts) => ts >= this.minTickStep).map((ts) => ts * unit);
-            let scale = this.getScale(tickSizes);
-            tickSizes.forEach((size, level) => {
-                let labelDistance = size * Math.abs(scale.factor);
-                if (labelDistance >= this.minLabelDistance && labelDistance < bestLabelDistance) {
-                    bestScale = scale;
-                    bestTicks = tickSizes;
-                    bestLabelDistance = labelDistance;
-                }
-            });
-        }
-        this.scale = bestScale;
-        this.tickSizes = bestTicks.filter((ts) => ts >= this.minTickStep && ts * Math.abs(bestScale.factor) >= this.minTickDistance);
-        if (this.tickSizes.length > 0) {
-            let max = this.tickSizes[this.tickSizes.length - 1];
-            this.tickSizes.push(2 * max);
-            this.tickSizes.push(5 * max);
-            this.tickSizes.push(10 * max);
-            let min = this.tickSizes[0];
-            let minDist = min * Math.abs(bestScale.factor);
-            if (min / 10 >= this.minTickStep && minDist / 10 >= this.minTickDistance)
-                this.tickSizes.splice(0, 0, min / 10);
-            else if (min / 5 >= this.minTickStep && minDist / 5 >= this.minTickDistance)
-                this.tickSizes.splice(0, 0, min / 5);
-            else if (min / 2 >= this.minTickStep && minDist / 2 >= this.minTickDistance)
-                this.tickSizes.splice(0, 0, min / 2);
-        }
-    }
-    getTicks(tickSizes) {
-        return tickSizes.map((size) => {
-            let start = Math.ceil((this.scale.min - this.scale.minPadding) / size);
-            let end = Math.floor((this.scale.max + this.scale.maxPadding) / size);
-            let result = [];
-            for (let i = start; i <= end; i++)
-                result.push(i * size + 0);
-            return result;
-        });
-    }
-    mapGridlines() {
-        let size = this.tickSizes[0];
-        let start = Math.ceil((this.scale.min - this.scale.minPadding) / size);
-        let end = Math.floor((this.scale.max + this.scale.maxPadding) / size);
-        let result = [];
-        for (let i = start; i <= end; i++)
-            result.push(this.map(i * size));
-        return result;
-    }
-    book() {
-        Console.warn("NumericAxis does not support the autoSize flag for column and bar graphs.");
-    }
-}

package/build/charts/axis/NumericScale.d.ts

@@ -0,0 +1,59 @@
+import { Stack } from "./Stack";
+export declare class NumericScale {
+    min: number;
+    max: number;
+    snapToTicks: number;
+    tickDivisions: number[][];
+    minLabelDistance: number;
+    minLabelTickSize: number;
+    minTickDistance: number;
+    minTickStep: number;
+    tickSizes: number[];
+    normalized: boolean;
+    inverted: boolean;
+    minValue?: number;
+    maxValue?: number;
+    minValuePadded: number;
+    maxValuePadded: number;
+    stacks: Record<string, Stack>;
+    lowerDeadZone: number;
+    upperDeadZone: number;
+    origin: number;
+    scale: {
+        factor: number;
+        min: number;
+        max: number;
+        minPadding: number;
+        maxPadding: number;
+    };
+    a: number;
+    b: number;
+    shouldUpdate: boolean;
+    reset(min: number, max: number, snapToTicks: number, tickDivisions: number[][], minTickDistance: number, minTickStep: number, minLabelDistance: number, minLabelTickSize: number, normalized: boolean, inverted: boolean, lowerDeadZone: number, upperDeadZone: number): void;
+    map(v: number, offset?: number): number;
+    decodeValue(n: number): number;
+    encodeValue(v: number): number;
+    constrainValue(v: number): number;
+    trackValue(v: number, offset?: number, constrain?: boolean): number;
+    hash(): any;
+    isSame(x: any): boolean;
+    measure(a: number, b: number): void;
+    getScale(tickSizes?: number[]): {
+        factor: number;
+        min: number;
+        max: number;
+        minPadding: number;
+        maxPadding: number;
+    };
+    acknowledge(value: number, width?: number, offset?: number): void;
+    getStack(name: string): Stack;
+    stacknowledge(name: string, ordinal: any, value: any): any;
+    stack(name: string, ordinal: any, value: any): number | null;
+    findTickSize(minPxDist: number): number | undefined;
+    getTickSizes(): number[];
+    calculateTicks(): void;
+    getTicks(tickSizes: number[]): number[][];
+    mapGridlines(): number[];
+    book(): void;
+}
+//# sourceMappingURL=NumericScale.d.ts.map

package/build/charts/axis/NumericScale.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"NumericScale.d.ts","sourceRoot":"","sources":["../../../src/charts/axis/NumericScale.ts"],"names":[],"mappings":"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"}