wip

Author: jnumainville

__mocks__/dh-core.js

@@ -1789,6 +1789,8 @@ class Axis {
     formatPattern = null,
     log = false,
     businessCalendar = null,
+    minRange = undefined,
+    maxRange = undefined,
   } = {}) {
     this.label = label;
     this.type = type;
@@ -1797,6 +1799,8 @@ class Axis {
     this.formatPattern = formatPattern;
     this.log = log;
     this.businessCalendar = businessCalendar;
+    this.minRange = minRange;
+    this.maxRange = maxRange;
   }
 
   range() {}

packages/chart/src/ChartTestUtils.ts

@@ -24,13 +24,17 @@ class ChartTestUtils {
     formatType = undefined,
     formatPattern = '###,###0.00',
     log = false,
+    minRange = undefined,
+    maxRange = undefined,
   }: {
     label?: string;
     type?: DhType.plot.AxisType;
     position?: DhType.plot.AxisPosition;
     formatType?: DhType.plot.AxisFormatType;
     formatPattern?: string;
     log?: boolean;
+    minRange?: number;
+    maxRange?: number;
   } = {}): DhType.plot.Axis {
     const { dh } = this;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -41,6 +45,8 @@ class ChartTestUtils {
       formatType: formatType ?? dh.plot.AxisFormatType.NUMBER,
       formatPattern,
       log,
+      minRange,
+      maxRange,
     });
   }
 

packages/chart/src/ChartUtils.ts

@@ -1539,6 +1539,22 @@ class ChartUtils {
       );
       layoutAxis.domain = [bottom, top];
     }
+
+    // autorangeoptions exists in plotly.js but not in the types
+    // axis.range only applies to the initial axis range, can't handle specifying min or max independently,
+    // and cannot be returned to if the user changes the range via interaction
+    // minallowed and maxallowed can be set independently and can be returned to if the user changes
+    // the range via interaction
+    const { minRange, maxRange, log } = axis;
+    if (!Number.isNaN(minRange) || !Number.isNaN(maxRange)) {
+      (layoutAxis as any).autorangeoptions = {};
+      if (!Number.isNaN(minRange)) {
+        (layoutAxis as any).autorangeoptions.minallowed = log ? Math.log10(minRange) : minRange;
+      }
+      if (!Number.isNaN(maxRange)) {
+        (layoutAxis as any).autorangeoptions.maxallowed = log ? Math.log10(maxRange) : maxRange;;
+      }
+    }
   }
 
   /**

packages/chart/src/FigureChartModel.test.ts

@@ -533,3 +533,77 @@ describe('legend visibility', () => {
     ]);
   });
 });
+
+it('handles axes min and max properly', () => {
+  const xaxis = chartTestUtils.makeAxis({
+    label: 'x1',
+    type: dh.plot.AxisType.X,
+    position: dh.plot.AxisPosition.BOTTOM,
+    minRange: 0,
+    maxRange: 100,
+  });
+
+  const xaxis2 = chartTestUtils.makeAxis({
+    label: 'x1',
+    type: dh.plot.AxisType.X,
+    position: dh.plot.AxisPosition.BOTTOM,
+    log: true,
+    minRange: 100,
+    maxRange: 1000,
+  });
+
+  const yaxis1 = chartTestUtils.makeAxis({
+    label: 'y1',
+    type: dh.plot.AxisType.Y,
+    position: dh.plot.AxisPosition.LEFT,
+    maxRange: 200,
+  });
+
+  const yaxis2 = chartTestUtils.makeAxis({
+    label: 'y2',
+    type: dh.plot.AxisType.Y,
+    position: dh.plot.AxisPosition.RIGHT,
+    minRange: -10,
+  });
+
+  const axes = [xaxis, xaxis2, yaxis1, yaxis2];
+
+  const chart = chartTestUtils.makeChart({ axes });
+  const figure = chartTestUtils.makeFigure({ charts: [chart] });
+  const model = new FigureChartModel(dh, figure);
+
+  const layout = model.getLayout();
+
+  expect((layout.xaxis as any).autorangeoptions.minallowed).toEqual(
+    0
+  );
+  
+  expect((layout.xaxis as any).autorangeoptions.maxallowed).toEqual(
+    100
+  );
+
+  expect((layout.xaxis2 as any).autorangeoptions.minallowed).toEqual(
+    2
+  );
+  
+  expect((layout.xaxis2 as any).autorangeoptions.maxallowed).toEqual(
+    3
+  );
+
+  expect((layout.yaxis as any).autorangeoptions.minallowed).toEqual(
+    undefined
+  );
+
+  expect((layout.yaxis as any).autorangeoptions.maxallowed).toEqual(
+    200
+  );
+
+  expect((layout.yaxis2 as any).autorangeoptions.minallowed).toEqual(
+    -10
+  );
+  
+  expect((layout.yaxis2 as any).autorangeoptions.maxallowed).toEqual(
+    undefined
+  );
+
+});