Skip to content

Commit 65aa6c0

Browse files
committed
Legend: Remove legendItem from function signatures
* Removed legendItem from the function signatures of drawTexts, setupTraceToggle and computeTextDimensions.
1 parent 107883a commit 65aa6c0

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

src/components/legend/draw.js

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,10 @@ module.exports = function draw(gd) {
116116
return trace.visible === 'legendonly' ? 0.5 : 1;
117117
}
118118
})
119-
.each(function(d) {
120-
var legendItem = d[0];
121-
119+
.each(function() {
122120
d3.select(this)
123-
.call(drawTexts, gd, legendItem)
124-
.call(setupTraceToggle, gd, legendItem);
121+
.call(drawTexts, gd)
122+
.call(setupTraceToggle, gd);
125123
});
126124

127125
if(gd.firstRender) {
@@ -315,8 +313,9 @@ module.exports = function draw(gd) {
315313
}
316314
};
317315

318-
function drawTexts(g, gd, legendItem) {
319-
var fullLayout = gd._fullLayout,
316+
function drawTexts(g, gd) {
317+
var legendItem = g.data()[0][0],
318+
fullLayout = gd._fullLayout,
320319
trace = legendItem.trace,
321320
isPie = Plots.traceIs(trace, 'pie'),
322321
traceIndex = trace.index,
@@ -338,7 +337,7 @@ function drawTexts(g, gd, legendItem) {
338337
function textLayout(s) {
339338
Plotly.util.convertToTspans(s, function() {
340339
s.selectAll('tspan.line').attr({x: s.attr('x')});
341-
g.call(computeTextDimensions, gd, legendItem);
340+
g.call(computeTextDimensions, gd);
342341
});
343342
}
344343

@@ -356,7 +355,7 @@ function drawTexts(g, gd, legendItem) {
356355
else text.call(textLayout);
357356
}
358357

359-
function setupTraceToggle(g, gd, legendItem) {
358+
function setupTraceToggle(g, gd) {
360359
var hiddenSlices = gd._fullLayout.hiddenlabels ?
361360
gd._fullLayout.hiddenlabels.slice() :
362361
[];
@@ -373,7 +372,8 @@ function setupTraceToggle(g, gd, legendItem) {
373372
traceToggle.on('click', function() {
374373
if(gd._dragged) return;
375374

376-
var fullData = gd._fullData,
375+
var legendItem = g.data()[0][0],
376+
fullData = gd._fullData,
377377
trace = legendItem.trace,
378378
legendgroup = trace.legendgroup,
379379
traceIndicesInGroup = [],
@@ -406,8 +406,9 @@ function setupTraceToggle(g, gd, legendItem) {
406406
});
407407
}
408408

409-
function computeTextDimensions(g, gd, legendItem) {
410-
var bg = g.selectAll('.legendtoggle'),
409+
function computeTextDimensions(g, gd) {
410+
var legendItem = g.data()[0][0],
411+
bg = g.selectAll('.legendtoggle'),
411412
mathjaxGroup = g.select('g[class*=math-group]'),
412413
opts = gd._fullLayout.legend,
413414
lineHeight = opts.font.size * 1.3,

0 commit comments

Comments
 (0)