position quarters in period mode - case of dtick set to M6

plotly · Aug 31, 2020 · 350a10a · 350a10a
1 parent b32b5a4
commit 350a10a
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git a/src/plots/cartesian/axes.js b/src/plots/cartesian/axes.js
@@ -794,6 +794,8 @@ axes.calcTicks = function calcTicks(ax, opts) {
             } else if(definedDelta === ONEAVGQUARTER && delta >= ONEMINQUARTER) {
                 if(actualDelta >= ONEMINQUARTER && actualDelta <= ONEMAXQUARTER) {
                     periodLength = actualDelta;
+                } else {
+                    periodLength = ONEAVGQUARTER;
                 }
             } else if(delta >= ONEMINMONTH) {
                 if(actualDelta >= ONEMINMONTH && actualDelta <= ONEMAXMONTH) {

diff --git a/test/jasmine/tests/axes_test.js b/test/jasmine/tests/axes_test.js
@@ -5284,6 +5284,35 @@ describe('Test axes', function() {
             .then(done);
         });
 
+        it('should position quarters - case of dtick set to M6', function(done) {
+            Plotly.newPlot(gd, {
+                data: [{
+                    hovertemplate: hovertemplate,
+                    x: ['2020-01-01', '2022-01-01']
+                }],
+                layout: {
+                    width: 1000,
+                    xaxis: {
+                        dtick: 'M6',
+                        ticklabelmode: 'period',
+                        tickformat: '%Y-Q%q'
+                    }
+                }
+            })
+            .then(function() {
+                _assert('', [
+                    '2019-08-15 15:45',
+                    '2020-02-15 15:45',
+                    '2020-08-15 15:45',
+                    '2021-02-15 15:45',
+                    '2021-08-15 15:45',
+                    '2022-02-15 15:45'
+                ], ['', '2020-Q1', '2020-Q3', '2021-Q1', '2021-Q3', '']);
+            })
+            .catch(failTest)
+            .then(done);
+        });
+
         ['%B', '%b', '%m'].forEach(function(formatter, i) {
             it('should respect monthly tickformat that includes ' + formatter, function(done) {
                 Plotly.newPlot(gd, {