revise attribute name and do not add it to icicle

Author: archmoj

draftlogs/6351_add.md

@@ -1 +1 @@
- - Expose `marker.fillet` attribute for rounded corners in treemap and icicle plots [[#6351](https://github.com/plotly/plotly.js/pull/6351)]
+ - Add `marker.cornerradius` attribute to `treemap` trace [[#6351](https://github.com/plotly/plotly.js/pull/6351)]

src/traces/icicle/attributes.js

@@ -61,7 +61,7 @@ module.exports = {
 
         line: sunburstAttrs.marker.line,
 
-        fillet: treemapAttrs.marker.fillet,
+        cornerradius: treemapAttrs.marker.cornerradius,
 
         editType: 'calc'
     },

src/traces/icicle/defaults.js

@@ -62,7 +62,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     var lineWidth = coerce('marker.line.width');
     if(lineWidth) coerce('marker.line.color', layout.paper_bgcolor);
 
-    coerce('marker.fillet');
+    coerce('marker.cornerradius');
 
     coerce('marker.colors');
     var withColorscale = traceOut._hasColorscale = (

src/traces/treemap/attributes.js

@@ -141,7 +141,7 @@ module.exports = {
 
         line: sunburstAttrs.marker.line,
 
-        fillet: {
+        cornerradius: {
             valType: 'number',
             min: 0,
             // max: 10, // TODO: Do we need a max?

src/traces/treemap/defaults.js

@@ -85,7 +85,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     coerce('marker.pad.r', headerSize / 4);
     coerce('marker.pad.b', bottomText ? headerSize : headerSize / 4);
 
-    coerce('marker.fillet');
+    coerce('marker.cornerradius');
 
     traceOut._hovered = {
         marker: {

src/traces/treemap/plot_one.js

@@ -217,7 +217,7 @@ module.exports = function plotOne(gd, cd, element, transitionOpts, drawDescendan
         var dy = _y1 - _y0;
         if(!dx || !dy) return '';
 
-        var FILLET = trace.marker.fillet;
+        var FILLET = trace.marker.cornerradius;
         var r = dx > 2 * FILLET && dy > 2 * FILLET ? FILLET : Math.min(dx, dy) / 2;
 
         var arc = function(rx, ry) { return r ? 'a' + pos(r, r) + ' 0 0 1 ' + pos(rx, ry) : ''; };

test/image/baselines/icicle_packages_colorscale_novalue.png

@@ -8,7 +8,6 @@
                 "line": {
                     "color": "#777"
                 },
-                "fillet": 10,
                 "colorscale": [[0, "#FFF"], [0.01, "#FF0"], [0.1, "#F00"], [1, "#000"]],
                 "showscale": true
             },

test/image/mocks/icicle_packages_colorscale_novalue.json

@@ -9,7 +9,7 @@
 				"line": {
 					"color": "#777"
 				},
-				"fillet": 4,
+				"cornerradius": 4,
 				"colorscale": [[0, "#FFF"], [0.01, "#FF0"], [0.1, "#F00"], [1, "#000"]],
 				"showscale": true
 			},

test/image/mocks/treemap_packages_colorscale_novalue.json

@@ -793,39 +793,6 @@ describe('Test icicle restyle:', function() {
         .then(_assert('back to dflt', ['', '0.7', '', '0.7']))
         .then(done, done.fail);
     });
-
-    it('should be able to restyle *marker.fillet*', function(done) {
-        var mock = {
-            data: [{
-                type: 'icicle',
-                labels: ['Root', 'A', 'B', 'b'],
-                parents: ['', 'Root', 'Root', 'B']
-            }]
-        };
-
-        function _assert(msg, exp) {
-            return function() {
-                var layer = d3Select(gd).select('.iciclelayer');
-                layer.selectAll('.surface').each(function() {
-                    var surfaces = d3Select(this);
-                    var path = surfaces[0][0].getAttribute('d');
-                    expect(path.indexOf('a') !== -1).toEqual(exp);
-                });
-            };
-        }
-
-        Plotly.newPlot(gd, mock)
-        .then(_assert('no arcs', false))
-        .then(function() {
-            return Plotly.restyle(gd, 'marker.fillet', 10);
-        })
-        .then(_assert('has arcs', true))
-        .then(function() {
-            return Plotly.restyle(gd, 'marker.fillet', 0);
-        })
-        .then(_assert('no arcs', false))
-        .then(done, done.fail);
-    });
 });
 
 describe('Test icicle texttemplate without `values` should work at root level:', function() {

test/jasmine/tests/icicle_test.js

@@ -1295,7 +1295,7 @@ describe('Test treemap restyle:', function() {
         .then(done, done.fail);
     });
 
-    it('should be able to restyle *marker.fillet*', function(done) {
+    it('should be able to restyle *marker.cornerradius*', function(done) {
         var mock = {
             data: [{
                 type: 'treemap',
@@ -1321,11 +1321,11 @@ describe('Test treemap restyle:', function() {
         Plotly.newPlot(gd, mock)
         .then(_assert('no arcs', false))
         .then(function() {
-            return Plotly.restyle(gd, 'marker.fillet', 10);
+            return Plotly.restyle(gd, 'marker.cornerradius', 10);
         })
         .then(_assert('has arcs', true))
         .then(function() {
-            return Plotly.restyle(gd, 'marker.fillet', 0);
+            return Plotly.restyle(gd, 'marker.cornerradius', 0);
         })
         .then(_assert('no arcs', false))
         .then(done, done.fail);

test/jasmine/tests/treemap_test.js

@@ -34112,14 +34112,14 @@
       "editType": "none",
       "valType": "string"
      },
-     "editType": "calc",
-     "fillet": {
+     "cornerradius": {
       "description": "Sets the rounding of corners (in px).",
       "dflt": 0,
       "editType": "plot",
       "min": 0,
       "valType": "number"
      },
+     "editType": "calc",
      "line": {
       "color": {
        "arrayOk": true,
@@ -69178,6 +69178,13 @@
       "editType": "none",
       "valType": "string"
      },
+     "cornerradius": {
+      "description": "Sets the rounding of corners (in px).",
+      "dflt": 0,
+      "editType": "plot",
+      "min": 0,
+      "valType": "number"
+     },
      "depthfade": {
       "description": "Determines if the sector colors are faded towards the background from the leaves up to the headers. This option is unavailable when a `colorscale` is present, defaults to false when `marker.colors` is set, but otherwise defaults to true. When set to *reversed*, the fading direction is inverted, that is the top elements within hierarchy are drawn with fully saturated colors while the leaves are faded towards the background color.",
       "editType": "style",
@@ -69189,13 +69196,6 @@
       ]
      },
      "editType": "calc",
-     "fillet": {
-      "description": "Sets the rounding of corners (in px).",
-      "dflt": 0,
-      "editType": "plot",
-      "min": 0,
-      "valType": "number"
-     },
      "line": {
       "color": {
        "arrayOk": true,