drop unused treemap props and bring in relevant sunburst props for icicle

Author: archmoj

src/traces/icicle/attributes.js

@@ -22,41 +22,6 @@ module.exports = {
     maxdepth: sunburstAttrs.maxdepth,
 
     tiling: {
-        packing: {
-            valType: 'enumerated',
-            values: [
-                'squarify',
-                'binary',
-                'dice',
-                'slice',
-                'slice-dice',
-                'dice-slice'
-            ],
-            dflt: 'squarify',
-            editType: 'plot',
-            description: [
-                'Determines d3 icicle solver.',
-                'For more info please refer to https://github.com/d3/d3-hierarchy#icicle-tiling'
-            ].join(' ')
-        },
-
-        squarifyratio: {
-            valType: 'number',
-            min: 1,
-            dflt: 1,
-            editType: 'plot',
-            description: [
-                'When using *squarify* `packing` algorithm, according to https://github.com/d3/d3-hierarchy/blob/master/README.md#squarify_ratio',
-                'this option specifies the desired aspect ratio of the generated rectangles.',
-                'The ratio must be specified as a number greater than or equal to one.',
-                'Note that the orientation of the generated rectangles (tall or wide)',
-                'is not implied by the ratio; for example, a ratio of two will attempt',
-                'to produce a mixture of rectangles whose width:height ratio is either 2:1 or 1:2.',
-                'When using *squarify*, unlike d3 which uses the Golden Ratio i.e. 1.618034,',
-                'Plotly applies 1 to increase squares in icicle layouts.'
-            ].join(' ')
-        },
-
         flip: {
             valType: 'flaglist',
             flags: [
@@ -84,61 +49,8 @@ module.exports = {
     },
 
     marker: extendFlat({
-        pad: {
-            t: {
-                valType: 'number',
-                min: 0,
-                editType: 'plot',
-                description: [
-                    'Sets the padding form the top (in px).'
-                ].join(' ')
-            },
-            l: {
-                valType: 'number',
-                min: 0,
-                editType: 'plot',
-                description: [
-                    'Sets the padding form the left (in px).'
-                ].join(' ')
-            },
-            r: {
-                valType: 'number',
-                min: 0,
-                editType: 'plot',
-                description: [
-                    'Sets the padding form the right (in px).'
-                ].join(' ')
-            },
-            b: {
-                valType: 'number',
-                min: 0,
-                editType: 'plot',
-                description: [
-                    'Sets the padding form the bottom (in px).'
-                ].join(' ')
-            },
-
-            editType: 'calc'
-        },
-
         colors: sunburstAttrs.marker.colors,
 
-        depthfade: {
-            valType: 'enumerated',
-            values: [true, false, 'reversed'],
-            editType: 'style',
-            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.'
-            ].join(' ')
-        },
-
         line: sunburstAttrs.marker.line,
 
         editType: 'calc'
@@ -149,6 +61,8 @@ module.exports = {
         })
     ),
 
+    leaf: sunburstAttrs.leaf,
+
     pathbar: {
         visible: {
             valType: 'boolean',

src/traces/icicle/defaults.js

@@ -34,11 +34,6 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     coerce('level');
     coerce('maxdepth');
 
-    var packing = coerce('tiling.packing');
-    if(packing === 'squarify') {
-        coerce('tiling.squarifyratio');
-    }
-
     coerce('tiling.flip');
     coerce('tiling.pad');
 
@@ -62,33 +57,25 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
         moduleHasInsideanchor: false
     });
     coerce('textposition');
-    var bottomText = traceOut.textposition.indexOf('bottom') !== -1;
 
     var lineWidth = coerce('marker.line.width');
     if(lineWidth) coerce('marker.line.color', layout.paper_bgcolor);
 
-    var colors = coerce('marker.colors');
+    coerce('marker.colors');
     var withColorscale = traceOut._hasColorscale = (
         hasColorscale(traceIn, 'marker', 'colors') ||
         (traceIn.marker || {}).coloraxis // N.B. special logic to consider "values" colorscales
     );
     if(withColorscale) {
         colorscaleDefaults(traceIn, traceOut, layout, coerce, {prefix: 'marker.', cLetter: 'c'});
-    } else {
-        coerce('marker.depthfade', !(colors || []).length);
     }
 
-    var headerSize = traceOut.textfont.size * 2;
-
-    coerce('marker.pad.t', bottomText ? headerSize / 4 : headerSize);
-    coerce('marker.pad.l', headerSize / 4);
-    coerce('marker.pad.r', headerSize / 4);
-    coerce('marker.pad.b', bottomText ? headerSize : headerSize / 4);
-
     if(withColorscale) {
         colorscaleDefaults(traceIn, traceOut, layout, coerce, {prefix: 'marker.', cLetter: 'c'});
     }
 
+    coerce('leaf.opacity', withColorscale ? 1 : 0.7);
+
     traceOut._hovered = {
         marker: {
             line: {

src/traces/icicle/draw_descendants.js

@@ -37,8 +37,6 @@ module.exports = function drawDescendants(gd, cd, entry, slices, opts) {
     var hasRight = trace.textposition.indexOf('right') !== -1;
     var hasBottom = trace.textposition.indexOf('bottom') !== -1;
 
-    var noRoomForHeader = (!hasBottom && !trace.marker.pad.t) || (hasBottom && !trace.marker.pad.b);
-
     // N.B. slice data isn't the calcdata,
     // grab corresponding calcdata item in sliceData[i].data.data
     var allData = partition(entry, [width, height], {
@@ -47,11 +45,7 @@ module.exports = function drawDescendants(gd, cd, entry, slices, opts) {
         flipX: trace.tiling.flip.indexOf('x') > -1,
         flipY: trace.tiling.flip.indexOf('y') > -1,
         pad: {
-            inner: trace.tiling.pad,
-            top: trace.marker.pad.t,
-            left: trace.marker.pad.l,
-            right: trace.marker.pad.r,
-            bottom: trace.marker.pad.b,
+            inner: trace.tiling.pad
         }
     });
 
@@ -122,12 +116,10 @@ module.exports = function drawDescendants(gd, cd, entry, slices, opts) {
     }
 
     updateSlices.each(function(pt) {
-        var isHeader = helpers.isHeader(pt, trace);
-
-        pt._hoverX = viewX(pt.x1 - trace.marker.pad.r),
+        pt._hoverX = viewX(pt.x1 - trace.tiling.pad),
         pt._hoverY = hasBottom ?
-                viewY(pt.y1 - trace.marker.pad.b / 2) :
-                viewY(pt.y0 + trace.marker.pad.t / 2);
+                viewY(pt.y1 - trace.tiling.pad / 2) :
+                viewY(pt.y0 + trace.tiling.pad / 2);
 
         var sliceTop = d3.select(this);
 
@@ -160,11 +152,7 @@ module.exports = function drawDescendants(gd, cd, entry, slices, opts) {
         if(pt.x0 === pt.x1 || pt.y0 === pt.y1) {
             pt._text = '';
         } else {
-            if(isHeader) {
-                pt._text = noRoomForHeader ? '' : helpers.getPtLabel(pt) || '';
-            } else {
-                pt._text = formatSliceLabel(pt, entry, trace, cd, fullLayout) || '';
-            }
+            pt._text = formatSliceLabel(pt, entry, trace, cd, fullLayout) || '';
         }
 
         var sliceTextGroup = Lib.ensureSingle(sliceTop, 'g', 'slicetext');
@@ -178,14 +166,13 @@ module.exports = function drawDescendants(gd, cd, entry, slices, opts) {
 
         sliceText.text(pt._text || ' ') // use one space character instead of a blank string to avoid jumps during transition
             .classed('slicetext', true)
-            .attr('text-anchor', hasRight ? 'end' : (hasLeft || isHeader) ? 'start' : 'middle')
+            .attr('text-anchor', hasRight ? 'end' : hasLeft ? 'start' : 'middle')
             .call(Drawing.font, font)
             .call(svgTextUtils.convertToTspans, gd);
 
         pt.textBB = Drawing.bBox(sliceText.node());
         pt.transform = toMoveInsideSlice(pt, {
-            fontSize: font.size,
-            isHeader: isHeader
+            fontSize: font.size
         });
         pt.transform.fontSize = font.size;
 

src/traces/icicle/partition.js

@@ -5,18 +5,14 @@ var d3Hierarchy = require('d3-hierarchy');
 module.exports = function partition(entry, size, opts) {
     var flipX = opts.flipX;
     var flipY = opts.flipY;
-    var swapXY = opts.packing === 'dice-slice';
 
     var result = d3Hierarchy
         .partition()
         .padding(opts.pad.inner)
-        .size(
-            swapXY ? [size[1], size[0]] : size
-        )(entry);
+        .size(size)(entry);
 
-    if(swapXY || flipX || flipY) {
+    if(flipX || flipY) {
         flipTree(result, size, {
-            swapXY: swapXY,
             flipX: flipX,
             flipY: flipY
         });
@@ -27,18 +23,6 @@ module.exports = function partition(entry, size, opts) {
 function flipTree(node, size, opts) {
     var tmp;
 
-    if(opts.swapXY) {
-        // swap x0 and y0
-        tmp = node.x0;
-        node.x0 = node.y0;
-        node.y0 = tmp;
-
-        // swap x1 and y1
-        tmp = node.x1;
-        node.x1 = node.y1;
-        node.y1 = tmp;
-    }
-
     if(opts.flipX) {
         tmp = node.x0;
         node.x0 = size[0] - node.x1;

src/traces/icicle/plot.js

@@ -307,7 +307,7 @@ function plotOne(gd, cd, element, transitionOpts) {
             hasLeft ? -1 :
             hasRight ? 1 : 0;
 
-        var pad = trace.marker.pad;
+        var pad = trace.tiling.pad;
         if(opts.isHeader) {
             x0 += pad.l - TEXTPAD;
             x1 -= pad.r - TEXTPAD;