use getLineWidth function to get line width

move getLineWidth function to helpers and reuse it in hover
also fixing 4057

Author: archmoj

src/lib/index.js

@@ -459,10 +459,10 @@ lib.noneOrAll = function(containerIn, containerOut, attrList) {
  * @param {object} cd : calcdata trace
  * @param {string} cdAttr : calcdata key
  */
-lib.mergeArray = function(traceAttr, cd, cdAttr) {
+lib.mergeArray = function(traceAttr, cd, cdAttr, isNumber) {
     if(lib.isArrayOrTypedArray(traceAttr)) {
         var imax = Math.min(traceAttr.length, cd.length);
-        for(var i = 0; i < imax; i++) cd[i][cdAttr] = traceAttr[i];
+        for(var i = 0; i < imax; i++) cd[i][cdAttr] = isNumber ? +traceAttr[i] : traceAttr[i];
     }
 };
 

src/traces/bar/arrays_to_calcdata.js

@@ -19,13 +19,13 @@ module.exports = function arraysToCalcdata(cd, trace) {
 
     var marker = trace.marker;
     if(marker) {
-        mergeArray(marker.opacity, cd, 'mo');
+        mergeArray(marker.opacity, cd, 'mo', true);
         mergeArray(marker.color, cd, 'mc');
 
         var markerLine = marker.line;
         if(markerLine) {
             mergeArray(markerLine.color, cd, 'mlc');
-            mergeArray(markerLine.width, cd, 'mlw');
+            mergeArray(markerLine.width, cd, 'mlw', true);
         }
     }
 };

src/traces/bar/helpers.js

@@ -64,3 +64,12 @@ exports.getValue = function(arrayOrScalar, index) {
     else if(index < arrayOrScalar.length) value = arrayOrScalar[index];
     return value;
 };
+
+exports.getLineWidth = function(trace, di) {
+    var w =
+        (0 < di.mlw) ? di.mlw :
+        (0 < trace.marker.line.width) ? trace.marker.line.width : // Note: we don't want to get true & return an array when trace.marker.line.width is an array containing zeros.
+        0;
+
+    return w;
+};

src/traces/bar/hover.js

@@ -14,6 +14,7 @@ var Registry = require('../../registry');
 var Color = require('../../components/color');
 
 var fillText = require('../../lib').fillText;
+var getLineWidth = require('./helpers').getLineWidth;
 
 function hoverPoints(pointData, xval, yval, hovermode) {
     var barPointData = hoverOnBars(pointData, xval, yval, hovermode);
@@ -165,7 +166,7 @@ function hoverOnBars(pointData, xval, yval, hovermode) {
 function getTraceColor(trace, di) {
     var mc = di.mcc || trace.marker.color;
     var mlc = di.mlcc || trace.marker.line.color;
-    var mlw = di.mlw || trace.marker.line.width;
+    var mlw = getLineWidth(trace, di);
 
     if(Color.opacity(mc)) return mc;
     else if(Color.opacity(mlc) && mlw) return mlc;

src/traces/bar/plot.js

@@ -111,12 +111,8 @@ function plot(gd, plotinfo, cdModule, traceLayer, opts) {
                 !isNumeric(y1)
             );
             // display zeros if line.width > 0
-            if(isBlank && shouldDisplayZeros) {
-                if(isHorizontal ? x1 - x0 === 0 : y1 - y0 === 0) {
-                    if(di.mlw || trace.marker.line.width > 0) {
-                        isBlank = false;
-                    }
-                }
+            if(isBlank && shouldDisplayZeros && helpers.getLineWidth(trace, di) && (isHorizontal ? x1 - x0 === 0 : y1 - y0 === 0)) {
+                isBlank = false;
             }
             di.isBlank = isBlank;
 
@@ -141,8 +137,7 @@ function plot(gd, plotinfo, cdModule, traceLayer, opts) {
                     mc = cont.color;
                 }
             } else {
-                lw = (di.mlw + 1 || trace.marker.line.width + 1 ||
-                    (di.trace ? di.trace.marker.line.width : 0) + 1) - 1;
+                lw = helpers.getLineWidth(trace, di);
                 mc = di.mc || trace.marker.color;
             }