can reuse treemp/draw_ancestors and sunburt/style

Author: archmoj

src/traces/icicle/draw_ancestors.js

@@ -14,7 +14,7 @@ var clearMinTextSize = uniformText.clearMinTextSize;
 var resizeText = require('../bar/style').resizeText;
 var constants = require('./constants');
 var drawDescendants = require('./draw_descendants');
-var drawAncestors = require('./draw_ancestors');
+var drawAncestors = require('../treemap/draw_ancestors');
 
 module.exports = function(gd, cdmodule, transitionOpts, makeOnCompleteCallback) {
     var fullLayout = gd._fullLayout;

src/traces/icicle/plot.js

@@ -3,7 +3,6 @@
 var d3 = require('@plotly/d3');
 var Color = require('../../components/color');
 var Lib = require('../../lib');
-var helpers = require('../sunburst/helpers');
 var resizeText = require('../bar/uniform_text').resizeText;
 
 function style(gd) {
@@ -18,72 +17,22 @@ function style(gd) {
         gTrace.style('opacity', trace.opacity);
 
         gTrace.selectAll('path.surface').each(function(pt) {
-            d3.select(this).call(styleOne, pt, trace, {
-                hovered: false
-            });
+            d3.select(this).call(styleOne, pt, trace);
         });
     });
 }
 
-function styleOne(s, pt, trace, opts) {
-    var hovered = (opts || {}).hovered;
+function styleOne(s, pt, trace) {
     var cdi = pt.data.data;
+    var isLeaf = !pt.children;
     var ptNumber = cdi.i;
-    var lineColor;
-    var lineWidth;
-    var fillColor = cdi.color;
-    var isRoot = helpers.isHierarchyRoot(pt);
-    var opacity = 1;
-
-    if(hovered) {
-        lineColor = trace._hovered.marker.line.color;
-        lineWidth = trace._hovered.marker.line.width;
-    } else {
-        if(isRoot && fillColor === trace.root.color) {
-            opacity = 100;
-            lineColor = 'rgba(0,0,0,0)';
-            lineWidth = 0;
-        } else {
-            lineColor = Lib.castOption(trace, ptNumber, 'marker.line.color') || Color.defaultLine;
-            lineWidth = Lib.castOption(trace, ptNumber, 'marker.line.width') || 0;
-
-            if(!trace._hasColorscale && !pt.onPathbar) {
-                var depthfade = trace.marker.depthfade;
-                if(depthfade) {
-                    var fadedColor = Color.combine(Color.addOpacity(trace._backgroundColor, 0.75), fillColor);
-                    var n;
-
-                    if(depthfade === true) {
-                        var maxDepth = helpers.getMaxDepth(trace);
-                        if(isFinite(maxDepth)) {
-                            if(helpers.isLeaf(pt)) {
-                                n = 0;
-                            } else {
-                                n = (trace._maxVisibleLayers) - (pt.data.depth - trace._entryDepth);
-                            }
-                        } else {
-                            n = pt.data.height + 1;
-                        }
-                    } else { // i.e. case of depthfade === 'reversed'
-                        n = pt.data.depth - trace._entryDepth;
-                        if(!trace._atRootLevel) n++;
-                    }
-
-                    if(n > 0) {
-                        for(var i = 0; i < n; i++) {
-                            var ratio = 0.5 * i / n;
-                            fillColor = Color.combine(Color.addOpacity(fadedColor, ratio), fillColor);
-                        }
-                    }
-                }
-            }
-        }
-    }
+    var lineColor = Lib.castOption(trace, ptNumber, 'marker.line.color') || Color.defaultLine;
+    var lineWidth = Lib.castOption(trace, ptNumber, 'marker.line.width') || 0;
 
     s.style('stroke-width', lineWidth)
-        .call(Color.fill, fillColor)
+        .call(Color.fill, cdi.color)
         .call(Color.stroke, lineColor)
-        .style('opacity', opacity);
+        .style('opacity', isLeaf ? trace.leaf.opacity : null);
 }
 
 module.exports = {