stream-charts 1.2.1 → 2.0.0

package/dist/app/charts/axes/OrdinalAxis.js

@@ -1,5 +1,4 @@
-import { addOrdinalStringAxis, AxisLocation, defaultAxesFont, defaultAxisTickStyle, labelIdFor } from "./axes";
-import * as d3 from "d3";
+import { AxisLocation, defaultAxesFont, defaultAxisTickStyle, addOrdinalStringAxis, removeOrdinalXAxis, removeOrdinalYAxis } from "./axes";
 import { useChart } from "../hooks/useChart";
 import { useEffect, useRef } from "react";
 import { usePlotDimensions } from "../hooks/usePlotDimensions";
@@ -9,12 +8,13 @@ import { AxisInterval } from "./AxisInterval";
  * Category axis that represents the x-axis when its location is either on the bottom or the top.
  * When the axis location is left or right, then the category axis represents the y-axis. The category
  * axis requires a set of categories that will form the axis. Generally, these categories should
- * be the name of the series used to represent each category.
+ * be the name of the series used to represent each category. This component returns null, meaning
+ * React won't render it because we are drawing directly onto the chart's shared canvas.
  * @param props The properties for the component
  * @return null
  */
 export function OrdinalAxis(props) {
-    const { chartId, container, axes, color, } = useChart();
+    const { chartId, canvasContext, axes, color, } = useChart();
     const { xAxesState, yAxesState, addXAxis, addYAxis, setAxisIntervalFor, axisRangeFor, addAxesRangesUpdateHandler, removeAxesRangesUpdateHandler, setOriginalAxisIntervalFor, } = axes;
     const { plotDimensions, margin, registerPlotDimensionChangeHandler, unregisterPlotDimensionChangeHandler } = usePlotDimensions();
     const { axisId, location, categories, updateAxisBasedOnDomainValues = true, label, } = props;
@@ -24,16 +24,15 @@ export function OrdinalAxis(props) {
         yAxesState.axisFor(axisId).getOrUndefined();
     // handles plot size changes by updating the range of the axis and the original range of the axis
     useEffect(() => {
-        if (container) {
-            const svg = d3.select(container);
-            const font = Object.assign(Object.assign(Object.assign({}, defaultAxesFont()), { color }), props.font);
-            const axisTickStyle = Object.assign(Object.assign({}, defaultAxisTickStyle()), props.axisTickStyle);
+        if (canvasContext) {
+            const font = { ...defaultAxesFont(), color, ...props.font };
+            const axisTickStyle = { ...defaultAxisTickStyle(), ...props.axisTickStyle };
             // lambda that gets called when the axes need to be updated
             const handleRangeUpdates = (updates, plotDim) => {
                 if (rangeUpdateHandlerIdRef.current && axis) {
                     const range = updates.get(axisId);
                     if (range) {
-                        axis.update(range.current, range.original, plotDim, margin);
+                        axis.update(categories, range.current, range.original, plotDim, margin);
                     }
                 }
             };
@@ -43,7 +42,7 @@ export function OrdinalAxis(props) {
                 switch (location) {
                     case AxisLocation.Top:
                     case AxisLocation.Bottom: {
-                        const xAxis = addOrdinalStringAxis(chartId, axisId, svg, location, categories, label, font, axisTickStyle, plotDimensions, margin, setAxisIntervalFor, setOriginalAxisIntervalFor);
+                        const xAxis = addOrdinalStringAxis(canvasContext, axisId, location, categories, label, font, axisTickStyle, plotDimensions, margin, setAxisIntervalFor, setOriginalAxisIntervalFor);
                         // add the x-axis to the chart context
                         const [start, end] = AxisInterval.as(xAxis.scale.range()).asTuple();
                         addXAxis(xAxis, axisId, OrdinalAxisRange.from(start, end));
@@ -54,7 +53,7 @@ export function OrdinalAxis(props) {
                     }
                     case AxisLocation.Left:
                     case AxisLocation.Right: {
-                        const yAxis = addOrdinalStringAxis(chartId, axisId, svg, location, categories, label, font, axisTickStyle, plotDimensions, margin, setAxisIntervalFor, setOriginalAxisIntervalFor);
+                        const yAxis = addOrdinalStringAxis(canvasContext, axisId, location, categories, label, font, axisTickStyle, plotDimensions, margin, setAxisIntervalFor, setOriginalAxisIntervalFor);
                         // add the y-axis to the chart context
                         const [start, end] = AxisInterval.as(yAxis.scale.range()).asTuple();
                         addYAxis(yAxis, axisId, OrdinalAxisRange.from(start, end));
@@ -69,13 +68,18 @@ export function OrdinalAxis(props) {
                     .map(range => ([range.current, range.original]))
                     .getOrElse([AxisInterval.empty(), AxisInterval.empty()]);
                 if (range && originalRange) {
-                    axis.update(range, originalRange, plotDimensions, margin);
+                    axis.update(categories, range, originalRange, plotDimensions, margin);
                 }
-                svg.select(`#${labelIdFor(chartId, location)}`).attr('fill', color);
+                // keep the axis *label's* color in sync with the chart's color (e.g. on theme
+                // change), without recreating the axis or touching its domain. Note: tick label
+                // color is intentionally NOT touched here -- it stays fixed at whatever
+                // axisTickStyle.font was at creation, matching the original SVG version, which
+                // only ever updated the label's `fill`, not the ticks'.
+                axis.updateFont(font);
             }
         }
     }, [
-        container,
+        canvasContext,
         axis,
         addXAxis, addYAxis,
         addAxesRangesUpdateHandler,
@@ -96,7 +100,10 @@ export function OrdinalAxis(props) {
                     const { current, original } = OrdinalAxisRange
                         .from(start, end, 0, oldDimension.width)
                         .zoom(oldDimension.width, newDimension.width);
-                    axis.update(current, original, plotDimensions, margin);
+                    // a resize never changes the set of categories -- read the axis's own
+                    // current domain rather than `categories` from props, since `categories`
+                    // isn't in this effect's dependency array and so may be stale here
+                    axis.update(axis.scale.domain(), current, original, plotDimensions, margin);
                 }
                 if (location === AxisLocation.Left || location === AxisLocation.Right) {
                     const [start, end] = axisRangeFor(axisId)
@@ -105,7 +112,7 @@ export function OrdinalAxis(props) {
                     const { current, original } = OrdinalAxisRange
                         .from(start, end, 0, oldDimension.height)
                         .zoom(oldDimension.height, newDimension.height);
-                    axis.update(current, original, plotDimensions, margin);
+                    axis.update(axis.scale.domain(), current, original, plotDimensions, margin);
                 }
             }
         });
@@ -125,6 +132,22 @@ export function OrdinalAxis(props) {
             }
         };
     }, [removeAxesRangesUpdateHandler]);
+    // unregister the axis' draw function when the axis unmounts
+    useEffect(() => {
+        return () => {
+            if (canvasContext) {
+                switch (location) {
+                    case AxisLocation.Top:
+                    case AxisLocation.Bottom:
+                        removeOrdinalXAxis(canvasContext, axisId);
+                        break;
+                    case AxisLocation.Left:
+                    case AxisLocation.Right:
+                        removeOrdinalYAxis(canvasContext, axisId);
+                }
+            }
+        };
+    }, [canvasContext, axisId, location]);
     return null;
 }
 //# sourceMappingURL=OrdinalAxis.js.map

package/dist/app/charts/axes/OrdinalAxis.js.map

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

package/dist/app/charts/axes/OrdinalAxisRange.d.ts

@@ -4,6 +4,13 @@ import { BaseAxisRange } from "./BaseAxisRange";
  * Create an instance using the {@link OrdinalAxisRange.from} factory method.
  */
 export declare class OrdinalAxisRange extends BaseAxisRange {
+    /**
+     * Use {@link OrdinalAxisRange.from} to create an instance
+     * @param start The start of the axis-range
+     * @param end The end of the axis-range
+     * @param [originalStart=start] The original start of the axis-range
+     * @param [originalEnd=end] The original end of the axis-range
+     */
     private constructor();
     /**
      * Factory function for creating a new ordinal-axis range instance.
@@ -13,33 +20,88 @@ export declare class OrdinalAxisRange extends BaseAxisRange {
      * Defaults to the start value if not specified.)
      * @param [originalEnd=end] The optional original end of the axis-range (e.g. before any zooming or panning.
      * Defaults to the end value if not specified.)
-     * @return A new continuous-axis range instance.
+     * @return A new ordinal-axis range instance.
      */
     static from(start: number, end: number, originalStart?: number, originalEnd?: number): OrdinalAxisRange;
     /**
-     * Scales the axis-range by the specified scale factor from the specified value. The equations
-     * are written so that the zooming (scaling) occurs at the specified value, and expands/contracts equally
-     * from that value. This operation does not modify the original range.
-     * @param factor The scale factor
+     * Scales the axis-range by the specified *cumulative* scale factor (d3-zoom's own
+     * `event.transform.k`, taken as-is -- NOT converted to an incremental, relative-to-the-
+     * previous-event factor), pivoting on `value`.
+     *
+     * Two cases, because neither a purely incremental nor a purely cumulative-from-`.original`
+     * formula is correct on its own for a bounded ordinal domain:
+     *
+     * - `factor === 1` (fully zoomed out): returns `.original` directly, bypassing the pivot math
+     *   entirely. An ordinal axis's domain (the fixed set of categories) is bounded, so "zoomed all
+     *   the way back out" has exactly one correct answer -- `.current` must equal `.original`
+     *   *exactly*, regardless of how many different pivots were used to get there. d3-zoom's own
+     *   `.scaleExtent` clamps `k` to *exactly* 1 at the zoom floor (not just asymptotically close),
+     *   so this equality check reliably detects that boundary.
+     * - Otherwise: scales from `.current` using the *incremental* step implied by the cumulative
+     *   factor (`factor` divided by the range's own current/original width ratio) -- the same
+     *   pivot-preserving composition `ContinuousAxisRange` uses (see `BaseAxisRange.scaledRange`).
+     *   This composes correctly across any sequence of differing pivots without jumping.
+     *
+     * Why not just always scale from `.original` by the cumulative factor (a prior version of this
+     * method did exactly that)? Composing pivot-preserving zooms at *different* pivots is not
+     * itself position-preserving -- zooming in at one spot and back out at another nets a
+     * translation, same as any pinch-zoom or map UI, verified live: zoom in at pivot A to k=5, then
+     * zoom out at a different pivot B to k=1, lands `.current` at `[400, 1400]` instead of
+     * `[0, 1000]` even under the mathematically-correct incremental composition. Scaling
+     * `.original` directly by the raw cumulative factor "fixes" that only by recomputing the
+     * *entire* zoom from scratch at the current pivot on every single event -- which is correct
+     * only when the pivot never changes since the last identity reset, and otherwise discards all
+     * zoom history, producing a visible jump the moment the pivot changes at any *non-identity* zoom
+     * level (confirmed live: continuing to zoom in from k=5 at pivot A to k=6 at a different pivot B
+     * jumped from the correct, continuous `[-1600, 4400]` to `[-4000, 2000]`). The `factor === 1`
+     * special case gets the position-preserving guarantee only where it's actually needed -- the
+     * one canonical "fully zoomed out" state -- without sacrificing composability everywhere else.
+     * A continuous/scrolling axis (`ContinuousAxisRange`) never needs the equivalent of this special
+     * case, since it has no fixed domain edge for translational drift to visibly clip against.
+     * @param factor The cumulative scale factor (`event.transform.k`, unmodified)
+     * @param value The value from which to scale the interval
+     * @return The new range, as a plain {start, end} pair
+     */
+    private scaledCumulative;
+    /**
+     * Scales the axis-range by the specified *cumulative* scale factor (see
+     * `scaledCumulative` for why this must be cumulative, not incremental) from the
+     * specified value. The equations are written so that the zooming (scaling) occurs at the
+     * specified value, and expands/contracts equally from that value. This operation does not
+     * modify the original range.
+     * @param factor The cumulative scale factor
      * @param value The value from which to scale the interval
-     * @return A new continuous-axis range with updated values
+     * @return A new ordinal-axis range with updated values
      */
     scale(factor: number, value: number): OrdinalAxisRange;
     /**
-     * Scales the axis-range by the specified scale factor from the specified value, while keeping
-     * the range within the constraints (start, end). The equations are written so that the zooming
-     * (scaling) occurs at the specified value, and expands/contracts equally from that value.
-     * @param factor The scale factor
+     * Scales the axis-range by the specified *cumulative* scale factor (see
+     * `scaledCumulative` for why this must be cumulative, not incremental) from the
+     * specified value, while keeping the range within the constraints (start, end). The equations
+     * are written so that the zooming (scaling) occurs at the specified value, and
+     * expands/contracts equally from that value.
+     *
+     * Widens the scaled result to *cover* `constraint` (never narrower than it) -- `constraint`
+     * is the domain that must be fully visible once zoomed all the way out, and widening rather
+     * than clamping is exactly what fixes the pivot-drift bug described on
+     * `scaledCumulative` (zooming in at one pivot and back out at another must never leave
+     * part of the domain clipped). This is the opposite direction from
+     * {@link ContinuousAxisRange.constrainedScale}, which *clamps* its result inside `constraint`
+     * instead -- see that method's doc comment for why a continuous axis needs the opposite
+     * behavior. Do not "fix" this difference without reading both.
+     * @param factor The cumulative scale factor
      * @param value The value from which to scale the interval
      * @param constraint The minimum and maximum values that range bounds can be
-     * @return A new continuous-axis range with updated values
+     * @return A new ordinal-axis range with updated values
      */
     constrainedScale(factor: number, value: number, constraint: [min: number, max: number]): OrdinalAxisRange;
     /**
-     * Translates the axis-range by the specified amount
+     * Translates the axis-range by the specified amount, unless that would take it outside the
+     * constraint interval (when both ends of the constraint are infinite, there's no constraint)
      * @param amount The amount by which to translate the axis-range
      * @param [constraint=[-Infinity, Infinity]] Optional constraint interval in which the axis range must be within
-     * @return An updated {@link OrdinalAxisRange} that has been translated by the specified amount
+     * @return An updated {@link OrdinalAxisRange} that has been translated by the specified amount (or an
+     * unchanged copy, when the translation would leave the constraint interval)
      */
     translate(amount: number, constraint?: [start: number, end: number]): OrdinalAxisRange;
     /**
@@ -67,3 +129,4 @@ export declare class OrdinalAxisRange extends BaseAxisRange {
      */
     updateOriginal(start: number, end: number): BaseAxisRange;
 }
+//# sourceMappingURL=OrdinalAxisRange.d.ts.map

package/dist/app/charts/axes/OrdinalAxisRange.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"OrdinalAxisRange.d.ts","sourceRoot":"","sources":["../../../../src/app/charts/axes/OrdinalAxisRange.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAE9C;;;GAGG;AACH,qBAAa,gBAAiB,SAAQ,aAAa;IAE/C;;;;;;OAMG;IACH,OAAO;IAIP;;;;;;;;;OASG;IACH,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,aAAa,GAAE,MAAc,EAAE,WAAW,GAAE,MAAY,GAAG,gBAAgB;IAInH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAsCG;IACH,OAAO,CAAC,gBAAgB;IAYxB;;;;;;;;;OASG;IACH,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,gBAAgB;IAKtD;;;;;;;;;;;;;;;;;;;OAmBG;IACH,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,gBAAgB;IAUzG;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,GAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAyB,GAAG,gBAAgB;IAW7G;;;;;;;;OAQG;IACH,IAAI,CAAC,eAAe,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,gBAAgB;IAevE;;;;;OAKG;IACH,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,gBAAgB;IAIpD;;;;;OAKG;IACH,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,aAAa;CAG5D"}

package/dist/app/charts/axes/OrdinalAxisRange.js

@@ -4,6 +4,13 @@ import { BaseAxisRange } from "./BaseAxisRange";
  * Create an instance using the {@link OrdinalAxisRange.from} factory method.
  */
 export class OrdinalAxisRange extends BaseAxisRange {
+    /**
+     * Use {@link OrdinalAxisRange.from} to create an instance
+     * @param start The start of the axis-range
+     * @param end The end of the axis-range
+     * @param [originalStart=start] The original start of the axis-range
+     * @param [originalEnd=end] The original end of the axis-range
+     */
     constructor(start, end, originalStart = start, originalEnd = end) {
         super(start, end, originalStart, originalEnd);
     }
@@ -15,46 +22,111 @@ export class OrdinalAxisRange extends BaseAxisRange {
      * Defaults to the start value if not specified.)
      * @param [originalEnd=end] The optional original end of the axis-range (e.g. before any zooming or panning.
      * Defaults to the end value if not specified.)
-     * @return A new continuous-axis range instance.
+     * @return A new ordinal-axis range instance.
      */
     static from(start, end, originalStart = start, originalEnd = end) {
         return new OrdinalAxisRange(start, end, originalStart, originalEnd);
     }
     /**
-     * Scales the axis-range by the specified scale factor from the specified value. The equations
-     * are written so that the zooming (scaling) occurs at the specified value, and expands/contracts equally
-     * from that value. This operation does not modify the original range.
-     * @param factor The scale factor
+     * Scales the axis-range by the specified *cumulative* scale factor (d3-zoom's own
+     * `event.transform.k`, taken as-is -- NOT converted to an incremental, relative-to-the-
+     * previous-event factor), pivoting on `value`.
+     *
+     * Two cases, because neither a purely incremental nor a purely cumulative-from-`.original`
+     * formula is correct on its own for a bounded ordinal domain:
+     *
+     * - `factor === 1` (fully zoomed out): returns `.original` directly, bypassing the pivot math
+     *   entirely. An ordinal axis's domain (the fixed set of categories) is bounded, so "zoomed all
+     *   the way back out" has exactly one correct answer -- `.current` must equal `.original`
+     *   *exactly*, regardless of how many different pivots were used to get there. d3-zoom's own
+     *   `.scaleExtent` clamps `k` to *exactly* 1 at the zoom floor (not just asymptotically close),
+     *   so this equality check reliably detects that boundary.
+     * - Otherwise: scales from `.current` using the *incremental* step implied by the cumulative
+     *   factor (`factor` divided by the range's own current/original width ratio) -- the same
+     *   pivot-preserving composition `ContinuousAxisRange` uses (see `BaseAxisRange.scaledRange`).
+     *   This composes correctly across any sequence of differing pivots without jumping.
+     *
+     * Why not just always scale from `.original` by the cumulative factor (a prior version of this
+     * method did exactly that)? Composing pivot-preserving zooms at *different* pivots is not
+     * itself position-preserving -- zooming in at one spot and back out at another nets a
+     * translation, same as any pinch-zoom or map UI, verified live: zoom in at pivot A to k=5, then
+     * zoom out at a different pivot B to k=1, lands `.current` at `[400, 1400]` instead of
+     * `[0, 1000]` even under the mathematically-correct incremental composition. Scaling
+     * `.original` directly by the raw cumulative factor "fixes" that only by recomputing the
+     * *entire* zoom from scratch at the current pivot on every single event -- which is correct
+     * only when the pivot never changes since the last identity reset, and otherwise discards all
+     * zoom history, producing a visible jump the moment the pivot changes at any *non-identity* zoom
+     * level (confirmed live: continuing to zoom in from k=5 at pivot A to k=6 at a different pivot B
+     * jumped from the correct, continuous `[-1600, 4400]` to `[-4000, 2000]`). The `factor === 1`
+     * special case gets the position-preserving guarantee only where it's actually needed -- the
+     * one canonical "fully zoomed out" state -- without sacrificing composability everywhere else.
+     * A continuous/scrolling axis (`ContinuousAxisRange`) never needs the equivalent of this special
+     * case, since it has no fixed domain edge for translational drift to visibly clip against.
+     * @param factor The cumulative scale factor (`event.transform.k`, unmodified)
+     * @param value The value from which to scale the interval
+     * @return The new range, as a plain {start, end} pair
+     */
+    scaledCumulative(factor, value) {
+        // when the factor is 1 or the original measure is 0, return the original range
+        if (factor === 1 || this.original.measure() === 0) {
+            return { start: this.original.start, end: this.original.end };
+        }
+        const scaleFactor = this.current.measure() / this.original.measure();
+        const incrementalFactor = factor / scaleFactor;
+        const dtStart = value - this.current.start;
+        const dtEnd = this.current.end - value;
+        return { start: value - dtStart * incrementalFactor, end: value + dtEnd * incrementalFactor };
+    }
+    /**
+     * Scales the axis-range by the specified *cumulative* scale factor (see
+     * `scaledCumulative` for why this must be cumulative, not incremental) from the
+     * specified value. The equations are written so that the zooming (scaling) occurs at the
+     * specified value, and expands/contracts equally from that value. This operation does not
+     * modify the original range.
+     * @param factor The cumulative scale factor
      * @param value The value from which to scale the interval
-     * @return A new continuous-axis range with updated values
+     * @return A new ordinal-axis range with updated values
      */
     scale(factor, value) {
-        const scaledInterval = this.scaledRange(factor, value);
+        const scaledInterval = this.scaledCumulative(factor, value);
         return new OrdinalAxisRange(scaledInterval.start, scaledInterval.end, this.original.start, this.original.end);
     }
     /**
-     * Scales the axis-range by the specified scale factor from the specified value, while keeping
-     * the range within the constraints (start, end). The equations are written so that the zooming
-     * (scaling) occurs at the specified value, and expands/contracts equally from that value.
-     * @param factor The scale factor
+     * Scales the axis-range by the specified *cumulative* scale factor (see
+     * `scaledCumulative` for why this must be cumulative, not incremental) from the
+     * specified value, while keeping the range within the constraints (start, end). The equations
+     * are written so that the zooming (scaling) occurs at the specified value, and
+     * expands/contracts equally from that value.
+     *
+     * Widens the scaled result to *cover* `constraint` (never narrower than it) -- `constraint`
+     * is the domain that must be fully visible once zoomed all the way out, and widening rather
+     * than clamping is exactly what fixes the pivot-drift bug described on
+     * `scaledCumulative` (zooming in at one pivot and back out at another must never leave
+     * part of the domain clipped). This is the opposite direction from
+     * {@link ContinuousAxisRange.constrainedScale}, which *clamps* its result inside `constraint`
+     * instead -- see that method's doc comment for why a continuous axis needs the opposite
+     * behavior. Do not "fix" this difference without reading both.
+     * @param factor The cumulative scale factor
      * @param value The value from which to scale the interval
      * @param constraint The minimum and maximum values that range bounds can be
-     * @return A new continuous-axis range with updated values
+     * @return A new ordinal-axis range with updated values
      */
     constrainedScale(factor, value, constraint) {
-        const scaledInterval = this.scaledRange(factor, value);
+        const scaledInterval = this.scaledCumulative(factor, value);
         const [min, max] = constraint;
         return new OrdinalAxisRange(Math.min(min, scaledInterval.start), Math.max(max, scaledInterval.end), this.original.start, this.original.end);
     }
     /**
-     * Translates the axis-range by the specified amount
+     * Translates the axis-range by the specified amount, unless that would take it outside the
+     * constraint interval (when both ends of the constraint are infinite, there's no constraint)
      * @param amount The amount by which to translate the axis-range
      * @param [constraint=[-Infinity, Infinity]] Optional constraint interval in which the axis range must be within
-     * @return An updated {@link OrdinalAxisRange} that has been translated by the specified amount
+     * @return An updated {@link OrdinalAxisRange} that has been translated by the specified amount (or an
+     * unchanged copy, when the translation would leave the constraint interval)
      */
     translate(amount, constraint = [-Infinity, Infinity]) {
         const [cs, ce] = constraint;
-        // when either of the constraints is infinite, or the pan keeps the new axis range
+        // when both of the constraints are infinite, or the pan keeps the new axis range
         // within the origin axis range (i.e. zoomed in and the panned), then allow the pan,
         // otherwise don't update
         if ((!isFinite(cs) && !isFinite(ce)) || (this.current.start + amount >= cs && this.current.end + amount <= ce)) {
@@ -72,6 +144,13 @@ export class OrdinalAxisRange extends BaseAxisRange {
      * the dimensions.
      */
     zoom(beforeDimension, afterDimension) {
+        // a zero `beforeDimension` (e.g. a chart mounted inside a collapsed/hidden container that
+        // later becomes visible) would otherwise divide by zero below, producing a NaN/Infinity
+        // range that corrupts this axis until remount. There's no proportional "before" range to
+        // scale from in that case, so just take the new dimension as the fresh, un-zoomed range.
+        if (beforeDimension === 0) {
+            return new OrdinalAxisRange(0, afterDimension, 0, afterDimension);
+        }
         const [start, end] = this.current.asTuple();
         const delta = (end - start) * (afterDimension - beforeDimension) / beforeDimension;
         const lowerBound = start / (end - start) * delta + start;

package/dist/app/charts/axes/OrdinalAxisRange.js.map

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

package/dist/app/charts/axes/autoScale.d.ts

@@ -0,0 +1,111 @@
+import type { ScaleContinuousNumeric } from "d3";
+/**
+ * The auto-scaling settings of a (y-) axis whose domain grows to fit the data plotted against it
+ * (see `ContinuousAxis`'s `autoScale`, `autoScaleMin`, `autoScaleMax`, and `autoScalePadding` props)
+ */
+export type AutoScale = {
+    /**
+     * Where the axis' domain starts out: its `domain` prop, clamped to the limits. It's what the
+     * domain is restored to when its plot's data is replaced (e.g. on a reset).
+     */
+    domain: [min: number, max: number];
+    /**
+     * The smallest value the axis' domain may reach
+     */
+    min: number;
+    /**
+     * The largest value the axis' domain may reach
+     */
+    max: number;
+    /**
+     * The fraction of the axis' length left beyond the data's extreme on a side that grows (so
+     * the extreme point isn't drawn right on the edge), from 0 to 0.45
+     */
+    padding: number;
+};
+/**
+ * Clamps a domain to the auto-scaling limits, so that an auto-scaling axis never starts out past
+ * them. (When the domain lies entirely beyond a limit, it collapses onto that limit.)
+ * @param domain The domain
+ * @param min The smallest value the domain may reach
+ * @param max The largest value the domain may reach
+ * @return The domain, clamped to the limits
+ */
+export declare function clampedDomain(domain: [min: number, max: number], min: number, max: number): [min: number, max: number];
+/**
+ * Whether two auto-scaling settings are the same (`undefined` means "not auto-scaling")
+ * @param a The first settings
+ * @param b The second settings
+ * @return `true` when they're the same; `false` otherwise
+ */
+export declare function sameAutoScale(a: AutoScale | undefined, b: AutoScale | undefined): boolean;
+/**
+ * Grows an axis' domain to include the specified extent of the data, with the padding beyond it,
+ * without going past the auto-scaling limits. A side grows when the data reaches into its padding
+ * (not only when the data goes past the edge), so that the data always has the padding's room to
+ * spare (until a limit is reached), and it grows so that the data's extreme sits exactly the
+ * padding from the edge. The domain only ever grows: an extent that's within the domain, and
+ * clear of its padding, leaves the domain as it is.
+ *
+ * The padding is applied in the scale's own space (e.g. logarithmically, for a log scale), as a
+ * fraction of the axis' length.
+ * @param domain The axis' current domain
+ * @param extent The [min, max] of the data plotted against the axis, or `undefined` when there's
+ * no data
+ * @param autoScale The auto-scaling settings (the limits, and the padding)
+ * @param scale The axis' scale (only its kind matters: linear, log, ...)
+ * @return The grown domain (or the current domain, when there's nothing to grow for)
+ */
+export declare function grownDomain(domain: [min: number, max: number], extent: [min: number, max: number] | undefined, autoScale: Pick<AutoScale, 'min' | 'max' | 'padding'>, scale: ScaleContinuousNumeric<number, number>): [min: number, max: number];
+/**
+ * Extends an extent to include the specified value
+ * @param extent The extent so far, or `undefined` when there's none yet
+ * @param value The value to include
+ * @return The extent, including the value
+ */
+export declare function extentWith(extent: [min: number, max: number] | undefined, value: number): [min: number, max: number];
+/**
+ * Calculates the extent (the [min, max]) of the specified values, skipping those the y-scale
+ * can't show (e.g. values <= 0 on a log scale, or NaN)
+ * @param values The values
+ * @param yScale The y-axis' scale
+ * @return The extent of the values, or `undefined` when there are none (that can be shown)
+ */
+export declare function extentOf(values: Iterable<number>, yScale: ScaleContinuousNumeric<number, number>): [min: number, max: number] | undefined;
+/**
+ * Calculates the extent (the [min, max] of the y-values) of a series' data that's visible within
+ * the x-axis' window: the values of the points within the window, and -- when the series is drawn
+ * with lines -- the lines' heights where they cross the window's left and right edges (a line from
+ * a point just off screen can reach higher, or lower, within the window than any point that's on
+ * screen). Values the y-scale can't show (e.g. values <= 0 on a log scale) are skipped.
+ *
+ * A point can have several values, each drawn as its own line across the points (e.g. an outlier
+ * series' value, and its bands' lower and upper bounds), so the crossings are calculated for each.
+ * They're calculated in the y-scale's own space (as the lines are drawn), so they're exact for
+ * straight lines, on any kind of scale.
+ * @param data The series' data, ordered by x
+ * @param window The x-axis' [start, end]
+ * @param yScale The y-axis' scale
+ * @param withLines Whether the series is drawn with lines (rather than just points)
+ * @param xOf The point's x-value (defaults to its `x`)
+ * @param valuesOf The point's y-values, each drawn as its own line (defaults to its `y`)
+ * @return The extent of the visible data, or `undefined` when nothing is visible
+ * @template P The type of the data's points
+ */
+export declare function visibleExtent<P>(data: {
+    length: number;
+    [index: number]: P;
+}, window: [start: number, end: number], yScale: ScaleContinuousNumeric<number, number>, withLines: boolean, xOf?: (point: P) => number, valuesOf?: (point: P) => Array<number>): [min: number, max: number] | undefined;
+/**
+ * Issues a warning to the console, once (e.g. about auto-scaling settings that are ignored)
+ * @param message The warning
+ */
+export declare function warnOnce(message: string): void;
+/**
+ * Warns (once per axis) about the auto-scaling y-axes of a plot that doesn't support auto-scaling,
+ * whose `autoScale` setting is therefore ignored
+ * @param plotName The name of the plot (e.g. "BarPlot")
+ * @param yAxes The plot's y-axes, by their IDs
+ */
+export declare function warnAboutIgnoredAutoScale(plotName: string, yAxes: Map<string, object>): void;
+//# sourceMappingURL=autoScale.d.ts.map

package/dist/app/charts/axes/autoScale.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"autoScale.d.ts","sourceRoot":"","sources":["../../../../src/app/charts/axes/autoScale.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,sBAAsB,EAAC,MAAM,IAAI,CAAC;AAG/C;;;GAGG;AACH,MAAM,MAAM,SAAS,GAAG;IACpB;;;OAGG;IACH,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,CAAA;IAClC;;OAEG;IACH,GAAG,EAAE,MAAM,CAAA;IACX;;OAEG;IACH,GAAG,EAAE,MAAM,CAAA;IACX;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAA;CAClB,CAAA;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CACzB,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,EAClC,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,GACZ,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,CAG5B;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAAE,SAAS,GAAG,SAAS,EAAE,CAAC,EAAE,SAAS,GAAG,SAAS,GAAG,OAAO,CAIzF;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,WAAW,CACvB,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,EAClC,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,SAAS,EAC9C,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,KAAK,GAAG,KAAK,GAAG,SAAS,CAAC,EACrD,KAAK,EAAE,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,GAC9C,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,CAgC5B;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CACtB,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,SAAS,EAC9C,KAAK,EAAE,MAAM,GACd,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,CAG5B;AAED;;;;;;GAMG;AACH,wBAAgB,QAAQ,CACpB,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,EACxB,MAAM,EAAE,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,GAC/C,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,SAAS,CAMxC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAC3B,IAAI,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,CAAC,KAAK,EAAE,MAAM,GAAG,CAAC,CAAA;CAAE,EAC5C,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,EACpC,MAAM,EAAE,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9C,SAAS,EAAE,OAAO,EAClB,GAAG,GAAE,CAAC,KAAK,EAAE,CAAC,KAAK,MAA4C,EAC/D,QAAQ,GAAE,CAAC,KAAK,EAAE,CAAC,KAAK,KAAK,CAAC,MAAM,CAAyC,GAC9E,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,SAAS,CA4CxC;AAKD;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAI9C;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAM5F"}