don't override hover label data by undefined vals

etpinard · etpinard · commit 9eeadcf85048 · 2017-04-26T17:52:26.000-04:00
- so that e.g. the hover label `color` field isn't
  overridden by undefined `hoverlabel.bgcolor` values.
diff --git a/src/components/fx/hover.js b/src/components/fx/hover.js
@@ -1147,7 +1147,7 @@ function cleanPoint(d, hovermode) {
             val = Lib.nestedProperty(trace, traceKey).get();
         }
 
-        d[key] = val;
+        if(val) d[key] = val;
     }
 
     fill('color', 'hbg', 'hoverlabel.bgcolor');
diff --git a/test/jasmine/tests/hover_label_test.js b/test/jasmine/tests/hover_label_test.js
@@ -1020,6 +1020,9 @@ describe('Test hover label custom styling:', function() {
         Plotly.plot(gd, [{
             x: [1, 2, 3],
             y: [1, 2, 1],
+            marker: {
+                color: ['yellow', 'black', 'cyan']
+            },
             hoverlabel: {
                 font: {
                     color: ['red', 'green', 'blue'],
@@ -1065,6 +1068,45 @@ describe('Test hover label custom styling:', function() {
                 path: ['rgb(255, 255, 255)', 'rgb(255, 255, 255)'],
                 text: [13, 'Arial', 'rgb(255, 255, 255)']
             });
+
+            // test base case
+            return Plotly.update(gd, { hoverlabel: null }, { hoverlabel: null });
+        })
+        .then(function() {
+            _hover(gd, { xval: gd._fullData[0].x[0] });
+
+            assertPtLabel({
+                path: ['rgb(255, 255, 0)', 'rgb(68, 68, 68)'],
+                text: [13, 'Arial', 'rgb(68, 68, 68)']
+            });
+            assertCommonLabel({
+                path: ['rgb(68, 68, 68)', 'rgb(255, 255, 255)'],
+                text: [13, 'Arial', 'rgb(255, 255, 255)']
+            });
+        })
+        .then(function() {
+            _hover(gd, { xval: gd._fullData[0].x[1] });
+
+            assertPtLabel({
+                path: ['rgb(0, 0, 0)', 'rgb(255, 255, 255)'],
+                text: [13, 'Arial', 'rgb(255, 255, 255)']
+            });
+            assertCommonLabel({
+                path: ['rgb(68, 68, 68)', 'rgb(255, 255, 255)'],
+                text: [13, 'Arial', 'rgb(255, 255, 255)']
+            });
+        })
+        .then(function() {
+            _hover(gd, { xval: gd._fullData[0].x[2] });
+
+            assertPtLabel({
+                path: ['rgb(0, 255, 255)', 'rgb(68, 68, 68)'],
+                text: [13, 'Arial', 'rgb(68, 68, 68)']
+            });
+            assertCommonLabel({
+                path: ['rgb(68, 68, 68)', 'rgb(255, 255, 255)'],
+                text: [13, 'Arial', 'rgb(255, 255, 255)']
+            });
         })
         .catch(fail)
         .then(done);

Original file line number	Diff line number	Diff line change
`@@ -1147,7 +1147,7 @@ function cleanPoint(d, hovermode) {`
`1147`	`1147`	`val = Lib.nestedProperty(trace, traceKey).get();`
`1148`	`1148`	`}`
`1149`	`1149`
`1150`		`- d[key] = val;`
	`1150`	`+ if(val) d[key] = val;`
`1151`	`1151`	`}`
`1152`	`1152`
`1153`	`1153`	`fill('color', 'hbg', 'hoverlabel.bgcolor');`