don't attempt to draw radial axis when *polar.hole* is set to 1

Author: etpinard

Diff for: src/plots/polar/polar.js

@@ -380,6 +380,7 @@ proto.updateRadialAxis = function(fullLayout, polarLayout) {
     var radialLayout = polarLayout.radialaxis;
     var a0 = mod(polarLayout.sector[0], 360);
     var ax = _this.radialAxis;
+    var hasRoomForIt = innerRadius < radius;
 
     _this.fillViewInitialKey('radialaxis.angle', radialLayout.angle);
     _this.fillViewInitialKey('radialaxis.range', ax.range.slice());
@@ -410,8 +411,10 @@ proto.updateRadialAxis = function(fullLayout, polarLayout) {
         _this.radialTickLayout = newTickLayout;
     }
 
-    ax.setScale();
-    doTicksSingle(gd, ax, true);
+    if(hasRoomForIt) {
+        ax.setScale();
+        doTicksSingle(gd, ax, true);
+    }
 
     // stash 'actual' radial axis angle for drag handlers (in degrees)
     var angle = _this.radialAxisAngle = _this.vangles ?
@@ -420,24 +423,31 @@ proto.updateRadialAxis = function(fullLayout, polarLayout) {
 
     var trans = strTranslate(cx, cy) + strRotate(-angle);
 
-    updateElement(layers['radial-axis'], radialLayout.showticklabels || radialLayout.ticks, {
-        transform: trans
-    });
+    updateElement(
+        layers['radial-axis'],
+        hasRoomForIt && (radialLayout.showticklabels || radialLayout.ticks),
+        {transform: trans}
+    );
 
     // move all grid paths to about circle center,
     // undo individual grid lines translations
-    updateElement(layers['radial-grid'], radialLayout.showgrid, {
-        transform: strTranslate(cx, cy)
-    })
-    .selectAll('path').attr('transform', null);
-
-    updateElement(layers['radial-line'].select('line'), radialLayout.showline, {
-        x1: innerRadius,
-        y1: 0,
-        x2: radius,
-        y2: 0,
-        transform: trans
-    })
+    updateElement(
+        layers['radial-grid'],
+        hasRoomForIt && radialLayout.showgrid,
+        {transform: strTranslate(cx, cy)}
+    ).selectAll('path').attr('transform', null);
+
+    updateElement(
+        layers['radial-line'].select('line'),
+        hasRoomForIt && radialLayout.showline,
+        {
+            x1: innerRadius,
+            y1: 0,
+            x2: radius,
+            y2: 0,
+            transform: trans
+        }
+    )
     .attr('stroke-width', radialLayout.linewidth)
     .call(Color.stroke, radialLayout.linecolor);
 };
@@ -963,7 +973,10 @@ proto.updateRadialDrag = function(fullLayout, polarLayout, rngIndex) {
 
     var radialDrag = dragBox.makeRectDragger(layers, className, 'crosshair', -bl2, -bl2, bl, bl);
     var dragOpts = {element: radialDrag, gd: gd};
-    d3.select(radialDrag).attr('transform', strTranslate(tx, ty));
+
+    updateElement(d3.select(radialDrag), radialAxis.visible && innerRadius < radius, {
+        transform: strTranslate(tx, ty)
+    });
 
     // move function (either rotate or re-range flavor)
     var moveFn2;

Diff for: test/jasmine/tests/polar_test.js

@@ -13,6 +13,9 @@ var doubleClick = require('../assets/double_click');
 var drag = require('../assets/drag');
 var delay = require('../assets/delay');
 
+var customAssertions = require('../assets/custom_assertions');
+var assertNodeDisplay = customAssertions.assertNodeDisplay;
+
 describe('Test legacy polar plots logs:', function() {
     var gd;
 
@@ -628,6 +631,35 @@ describe('Test relayout on polar subplots:', function() {
         .catch(failTest)
         .then(done);
     });
+
+    it('should not attempt to draw radial axis when *polar.hole* is set to 1', function(done) {
+        var gd = createGraphDiv();
+
+        var queries = [
+            '.radial-axis', '.radial-grid', '.radial-line > line',
+            '.radialdrag', '.radialdrag-inner'
+        ];
+
+        function _assert(msg, showing) {
+            var exp = showing ? null : 'none';
+            var sp3 = d3.select(gd).select('.polarlayer > .polar');
+            queries.forEach(function(q) {
+                assertNodeDisplay(sp3.selectAll(q), [exp], msg + ' ' + q);
+            });
+        }
+
+        Plotly.plot(gd, [{
+            type: 'scatterpolar',
+            r: ['a', 'b', 'c']
+        }])
+        .then(function() { _assert('base', true); })
+        .then(function() { return Plotly.relayout(gd, 'polar.hole', 1); })
+        .then(function() { _assert('hole=1', false); })
+        .then(function() { return Plotly.relayout(gd, 'polar.hole', 0.2); })
+        .then(function() { _assert('hole=0.2', true); })
+        .catch(failTest)
+        .then(done);
+    });
 });
 
 describe('Test polar interactions:', function() {