fix(scales): handle empty series with timescale (#1683)

plouc · Jul 14, 2021 · 81880cc · 81880cc
1 parent 3e0f074
commit 81880cc
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 5 deletions.
diff --git a/packages/scales/src/timeHelpers.ts b/packages/scales/src/timeHelpers.ts
@@ -50,7 +50,11 @@ export const createDateNormalizer = ({
 }) => {
     const precisionFn = createPrecisionMethod(precision)
 
-    return (value: Date | string) => {
+    return (value: Date | string | undefined) => {
+        if (value === undefined) {
+            return value
+        }
+
         if (format === 'native' || value instanceof Date) {
             return precisionFn(value as Date)
         }

diff --git a/packages/scales/src/timeScale.ts b/packages/scales/src/timeScale.ts
@@ -16,7 +16,7 @@ export const createTimeScale = <Input extends Date | NumberValue>(
 ) => {
     const normalize = createDateNormalizer({ format, precision, useUTC })
 
-    let minValue: Date
+    let minValue: Date | undefined
     if (min === 'auto') {
         minValue = normalize(data.min)
     } else if (format !== 'native') {
@@ -25,7 +25,7 @@ export const createTimeScale = <Input extends Date | NumberValue>(
         minValue = min as Date
     }
 
-    let maxValue: Date
+    let maxValue: Date | undefined
     if (max === 'auto') {
         maxValue = normalize(data.max)
     } else if (format !== 'native') {
@@ -36,7 +36,9 @@ export const createTimeScale = <Input extends Date | NumberValue>(
 
     const scale = useUTC ? scaleUtc() : scaleTime()
 
-    scale.domain([minValue, maxValue]).range([0, size])
+    scale.range([0, size])
+
+    if (minValue && maxValue) scale.domain([minValue, maxValue])
 
     if (nice === true) scale.nice()
     else if (typeof nice === 'object' || typeof nice === 'number') scale.nice(nice)

diff --git a/packages/scales/tests/compute.test.ts b/packages/scales/tests/compute.test.ts
@@ -1,4 +1,9 @@
-import { generateSeriesAxis, stackAxis, computeAxisSlices } from '../src/compute'
+import {
+    generateSeriesAxis,
+    stackAxis,
+    computeAxisSlices,
+    computeXYScalesForSeries,
+} from '../src/compute'
 
 const axes = ['x', 'y']
 
@@ -597,6 +602,44 @@ describe('stackAxis', () => {
     })
 })
 
+describe('computeXYScalesForSeries', () => {
+    it('works with timescale an and empty series', () => {
+        const series = computeXYScalesForSeries(
+            [],
+            {
+                type: 'time',
+                format: '%Y-%m-%d',
+                useUTC: false,
+                precision: 'day',
+            },
+            {
+                type: 'linear',
+                stacked: false,
+            },
+            100,
+            100
+        )
+
+        expect(series).toMatchInlineSnapshot(`
+            Object {
+              "series": Array [],
+              "x": Object {
+                "all": Array [],
+                "max": undefined,
+                "min": undefined,
+              },
+              "xScale": [Function],
+              "y": Object {
+                "all": Array [],
+                "max": -Infinity,
+                "min": Infinity,
+              },
+              "yScale": [Function],
+            }
+        `)
+    })
+})
+
 // describe('computeAxisSlices', () => {
 //     axes.forEach(axis => {
 //         const otherAxis = axis === 'x' ? 'y' : 'x'