small fixes for pattern fill

plotly · Mar 3, 2021 · 6e9cb40 · 6e9cb40
1 parent 9f7ce1d
commit 6e9cb40
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/components/drawing/index.js b/src/components/drawing/index.js
@@ -486,7 +486,7 @@ drawing.pattern = function(sel, gd, patternID, shape, bgcolor, fgcolor, size, so
 
     var pattern = fullLayout._defs.select('.patterns')
         .selectAll('#' + fullID)
-        .data([shape + ';' + bgcolor + ';' + fgcolor + ';' + size + ';' + solidity]);
+        .data([shape + ';' + bgcolor + ';' + fgcolor + ';' + size + ';' + solidity], Lib.identity);
 
     pattern.exit().remove();
 
@@ -692,8 +692,8 @@ drawing.singlePointStyle = function(d, sel, trace, fns, gd) {
                 [[0, gradientColor], [1, fillColor]], 'fill');
         } else if(patternShape) {
             var patternBGColor = getPatternAttr(markerPattern.bgcolor, d.i, null);
-            var patternSize = getPatternAttr(markerPattern.size, d.i, 1);
-            var patternSolidity = getPatternAttr(markerPattern.solidity, d.i, 1);
+            var patternSize = getPatternAttr(markerPattern.size, d.i, 8);
+            var patternSolidity = getPatternAttr(markerPattern.solidity, d.i, 0.3);
             var perPointPattern = Array.isArray(markerPattern.shape) ||
                                   Array.isArray(markerPattern.bgcolor) ||
                                   Array.isArray(markerPattern.size) ||

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

diff --git a/src/traces/bar/style_defaults.js b/src/traces/bar/style_defaults.js
@@ -24,7 +24,7 @@ module.exports = function handleStyleDefaults(traceIn, traceOut, coerce, default
     coerce('marker.line.width');
     coerce('marker.opacity');
     var pattern = coerce('marker.pattern.shape');
-    if (pattern) {
+    if(pattern) {
         coerce('marker.pattern.bgcolor');
         coerce('marker.pattern.size');
         coerce('marker.pattern.solidity');