return a default not the first point for legend when having arrays of…

… size or solidity
plotly · Jun 17, 2021 · a2a66e7 · a2a66e7
1 parent 5f5561f
commit a2a66e7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/src/components/drawing/index.js b/src/components/drawing/index.js
@@ -600,6 +600,13 @@ drawing.getPatternAttr = function(mp, i, dflt) {
     return mp;
 };
 
+drawing.getPatternLegendDim = function(mp, i, dflt) {
+    if(mp && Lib.isArrayOrTypedArray(mp)) {
+        return dflt;
+    }
+    return mp;
+};
+
 drawing.pointStyle = function(s, trace, gd) {
     if(!s.size()) return;
 
@@ -725,7 +732,7 @@ drawing.singlePointStyle = function(d, sel, trace, fns, gd) {
         } else if(patternShape) {
             var patternBGColor = drawing.getPatternAttr(markerPattern.bgcolor, d.i, null);
             var patternFGColor = drawing.getPatternAttr(markerPattern.fgcolor, d.i, null);
-            var patternFGOpacity = drawing.getPatternAttr(markerPattern.fgopacity, d.i, 1);
+            var patternFGOpacity = markerPattern.fgopacity;
             var patternSize = drawing.getPatternAttr(markerPattern.size, d.i, 8);
             var patternSolidity = drawing.getPatternAttr(markerPattern.solidity, d.i, 0.3);
             var perPointPattern = d.mcc ||

diff --git a/src/components/legend/style.js b/src/components/legend/style.js
@@ -360,9 +360,9 @@ module.exports = function style(s, gd, legend) {
             if(patternShape) {
                 var patternBGColor = Drawing.getPatternAttr(markerPattern.bgcolor, 0, null);
                 var patternFGColor = Drawing.getPatternAttr(markerPattern.fgcolor, 0, null);
-                var patternFGOpacity = Drawing.getPatternAttr(markerPattern.fgopacity, 0, 1);
-                var patternSize = Math.min(12, Drawing.getPatternAttr(markerPattern.size, 0, 8));
-                var patternSolidity = Drawing.getPatternAttr(markerPattern.solidity, 0, 0.3);
+                var patternFGOpacity = markerPattern.fgopacity;
+                var patternSize = Math.min(12, Drawing.getPatternLegendDim(markerPattern.size, 0, 8));
+                var patternSolidity = Drawing.getPatternLegendDim(markerPattern.solidity, 0, 0.3);
                 var patternID = 'legend-' + trace.uid;
                 p.call(
                     Drawing.pattern, 'legend', gd, patternID,

diff --git a/test/image/baselines/pattern_bars.png b/test/image/baselines/pattern_bars.png
diff --git a/test/image/baselines/pattern_fgcolor_overlay_fillmode.png b/test/image/baselines/pattern_fgcolor_overlay_fillmode.png