Change yAxis rangeslider rangeOpts computation + fix yAxis rangeslider rangeOpts used to draw the trace

Author: TomDemulierChevret

src/components/rangeslider/draw.js

@@ -152,7 +152,7 @@ module.exports = function(gd) {
         rangeSlider
             .call(drawBg, gd, axisOpts, opts)
             .call(addClipPath, gd, axisOpts, opts)
-            .call(drawRangePlot, gd, axisOpts, opts, oppAxisRangeOpts)
+            .call(drawRangePlot, gd, axisOpts, opts)
             .call(drawMasks, gd, axisOpts, opts, oppAxisRangeOpts)
             .call(drawSlideBox, gd, axisOpts, opts)
             .call(drawGrabbers, gd, axisOpts, opts);
@@ -386,7 +386,7 @@ function addClipPath(rangeSlider, gd, axisOpts, opts) {
     });
 }
 
-function drawRangePlot(rangeSlider, gd, axisOpts, opts, oppAxisRangeOpts) {
+function drawRangePlot(rangeSlider, gd, axisOpts, opts) {
     var subplotData = Axes.getSubplots(gd, axisOpts),
         calcData = gd.calcdata;
 
@@ -408,7 +408,8 @@ function drawRangePlot(rangeSlider, gd, axisOpts, opts, oppAxisRangeOpts) {
             isMainPlot = (i === 0);
 
         var oppAxisOpts = Axes.getFromId(gd, id, 'y'),
-            oppAxisName = oppAxisOpts._name;
+            oppAxisName = oppAxisOpts._name,
+            oppAxisRangeOpts = opts[oppAxisName];
 
         var mockFigure = {
             data: [],
@@ -429,7 +430,7 @@ function drawRangePlot(rangeSlider, gd, axisOpts, opts, oppAxisRangeOpts) {
         mockFigure.layout[oppAxisName] = {
             type: oppAxisOpts.type,
             domain: [0, 1],
-            range: (oppAxisRangeOpts.rangemode === 'auto' || oppAxisRangeOpts.rangemode === 'fixed') ? oppAxisRangeOpts.range.slice() : oppAxisOpts.range.slice(),
+            range: oppAxisRangeOpts.range.slice(),
             calendar: oppAxisOpts.calendar
         };
 

src/plots/cartesian/axes.js

@@ -368,15 +368,22 @@ axes.doAutoRange = function(ax) {
         axIn.autorange = ax.autorange;
     }
 
-    if(ax.rangeslider) {
-        var anchorAxis = ax._anchorAxis;
-        if(ax.rangeslider[anchorAxis._name] && ax.rangeslider[anchorAxis._name].rangemode === 'auto') {
-            hasDeps = (anchorAxis._min && anchorAxis._max && anchorAxis._min.length && anchorAxis._max.length);
-            ax.rangeslider[anchorAxis._name].range = hasDeps ? axes.getAutoRange(anchorAxis) : anchorAxis.range.slice();
-            axIn = ax._input;
-            axIn.rangeslider[anchorAxis._name].range = ax.rangeslider[anchorAxis._name].range.slice();
-            axIn.rangeslider[anchorAxis._name].rangemode = ax.rangeslider[anchorAxis._name].rangemode;
+    if(ax._anchorAxis && ax._anchorAxis.rangeslider) {
+        var axeRangeOpts = ax._anchorAxis.rangeslider[ax._name];
+        switch(axeRangeOpts.rangemode) {
+            case 'auto':
+                axeRangeOpts.range = hasDeps ? axes.getAutoRange(ax) : ax.range.slice();
+                break;
+            case 'match':
+                axeRangeOpts.range = ax.range.slice();
+                break;
+            default:
+                axeRangeOpts.range = ax.range.slice();
+                break;
         }
+        axIn = ax._anchorAxis._input;
+        axIn.rangeslider[ax._name].range = axeRangeOpts.range.slice();
+        axIn.rangeslider[ax._name].rangemode = axeRangeOpts.rangemode;
     }
 };