Skip to content

Commit a2a66e7

Browse files
committed
return a default not the first point for legend when having arrays of size or solidity
1 parent 5f5561f commit a2a66e7

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

Diff for: src/components/drawing/index.js

+8-1
Original file line numberDiff line numberDiff line change
@@ -600,6 +600,13 @@ drawing.getPatternAttr = function(mp, i, dflt) {
600600
return mp;
601601
};
602602

603+
drawing.getPatternLegendDim = function(mp, i, dflt) {
604+
if(mp && Lib.isArrayOrTypedArray(mp)) {
605+
return dflt;
606+
}
607+
return mp;
608+
};
609+
603610
drawing.pointStyle = function(s, trace, gd) {
604611
if(!s.size()) return;
605612

@@ -725,7 +732,7 @@ drawing.singlePointStyle = function(d, sel, trace, fns, gd) {
725732
} else if(patternShape) {
726733
var patternBGColor = drawing.getPatternAttr(markerPattern.bgcolor, d.i, null);
727734
var patternFGColor = drawing.getPatternAttr(markerPattern.fgcolor, d.i, null);
728-
var patternFGOpacity = drawing.getPatternAttr(markerPattern.fgopacity, d.i, 1);
735+
var patternFGOpacity = markerPattern.fgopacity;
729736
var patternSize = drawing.getPatternAttr(markerPattern.size, d.i, 8);
730737
var patternSolidity = drawing.getPatternAttr(markerPattern.solidity, d.i, 0.3);
731738
var perPointPattern = d.mcc ||

Diff for: src/components/legend/style.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -360,9 +360,9 @@ module.exports = function style(s, gd, legend) {
360360
if(patternShape) {
361361
var patternBGColor = Drawing.getPatternAttr(markerPattern.bgcolor, 0, null);
362362
var patternFGColor = Drawing.getPatternAttr(markerPattern.fgcolor, 0, null);
363-
var patternFGOpacity = Drawing.getPatternAttr(markerPattern.fgopacity, 0, 1);
364-
var patternSize = Math.min(12, Drawing.getPatternAttr(markerPattern.size, 0, 8));
365-
var patternSolidity = Drawing.getPatternAttr(markerPattern.solidity, 0, 0.3);
363+
var patternFGOpacity = markerPattern.fgopacity;
364+
var patternSize = Math.min(12, Drawing.getPatternLegendDim(markerPattern.size, 0, 8));
365+
var patternSolidity = Drawing.getPatternLegendDim(markerPattern.solidity, 0, 0.3);
366366
var patternID = 'legend-' + trace.uid;
367367
p.call(
368368
Drawing.pattern, 'legend', gd, patternID,

Diff for: test/image/baselines/pattern_bars.png

423 Bytes
Loading
310 Bytes
Loading

0 commit comments

Comments
 (0)