fix relayout new insiderange and set range to null

Author: archmoj

src/plots/cartesian/axis_defaults.js

@@ -92,14 +92,17 @@ module.exports = function handleAxisDefaults(containerIn, containerOut, coerce,
 
     setConvert(containerOut, layoutOut);
 
-    var insiderange;
-    if(!options.noInsiderange && axType !== 'log') {
-        insiderange = coerce('insiderange');
-    }
-
     coerce('minallowed');
     coerce('maxallowed');
-    var range = coerce('range', insiderange);
+    var range = coerce('range');
+    if(!range) {
+        var insiderange;
+        if(!options.noInsiderange && axType !== 'log') {
+            insiderange = coerce('insiderange');
+            range = coerce('range', insiderange);
+        }
+    }
+
     var autorangeDflt = containerOut.getAutorangeDflt(range, options);
     var autorange = coerce('autorange', autorangeDflt);
 

src/plots/cartesian/layout_attributes.js

@@ -401,15 +401,15 @@ module.exports = {
     insiderange: {
         valType: 'info_array',
         items: [
-            {valType: 'any', editType: 'axrange'},
-            {valType: 'any', editType: 'axrange'}
+            {valType: 'any', editType: 'plot'},
+            {valType: 'any', editType: 'plot'}
         ],
-        editType: 'axrange',
+        editType: 'plot',
         description: [
             'Could be used to set the desired inside range of this axis',
             '(excluding the labels) when `ticklabelposition` of',
             'the anchored axis has *inside*.',
-            'Not implemented for axes with `type` *log*',
+            'Not implemented for axes with `type` *log*.',
             'This would be ignored when `range` is provided.'
         ].join(' ')
     },

test/jasmine/tests/axes_test.js

@@ -1606,6 +1606,37 @@ describe('Test axes', function() {
         });
     });
 
+    describe('insiderange relayout', function() {
+        var gd;
+
+        beforeEach(function() {
+            gd = createGraphDiv();
+        });
+
+        afterEach(destroyGraphDiv);
+
+        it('can relayout insiderange', function(done) {
+            Plotly.newPlot(gd, [{
+                y: [1, 3, 2, 4]}
+            ], {
+                xaxis: {insiderange: [0, 2]},
+                yaxis: {ticklabelposition: 'inside'},
+                plot_bgcolor: 'lightgray',
+                width: 600,
+                height: 600
+            }).then(function() {
+                expect(gd._fullLayout.xaxis.range).toBeCloseToArray([-0.132, 2]);
+
+                return Plotly.relayout(gd, {
+                    'xaxis.insiderange': [1, 3],
+                    'xaxis.range': null
+                });
+            }).then(function() {
+                expect(gd._fullLayout.xaxis.range).toBeCloseToArray([0.867, 3]);
+            }).then(done, done.fail);
+        });
+    });
+
     describe('constraints relayout', function() {
         var gd;
 

test/jasmine/tests/click_test.js

@@ -1055,6 +1055,7 @@ describe('Test click interactions:', function() {
             ], {
                 xaxis: {insiderange: [null, 1]},
                 yaxis: {ticks: 'inside', ticklabelposition: 'inside'},
+                plot_bgcolor: 'lightgray',
                 width: 600,
                 height: 600
             }).then(function() {
@@ -1081,6 +1082,7 @@ describe('Test click interactions:', function() {
             ], {
                 xaxis: {insiderange: [1, null]},
                 yaxis: {ticks: 'inside', ticklabelposition: 'inside', side: 'right'},
+                plot_bgcolor: 'lightgray',
                 width: 600,
                 height: 600
             }).then(function() {

test/plot-schema.json

@@ -10893,15 +10893,15 @@
      "valType": "string"
     },
     "insiderange": {
-     "description": "Could be used to set the desired inside range of this axis (excluding the labels) when `ticklabelposition` of the anchored axis has *inside*. Not implemented for axes with `type` *log* This would be ignored when `range` is provided.",
-     "editType": "axrange",
+     "description": "Could be used to set the desired inside range of this axis (excluding the labels) when `ticklabelposition` of the anchored axis has *inside*. Not implemented for axes with `type` *log*. This would be ignored when `range` is provided.",
+     "editType": "plot",
      "items": [
       {
-       "editType": "axrange",
+       "editType": "plot",
        "valType": "any"
       },
       {
-       "editType": "axrange",
+       "editType": "plot",
        "valType": "any"
       }
      ],
@@ -12233,15 +12233,15 @@
      "valType": "string"
     },
     "insiderange": {
-     "description": "Could be used to set the desired inside range of this axis (excluding the labels) when `ticklabelposition` of the anchored axis has *inside*. Not implemented for axes with `type` *log* This would be ignored when `range` is provided.",
-     "editType": "axrange",
+     "description": "Could be used to set the desired inside range of this axis (excluding the labels) when `ticklabelposition` of the anchored axis has *inside*. Not implemented for axes with `type` *log*. This would be ignored when `range` is provided.",
+     "editType": "plot",
      "items": [
       {
-       "editType": "axrange",
+       "editType": "plot",
        "valType": "any"
       },
       {
-       "editType": "axrange",
+       "editType": "plot",
        "valType": "any"
       }
      ],