treemap drop leaf.opacity

Author: archmoj

src/traces/treemap/attributes.js

@@ -161,21 +161,6 @@ module.exports = {
         })
     ),
 
-    leaf: {
-        opacity: {
-            valType: 'number',
-            editType: 'style',
-            role: 'style',
-            min: 0,
-            max: 1,
-            dflt: 1,
-            description: [
-                'Sets the opacity of the leaves.'
-            ].join(' ')
-        },
-        editType: 'plot'
-    },
-
     pathbar: {
         visible: {
             valType: 'boolean',

src/traces/treemap/defaults.js

@@ -86,7 +86,6 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
         colorscaleDefaults(traceIn, traceOut, layout, coerce, {prefix: 'marker.', cLetter: 'c'});
     }
     coerce('marker.opacity', withColorscale ? 1 : 0.7);
-    coerce('leaf.opacity');
 
     traceOut._hovered = {
         marker: {

src/traces/treemap/style.js

@@ -11,7 +11,6 @@
 var d3 = require('d3');
 var Color = require('../../components/color');
 var Lib = require('../../lib');
-var helpers = require('../sunburst/helpers');
 
 function style(gd) {
     gd._fullLayout._treemaplayer.selectAll('.trace').each(function(cd) {
@@ -43,7 +42,7 @@ function styleOne(s, pt, trace, opts) {
     } else {
         lineColor = Lib.castOption(trace, ptNumber, 'marker.line.color') || Color.defaultLine;
         lineWidth = Lib.castOption(trace, ptNumber, 'marker.line.width') || 0;
-        opacity = helpers.isLeaf(pt) ? trace.leaf.opacity : Math.pow(trace.marker.opacity, pt.height);
+        opacity = Math.pow(trace.marker.opacity, pt.height);
     }
 
     s.style('stroke-width', lineWidth)

test/image/baselines/treemap_packings.png

@@ -72,9 +72,6 @@
                 "Uniform",
                 "Uniform"
             ],
-            "leaf": {
-                "opacity": 0.85
-            },
             "marker": {
                 "colorscale": "Blackbody",
                 "reversescale": true
@@ -162,9 +159,6 @@
                 "Uniform",
                 "Uniform"
             ],
-            "leaf": {
-                "opacity": 0.85
-            },
             "marker": {
                 "colorscale": "Blackbody",
                 "reversescale": true
@@ -252,9 +246,6 @@
                 "Uniform",
                 "Uniform"
             ],
-            "leaf": {
-                "opacity": 0.85
-            },
             "marker": {
                 "colorscale": "Blackbody",
                 "reversescale": true
@@ -342,9 +333,6 @@
                 "Uniform",
                 "Uniform"
             ],
-            "leaf": {
-                "opacity": 0.85
-            },
             "marker": {
                 "colorscale": "Blackbody",
                 "reversescale": true
@@ -432,9 +420,6 @@
                 "Uniform",
                 "Uniform"
             ],
-            "leaf": {
-                "opacity": 0.85
-            },
             "marker": {
                 "colorscale": "Blackbody",
                 "reversescale": true
@@ -522,9 +507,6 @@
                 "Uniform",
                 "Uniform"
             ],
-            "leaf": {
-                "opacity": 0.85
-            },
             "marker": {
                 "colorscale": "Blackbody",
                 "reversescale": true

test/image/baselines/treemap_pad_transpose.png

@@ -13,9 +13,6 @@
                 "packing": "dice-slice",
                 "pad": 0
             },
-            "leaf": {
-                "opacity": 0.7
-            },
             "marker": {
                 "pad": {
                     "t": 16,
@@ -105,9 +102,6 @@
                 "flip": "y",
                 "pad": 0
             },
-            "leaf": {
-                "opacity": 0.7
-            },
             "marker": {
                 "pad": {
                     "t": 16,
@@ -197,9 +191,6 @@
                 "flip": "x",
                 "pad": 0
             },
-            "leaf": {
-                "opacity": 0.7
-            },
             "marker": {
                 "pad": {
                     "t": 16,
@@ -289,9 +280,6 @@
                 "flip": "x+y",
                 "pad": 0
             },
-            "leaf": {
-                "opacity": 0.7
-            },
             "marker": {
                 "pad": {
                     "t": 16,

test/image/baselines/treemap_textfit.png

@@ -16,9 +16,6 @@
                 "squarifyratio": 1,
                 "pad": 0
             },
-            "leaf": {
-                "opacity": 0.5
-            },
             "marker": {
                 "pad": {
                     "t": 0,
@@ -110,9 +107,6 @@
                 "squarifyratio": 1.618034,
                 "pad": 0
             },
-            "leaf": {
-                "opacity": 0.5
-            },
             "marker": {
                 "pad": {
                     "t": 0,
@@ -204,9 +198,6 @@
                 "squarifyratio": 1,
                 "pad": 0
             },
-            "leaf": {
-                "opacity": 0.5
-            },
             "marker": {
                 "pad": {
                     "t": 0,
@@ -298,9 +289,6 @@
                 "squarifyratio": 1.618034,
                 "pad": 0
             },
-            "leaf": {
-                "opacity": 0.5
-            },
             "marker": {
                 "pad": {
                     "t": 0,