Merge pull request #4171 from plotly/dflt-range-under-rangemode

Adapt default axis ranges to rangemode
plotly · Sep 11, 2019 · 6c2babd · 6c2babd
2 parents c727dd1 + 06ee3c0
commit 6c2babd
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/src/plots/cartesian/set_convert.js b/src/plots/cartesian/set_convert.js
@@ -398,6 +398,10 @@ module.exports = function setConvert(ax, fullLayout) {
         // make sure we don't later mutate the defaults
         dflt = dflt.slice();
 
+        if(ax.rangemode === 'tozero' || ax.rangemode === 'nonnegative') {
+            dflt[0] = 0;
+        }
+
         if(!range || range.length !== 2) {
             Lib.nestedProperty(ax, rangeAttr).set(dflt);
             return;

diff --git a/test/jasmine/tests/axes_test.js b/test/jasmine/tests/axes_test.js
@@ -870,6 +870,25 @@ describe('Test axes', function() {
             _assertMatchingAxes(['xaxis3', 'yaxis3'], true, [-1, 6]);
             _assertMatchingAxes(['xaxis4', 'yaxis4'], false, [-1, 3]);
         });
+
+        it('should adapt default axis ranges to *rangemode*', function() {
+            layoutIn = {
+                xaxis: {rangemode: 'tozero'},
+                yaxis: {rangemode: 'nonnegative'},
+                xaxis2: {rangemode: 'nonnegative'},
+                yaxis2: {rangemode: 'tozero'}
+            };
+            layoutOut._subplots.cartesian.push('x2y2');
+            layoutOut._subplots.xaxis.push('x2');
+            layoutOut._subplots.yaxis.push('y2');
+
+            supplyLayoutDefaults(layoutIn, layoutOut, fullData);
+
+            expect(layoutOut.xaxis.range).withContext('xaxis range').toEqual([0, 6]);
+            expect(layoutOut.xaxis2.range).withContext('xaxis2 range').toEqual([0, 6]);
+            expect(layoutOut.yaxis.range).withContext('yaxis range').toEqual([0, 4]);
+            expect(layoutOut.yaxis2.range).withContext('yaxis2 range').toEqual([0, 4]);
+        });
     });
 
     describe('constraints relayout', function() {