adjust hour period case

Author: archmoj

src/plots/cartesian/axes.js

@@ -706,18 +706,21 @@ axes.calcTicks = function calcTicks(ax, opts) {
     var tickformat = axes.getTickFormat(ax);
     if(isPeriod && tickformat) {
         if(
-            !(/%[fLQsSMHIX]/.test(tickformat))
+            !(/%[fLQsSMX]/.test(tickformat))
             // %f: microseconds as a decimal number [000000, 999999]
             // %L: milliseconds as a decimal number [000, 999]
             // %Q: milliseconds since UNIX epoch
             // %s: seconds since UNIX epoch
             // %S: second as a decimal number [00,61]
             // %M: minute as a decimal number [00,59]
-            // %H: hour (24-hour clock) as a decimal number [00,23]
-            // %I: hour (12-hour clock) as a decimal number [01,12]
             // %X: the locale’s time, such as %-I:%M:%S %p
         ) {
             if(
+                /%[HI]/.test(tickformat)
+                // %H: hour (24-hour clock) as a decimal number [00,23]
+                // %I: hour (12-hour clock) as a decimal number [01,12]
+            ) definedDelta = ONEHOUR;
+            else if(
                 /%p/.test(tickformat) // %p: either AM or PM
             ) definedDelta = HALFDAY;
             else if(
@@ -824,6 +827,8 @@ axes.calcTicks = function calcTicks(ax, opts) {
                 periodLength = ONEDAY;
             } else if(definedDelta === HALFDAY && delta >= HALFDAY) {
                 periodLength = HALFDAY;
+            } else if(definedDelta === ONEHOUR && delta >= ONEHOUR) {
+                periodLength = ONEHOUR;
             }
 
             if(periodLength && ax.rangebreaks) {

test/jasmine/tests/axes_test.js

@@ -5524,7 +5524,7 @@ describe('Test axes', function() {
             });
         });
 
-        ['%Q', '%s', '%H', '%I', '%X'].forEach(function(formatter, i) {
+        ['%Q', '%s', '%X'].forEach(function(formatter, i) {
             it('should respect daily tickformat that includes ' + formatter, function(done) {
                 Plotly.newPlot(gd, {
                     data: [{
@@ -5554,8 +5554,6 @@ describe('Test axes', function() {
                     ], [
                         ['', 'Wed-1577836800000', 'Wed-1577847600000', 'Wed-1577858400000', 'Wed-1577869200000', 'Wed-1577880000000', 'Wed-1577890800000', 'Wed-1577901600000', 'Wed-1577912400000', 'Thu-1577923200000'],
                         ['', 'Wed-1577836800', 'Wed-1577847600', 'Wed-1577858400', 'Wed-1577869200', 'Wed-1577880000', 'Wed-1577890800', 'Wed-1577901600', 'Wed-1577912400', 'Thu-1577923200'],
-                        ['', 'Wed-00', 'Wed-03', 'Wed-06', 'Wed-09', 'Wed-12', 'Wed-15', 'Wed-18', 'Wed-21', 'Thu-00'],
-                        ['', 'Wed-12', 'Wed-03', 'Wed-06', 'Wed-09', 'Wed-12', 'Wed-03', 'Wed-06', 'Wed-09', 'Thu-12'],
                         ['', 'Wed-00:00:00', 'Wed-03:00:00', 'Wed-06:00:00', 'Wed-09:00:00', 'Wed-12:00:00', 'Wed-15:00:00', 'Wed-18:00:00', 'Wed-21:00:00', 'Thu-00:00:00']
                     ][i]);
                 })
@@ -5566,6 +5564,16 @@ describe('Test axes', function() {
 
 
         [
+            {
+                formatter: '%H',
+                positions: ['2019-12-31 21:30', '2020-01-01 00:30', '2020-01-01 03:30', '2020-01-01 06:30', '2020-01-01 09:30', '2020-01-01 12:30', '2020-01-01 15:30', '2020-01-01 18:30', '2020-01-01 21:30', '2020-01-02 00:30'],
+                labels: ['', 'Wed-00', 'Wed-03', 'Wed-06', 'Wed-09', 'Wed-12', 'Wed-15', 'Wed-18', 'Wed-21', 'Thu-00']
+            },
+            {
+                formatter: '%I',
+                positions: ['2019-12-31 21:30', '2020-01-01 00:30', '2020-01-01 03:30', '2020-01-01 06:30', '2020-01-01 09:30', '2020-01-01 12:30', '2020-01-01 15:30', '2020-01-01 18:30', '2020-01-01 21:30', '2020-01-02 00:30'],
+                labels: ['', 'Wed-12', 'Wed-03', 'Wed-06', 'Wed-09', 'Wed-12', 'Wed-03', 'Wed-06', 'Wed-09', 'Thu-12']
+            },
             {
                 formatter: '%p',
                 positions: ['2019-12-31 21:00', '2020-01-01 06:00', '2020-01-01 18:00', '2020-01-02 06:00'],