fix(axes): respect useUTC option on x/y scale property (#574)

plouc · Jun 27, 2019 · b4ca5ec · b4ca5ec
1 parent cca8a9e
commit b4ca5ec
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/packages/axes/src/compute.js b/packages/axes/src/compute.js
@@ -102,7 +102,7 @@ export const getScaleTicks = (scale, spec) => {
                 // UTC is used as it's more predictible
                 // however local time could be used too
                 // let's see how it fits users' requirements
-                const timeType = timeByType[matches[2]][1]
+                const timeType = timeByType[matches[2]][scale.useUTC ? 1 : 0]
                 if (matches[1] === undefined) {
                     return scale.ticks(timeType)
                 }

diff --git a/packages/axes/tests/compute.test.js b/packages/axes/tests/compute.test.js
@@ -6,7 +6,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-import { scaleLinear, scaleOrdinal, scalePoint, scaleBand, scaleUtc } from 'd3-scale'
+import { scaleLinear, scaleOrdinal, scalePoint, scaleBand, scaleTime, scaleUtc } from 'd3-scale'
 import { getScaleTicks, computeCartesianTicks } from '../src/compute'
 
 describe('getTicks', () => {
@@ -72,6 +72,29 @@ describe('getTicks', () => {
             ])
         })
 
+        it('should support non-UTC dates', () => {
+            const noUtcTimeScale = scaleTime().domain([
+                new Date(2000, 0, 1, 0, 0, 0, 0),
+                new Date(2001, 0, 1, 0, 0, 0, 0),
+            ])
+
+            expect(getScaleTicks(noUtcTimeScale)).toEqual([
+                new Date(2000, 0, 1, 0, 0, 0, 0),
+                new Date(2000, 1, 1, 0, 0, 0, 0),
+                new Date(2000, 2, 1, 0, 0, 0, 0),
+                new Date(2000, 3, 1, 0, 0, 0, 0),
+                new Date(2000, 4, 1, 0, 0, 0, 0),
+                new Date(2000, 5, 1, 0, 0, 0, 0),
+                new Date(2000, 6, 1, 0, 0, 0, 0),
+                new Date(2000, 7, 1, 0, 0, 0, 0),
+                new Date(2000, 8, 1, 0, 0, 0, 0),
+                new Date(2000, 9, 1, 0, 0, 0, 0),
+                new Date(2000, 10, 1, 0, 0, 0, 0),
+                new Date(2000, 11, 1, 0, 0, 0, 0),
+                new Date(2001, 0, 1, 0, 0, 0, 0),
+            ])
+        })
+
         const intervals = [
             {
                 interval: '5 years',
@@ -160,6 +183,8 @@ describe('getTicks', () => {
             it(`should support ${interval.interval} interval`, () => {
                 const intervalTimeScale = scaleUtc().domain(interval.domain)
 
+                intervalTimeScale.useUTC = true
+
                 expect(getScaleTicks(intervalTimeScale, `every ${interval.interval}`)).toEqual(
                     interval.expect
                 )

diff --git a/packages/scales/src/timeScale.js b/packages/scales/src/timeScale.js
@@ -46,6 +46,7 @@ export const timeScale = (
     scale.domain([minValue, maxValue]).range([0, size])
 
     scale.type = 'time'
+    scale.useUTC = useUTC
 
     return scale
 }