revert minExtend and patch line.color in legend style

archmoj · archmoj · commit da77d21145d9 · 2019-05-23T10:30:22.000-04:00
diff --git a/src/components/legend/style.js b/src/components/legend/style.js
@@ -461,8 +461,13 @@ module.exports = function style(s, gd) {
         if(pts.size()) {
             var cont = (trace.marker || {}).line;
             var lw = boundLineWidth(pieCastOption(cont.width, d0.pts), cont, MAX_MARKER_LINE_WIDTH, CST_MARKER_LINE_WIDTH);
+
             var tMod = Lib.minExtend(trace, {marker: {line: {width: lw}}});
+            // since minExtend do not slice more than 3 items we need to patch line.color here
+            tMod.marker.line.color = cont.color;
+
             var d0Mod = Lib.minExtend(d0, {trace: tMod});
+
             stylePie(pts, d0Mod, tMod);
         }
     }
diff --git a/src/lib/index.js b/src/lib/index.js
@@ -644,7 +644,7 @@ lib.minExtend = function(obj1, obj2) {
         if(k.charAt(0) === '_' || typeof v === 'function') continue;
         else if(k === 'module') objOut[k] = v;
         else if(Array.isArray(v)) {
-            if(k === 'color' || k === 'colorscale') {
+            if(k === 'colorscale') {
                 objOut[k] = v.slice();
             } else {
                 objOut[k] = v.slice(0, arrayLen);

Original file line number	Diff line number	Diff line change
`@@ -461,8 +461,13 @@ module.exports = function style(s, gd) {`
`461`	`461`	`if(pts.size()) {`
`462`	`462`	`var cont = (trace.marker \|\| {}).line;`
`463`	`463`	`var lw = boundLineWidth(pieCastOption(cont.width, d0.pts), cont, MAX_MARKER_LINE_WIDTH, CST_MARKER_LINE_WIDTH);`
	`464`	`+`
`464`	`465`	`var tMod = Lib.minExtend(trace, {marker: {line: {width: lw}}});`
	`466`	`+ // since minExtend do not slice more than 3 items we need to patch line.color here`
	`467`	`+ tMod.marker.line.color = cont.color;`
	`468`	`+`
`465`	`469`	`var d0Mod = Lib.minExtend(d0, {trace: tMod});`
	`470`	`+`
`466`	`471`	`stylePie(pts, d0Mod, tMod);`
`467`	`472`	`}`
`468`	`473`	`}`